--- gnome-menus-2.28.0.1.orig/debian/copyright +++ gnome-menus-2.28.0.1/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Sebastien Bacher on +Tue, 30 Nov 2004 12:49:00 +0100. + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/ + +Copyright: + +Upstream Authors: Mark McLoughlin + Havoc Pennington + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- gnome-menus-2.28.0.1.orig/debian/watch +++ gnome-menus-2.28.0.1/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/([\d\.]+)/ \ + gnome-menus-(.*)\.tar\.gz \ + debian uupdate --- gnome-menus-2.28.0.1.orig/debian/python-gmenu.examples +++ gnome-menus-2.28.0.1/debian/python-gmenu.examples @@ -0,0 +1 @@ +util/gnome-menus-ls.py --- gnome-menus-2.28.0.1.orig/debian/control +++ gnome-menus-2.28.0.1/debian/control @@ -0,0 +1,104 @@ +Source: gnome-menus +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Debian GNOME Maintainers +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu +Build-Depends: debhelper (>= 5.0.37.2), + cdbs (>= 0.4.43), + libglib2.0-dev (>= 2.15.2), + python-all-dev, + python-all-dbg, + libxml-parser-perl, + gnome-pkg-tools, + dpkg-dev (>= 1.13.19), + python-support (>= 0.6), + quilt, + intltool (>= 0.40.0) +Standards-Version: 3.8.2 +XS-Python-Version: >= 2.3 + +Package: gnome-menus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python-gmenu (= ${binary:Version}) +Replaces: kdelibs-data (<< 4:3.3.2-1ubuntu1) +XB-Python-Version: ${python:Versions} +Description: an implementation of the freedesktop menu specification for GNOME + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + +Package: libgnome-menu2 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: an implementation of the freedesktop menu specification for GNOME + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + . + This package contains the shared library. + +Package: libgnome-menu-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + libgnome-menu2 (= ${binary:Version}), + libglib2.0-dev (>= 2.15.2) +Description: an implementation of the freedesktop menu specification for GNOME + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + . + This package contains the development headers. + +Package: python-gmenu +Architecture: any +Section: python +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python-gtk2 +Conflicts: gnome-menus (<< 2.14.0-3) +Replaces: gnome-menus (<< 2.14.0-3) +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: an implementation of the freedesktop menu specification for GNOME + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + . + This package contains the Python binding. + +Package: python-gmenu-dbg +Priority: extra +Architecture: any +Section: python +Depends: python-gmenu (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} +Description: Python bindings for the freedesktop menu specification for GNOME (debug extension) + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + This package contains the python binding for the debug interpreter. --- gnome-menus-2.28.0.1.orig/debian/python-gmenu.postinst +++ gnome-menus-2.28.0.1/debian/python-gmenu.postinst @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +# Workaround for python-central disaster +if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "2.25.5-0ubuntu3"; then + rm -rf /usr/lib/python2.?/site-packages/GMenuSimpleEditor +fi + +#DEBHELPER# --- gnome-menus-2.28.0.1.orig/debian/rules +++ gnome-menus-2.28.0.1/debian/rules @@ -0,0 +1,106 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +PY_VERSIONS = $(shell pyversions --requested debian/control) + +DEB_BUILDDIR := build + +DEB_DBG_PACKAGE_python-gmenu = python-gmenu-dbg + +.PRECIOUS: configure-stamp-% dbg-configure-stamp-% + +INFILES := $(wildcard debian/desktop-files/*.directory.in) +OUTFILES := $(INFILES:.directory.in=.directory) + +%.directory: %.directory.in + intltool-merge -d debian/po-up $< $@ + +build/gnome-menus:: $(OUTFILES) + +configure-stamp-%: + mkdir build-$* + cd build-$* && PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \ + $(DEB_CONFIGURE_SCRIPT) \ + $(DEB_CONFIGURE_NORMAL_ARGS) \ + --disable-maintainer-mode \ + $(cdbs_configure_flags) \ + $(DEB_CONFIGURE_EXTRA_FLAGS) \ + $(DEB_CONFIGURE_USER_FLAGS) + touch $@ + +dbg-configure-stamp-%: + mkdir dbg-build-$* + cd dbg-build-$* && PYTHON=`which $*-dbg` $(subst -O2,-O0,$(DEB_CONFIGURE_SCRIPT_ENV)) \ + $(DEB_CONFIGURE_SCRIPT) \ + $(DEB_CONFIGURE_NORMAL_ARGS) \ + --disable-maintainer-mode \ + $(cdbs_configure_flags) \ + $(DEB_CONFIGURE_EXTRA_FLAGS) \ + $(DEB_CONFIGURE_USER_FLAGS) + touch $@ + +configure/python-gmenu:: $(addprefix configure-stamp-, $(PY_VERSIONS)) +configure/python-gmenu-dbg:: $(addprefix dbg-configure-stamp-, $(PY_VERSIONS)) + +build-stamp-%: + make -C build-$* + touch $@ + +dbg-build-stamp-%: + make -C dbg-build-$* + touch $@ + +build/python-gmenu:: $(addprefix build-stamp-, $(PY_VERSIONS)) +build/python-gmenu-dbg:: $(addprefix dbg-build-stamp-, $(PY_VERSIONS)) + +install-stamp-%: + make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp + touch $@ + cd po; intltool-update -p + +dbg-install-stamp-%: + make -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gmenu-dbg + +install/python-gmenu:: $(addprefix install-stamp-, $(PY_VERSIONS)) + +install/python-gmenu-dbg:: $(addprefix dbg-install-stamp-, $(PY_VERSIONS)) + for i in $$(find debian/python-*-dbg/usr/lib/py* -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + find debian/python-*-dbg ! -type d ! -name '*_d.so' | xargs rm -f + find debian/python-*-dbg -depth -empty -exec rmdir {} \; + +#binary-install/gnome-menus:: +# mv debian/gnome-menus/etc/xdg/menus/applications.menu debian/gnome-menus/etc/xdg/menus/gnome-applications.menu +# mv debian/gnome-menus/etc/xdg/menus/settings.menu debian/gnome-menus/etc/xdg/menus/gnome-settings.menu + +binary-install/python-gmenu:: + # force executable bit on files looking like python scripts + egrep -rlZ '^#!(.*)python' debian/python-gmenu/usr/lib/ | xargs -0 chmod a+x -- + dh_pysupport + +binary-predeb/python-gmenu-dbg:: + rm -rf debian/python-gmenu-dbg/usr/share/doc/python-gmenu-dbg + ln -s python-gmenu debian/python-gmenu-dbg/usr/share/doc/python-gmenu-dbg + +clean:: + -rm -rf $(DEB_BUILDDIR) + -rm -rf $(addprefix build-, $(PY_VERSIONS)) + -rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS)) + -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) + -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) + -rm -rf dbg-build* dbg-*-stamp-* + -rm -f $(OUTFILES) + +update-po:: + ls $(INFILES) | sed 's#^#../#' >debian/po-up/POTFILES.in + cd debian/po-up && intltool-update -g debian --pot && \ + for i in *.po; do intltool-update -g debian --dist $${i%.po}; done + rm -f debian/po-up/POTFILES.in --- gnome-menus-2.28.0.1.orig/debian/libgnome-menu2.install +++ gnome-menus-2.28.0.1/debian/libgnome-menu2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*.so.* --- gnome-menus-2.28.0.1.orig/debian/python-gmenu.install +++ gnome-menus-2.28.0.1/debian/python-gmenu.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/python*/*-packages/gmenu.so +debian/tmp/usr/lib/python*/*-packages/GMenuSimpleEditor --- gnome-menus-2.28.0.1.orig/debian/changelog +++ gnome-menus-2.28.0.1/debian/changelog @@ -0,0 +1,936 @@ +gnome-menus (2.28.0.1-0ubuntu1) karmic; urgency=low + + * New upstream version + * debian/patches/70_autoregen.patch: + - new version update + + -- Sebastien Bacher Thu, 01 Oct 2009 18:03:04 +0200 + +gnome-menus (2.28.0-0ubuntu3) karmic; urgency=low + + * debian/patches/09_app_install_entry.patch: + - updated for the software-store to software-center rename + + -- Sebastien Bacher Fri, 25 Sep 2009 19:58:10 +0200 + +gnome-menus (2.28.0-0ubuntu2) karmic; urgency=low + + * debian/patches/09_app_install_entry.patch: + - special case ubuntu-software-store to not be listed in administration too + (lp: #435123) + + -- Sebastien Bacher Thu, 24 Sep 2009 11:35:44 +0200 + +gnome-menus (2.28.0-0ubuntu1) karmic; urgency=low + + * New upstream version + * debian/patches/09_games-menu.patch: + - don't list role games twice, thanks Pauli Virtanen (lp: #432989) + * debian/patches/70_autoregen.patch: + - new version update + + -- Sebastien Bacher Mon, 21 Sep 2009 23:59:50 +0200 + +gnome-menus (2.27.92-0ubuntu3) karmic; urgency=low + + * debian/patches/09_app_install_entry.patch: + - use the correct desktop naming + + -- Sebastien Bacher Fri, 18 Sep 2009 19:52:23 +0200 + +gnome-menus (2.27.92-0ubuntu2) karmic; urgency=low + + * debian/patches/09_app_install_entry.patch: + - use software-store rather than gnome-app-install (lp: #431882) + + -- Sebastien Bacher Fri, 18 Sep 2009 16:04:11 +0200 + +gnome-menus (2.27.92-0ubuntu1) karmic; urgency=low + + * New upstream version + * debian/libgnome-menu2.shlibs: + - updated shlibs version + + -- Sebastien Bacher Wed, 09 Sep 2009 10:13:14 +0200 + +gnome-menus (2.27.5-0ubuntu2) karmic; urgency=low + + * debian/patches/09_games-menu.patch: + - updated the translations list to include the new categories + (lp: #425020) + + -- Sebastien Bacher Mon, 07 Sep 2009 10:54:38 +0200 + +gnome-menus (2.27.5-0ubuntu1) karmic; urgency=low + + * New upstream release: (LP: #406126) + - Use silent-rules with automake 1.11 (Vincent) + - Translation updates + * debian/patches/70_autoregen.patch: + - Refreshed + + -- Robert Ancell Wed, 29 Jul 2009 13:28:13 +1000 + +gnome-menus (2.27.4-0ubuntu1) karmic; urgency=low + + * New upstream version: + libmenu + - Improve performance by using a cache to not compute the same thing + again and again + - Add API to access GenericName + - Fix DefaultLayout attributes not being inherited + - Do not always inherit parent DefaultLayout attributes + - Sort inlined items unless inline_header is used + Menu Editor + - Add --help and --version arguments + - Port to GtkBuilder + Misc + - Use shave to improve build log readability + * debian/control.in: + - don't require glade + * debian/gnome-menus.install: + - updated for the changes in the new version + * debian/libgnome-menu2.shlibs: + - new version update + * debian/patches/12_merge_duplicates.patch, + debian/patches/12_submenus_inherit.patch: + - the change is in the new version + * debian/patches/20_show-admin-tools-for-admin-group.patch: + - new upstream version + + -- Sebastien Bacher Wed, 15 Jul 2009 18:32:35 +0200 + +gnome-menus (2.26.2-0ubuntu3) karmic; urgency=low + + * debian/patches/series: comment 08_menus_prefix.patch too + + -- Sebastien Bacher Wed, 15 Jul 2009 18:15:59 +0200 + +gnome-menus (2.26.2-0ubuntu2) karmic; urgency=low + + * debian/gnome-menus.preinst: + - clean conffiles from the previous version on upgrade + + [ Iain Lane ] + * debian/patches/series, debian/rules: Drop menu renaming as we do not carry + this change from Debian and it breaks existing users' menu configurations. + + -- Sebastien Bacher Wed, 15 Jul 2009 17:40:17 +0200 + +gnome-menus (2.26.2-0ubuntu1) karmic; urgency=low + + * Merge with Debian unstable (LP: #390437), remaining changes: + + Add python-gmenu-dbg package + + debian/python-gmenu.install: Install for multiple python versions + + debian/patches/20_show-admin-tools-for-admin-group.patch: Keep Ubuntu + version; works with 2.26's code. + + debian/patches/*.patch: Refresh to apply cleanly + + debian/README.Debian: Add; has instructions about the admin patch + + debian/patches/09_app_install_entry.patch: Add; adds gnome-app-install + entry + + debian/patches/70_autoregen.patch: Add for admin tools patch + + debian/watch: Look for unstable versions too + * New upstream release 2.26.2 + + Improve performance by using a cache to not compute the same thing + again and again (Michael Meeks, Vincent) + + Use shave to improve build log readability (Vincent) + + Translators: + - Jordi Mallach (ca@valencia) + - Huxain (dv) + - Seán de Búrca (ga) + * debian/control: Add ${misc:Depends} to python-gmenu-dbg (Lintian) + + -- Iain Lane Mon, 13 Jul 2009 16:32:05 +0200 + +gnome-menus (2.26.1-2) unstable; urgency=low + + * 12_merge_duplicates.patch: use the version provided by upstream + instead of my gross hack. Thanks a lot, Vincent. + * 12_submenus_inherit.patch: stolen upstream. Make children correctly + inherit their parents’ layout. Necessary for + 12_merge_duplicates.patch to work. + * Point to versioned GPL. + + -- Josselin Mouette Sat, 27 Jun 2009 13:01:24 +0200 + +gnome-menus (2.26.1-1) unstable; urgency=low + + * New upstream release. + * python-gmenu.examples: add gnome-menus-ls.py. + * gnome-menus.install: don’t ship the example in here. + * 03_kde-legacydirs.patch: refreshed. + + -- Josselin Mouette Wed, 17 Jun 2009 22:54:01 +0200 + +gnome-menus (2.26.1-0ubuntu1) karmic; urgency=low + + * New upstream release: (LP: #388482) + - updated translations + * debian/patches/70_reautogen.patch: refreshed + * debian/control.in: + - add Vcs-Bzr tag + - re-generate debian/control + * Adapt debian/watch to get unstable version + + -- Didier Roche Wed, 17 Jun 2009 16:21:52 +0200 + +gnome-menus (2.26.0-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #344004) + * debian/patches: Regenerate autoreconf patch + + -- Iain Lane Tue, 17 Mar 2009 00:53:02 +0000 + +gnome-menus (2.25.5-0ubuntu3) jaunty; urgency=low + + * debian/python-gmenu.postinst: + - updated transition version so crufts are cleaned on upgrade (lp: #300253) + + -- Sebastien Bacher Wed, 04 Mar 2009 22:12:11 +0100 + +gnome-menus (2.25.5-0ubuntu2) jaunty; urgency=low + + * Build for python2.6, fix installation paths. + + -- Matthias Klose Sun, 22 Feb 2009 14:43:32 +0100 + +gnome-menus (2.25.5-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #319071) + - Use gnome-common macro to define DEPRECATED build variables + (Vincent) + * debian/patches/70_reautogen.patch: + - Refresh for new upstream version + + -- Pedro Fragoso Mon, 19 Jan 2009 23:49:51 +0000 + +gnome-menus (2.25.2-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #305256) + - Fix a critical warning in the python binding for monitoring + a file (Vincent) + - Ship a gnome-menus-ls.py script that is an example of python + bindings and that can be used as a replacement + for gnome-menu-spec-test + + -- Pedro Fragoso Thu, 04 Dec 2008 18:43:17 +0000 + +gnome-menus (2.24.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Thu, 12 Mar 2009 13:04:00 +0100 + +gnome-menus (2.24.2-1) experimental; urgency=low + + [ Loic Minier ] + * Drop Encoding=UTF-8 from debian/desktop-files/*.directory.in; deprecated. + * Don't purge /usr/lib/python2.?/site-packages/GMenuSimpleEditor during + first configuration. + + [ Josselin Mouette ] + * New upstream release. + * Bump intltool requirement; drop the libxml-parser-perl one. + * Bump shlibs version to 2.23.3. + * 01_preferences-legacydir.patch, 02_applications-legacydir.patch, + 04_settings-legacydir.patch: dropped, obsolete. + * Don’t rename preferences.menu, it doesn’t exist anymore. + * gnome-menus.preinst: remove gnome-preferences.menu upon upgrade. + * 06_menus_rename.patch: drop obsolete part. + * 08_menus_prefix.patch: refreshed. + * 11_science-menu.patch: updated to apply cleanly. + * 12_merge_duplicates.patch: do not re-sort merged menus that are not + inlined. + + -- Josselin Mouette Fri, 26 Dec 2008 17:43:03 +0100 + +gnome-menus (2.24.1-0ubuntu1) intrepid; urgency=low + + * New upstream version + + -- Sebastien Bacher Wed, 22 Oct 2008 16:25:18 +0200 + +gnome-menus (2.24.0-0ubuntu2) intrepid; urgency=low + + * debian/patches/09_games-menu.patch: + - don't use this debian change it breaks the games menu ordering + + -- Sebastien Bacher Mon, 06 Oct 2008 15:11:09 +0200 + +gnome-menus (2.24.0-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #273337) + - Translations updates + - debian/patches/70_reautogen.patch: + + Updated + + -- Pedro Fragoso Mon, 22 Sep 2008 22:35:58 +0100 + +gnome-menus (2.23.92-0ubuntu2) intrepid; urgency=low + + * debian/patches/12_merge_duplicates.patch: + - don't use this debian change, it breaks the system menu layout + + -- Sebastien Bacher Mon, 15 Sep 2008 17:53:59 +0200 + +gnome-menus (2.23.92-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #268121) + - Refresh patch 70_reautogen.patch for release + + -- Pedro Fragoso Tue, 09 Sep 2008 13:51:34 +0100 + +gnome-menus (2.23.91-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #263806) + * debian/patches/70_reautogen.patch: + - Updated + + -- Pedro Fragoso Tue, 02 Sep 2008 01:27:29 +0100 + +gnome-menus (2.23.6-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #254830) + - Fix the icon for the accessibility menu (Matthias Clasen) + * debian/patches/70_reautogen.patch: + - Updated + * debian/watch: + - Updated for 2.23.x releases + + -- Pedro Fragoso Tue, 05 Aug 2008 00:54:10 +0100 + +gnome-menus (2.23.5-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #251013) + * debian/control.in: + - Update b-d intltool to 0.40 + - Bump Standards-Version to 3.8.0 + * Change Maintainer to Desktop Team + + -- Pedro Fragoso Wed, 23 Jul 2008 03:08:21 +0100 + +gnome-menus (2.23.4-0ubuntu1) intrepid; urgency=low + + * New upstream version + * debian/patches/70_reautogen.patch: + - new version update + + -- Sebastien Bacher Tue, 17 Jun 2008 16:48:39 +0200 + +gnome-menus (2.22.2-4) unstable; urgency=low + + * 12_merge_duplicates.patch: also merge entries which appear more than + twice. Closes: #494667. + + -- Josselin Mouette Fri, 29 Aug 2008 11:21:11 +0200 + +gnome-menus (2.22.2-3) unstable; urgency=low + + * Rename Science.directory to GnomeScience.directory. Closes: #491184. + + -- Josselin Mouette Fri, 18 Jul 2008 18:14:21 +0200 + +gnome-menus (2.22.2-2) unstable; urgency=low + + * debian/po-up/ro.po: new Romanian translation from Eddy Petrișor. + Closes: #489070. + * 11_science-menu.patch: new patch. + + Split Science out of the Education menu. + + Use "science" icon for Science, "accessories" for Education, and + "utilities" for Accessories, since that fits better how the icons + were designed. + * Update translations accordingly. + * Standards version is 3.8.0. + * 09_games-menu.patch: lower the inline limit to 6. + + -- Josselin Mouette Tue, 15 Jul 2008 12:34:21 +0200 + +gnome-menus (2.22.2-1ubuntu1) intrepid; urgency=low + + * Sync on Debian + * debian/control.in: + - Build-Depends on python-all-dbg + - list python-gmenu-dbg + - package maintained by the Ubuntu Desktop Team + * debian/gnome-menus.install: + - updated + * debian/patches/06_menus_rename.patch: + - Debian specific change + * debian/patches/08_menus_prefix.patch: + - dropped, not required on Ubuntu + * debian/patches/09_app_install_entry.patch: + - put the gnome-app-install entry on the bottom of the application menu + * debian/README.Debian: + - documentations Ubuntu admin changes + * debian/rules: + - changes for python-dbg + - don't rename the menus we use the stock names for Ubuntu + - update translations template + + -- Sebastien Bacher Fri, 13 Jun 2008 15:05:58 +0200 + +gnome-menus (2.22.2-1) unstable; urgency=low + + * New upstream release. + * 11_accessibility_accessories.patch: dropped, merged upstream. + + -- Josselin Mouette Thu, 29 May 2008 00:52:40 +0200 + +gnome-menus (2.22.1-3) unstable; urgency=low + + * 12_merge_duplicates.patch: when merging subdirectories without the + inline_header property, sort again the entries after the merge. + Closes: #447823. Also filter out duplicates. Closes: #444587. + + -- Josselin Mouette Tue, 13 May 2008 13:14:12 +0200 + +gnome-menus (2.22.1-2) unstable; urgency=low + + * 09_games-menu.patch: don't use the flawed marker, + simply filter out all subcategories of the games menu. This should + avoid issues when the user or another menu system displays these + entries elsewhere. Closes: #479761. + * Fix capitalization of Python in the description. + * Move the .po updating process from the clean target to the update-po + target. + * Switch to python-support. + * python-gmenu.postinst: work around python-central not removing the + old files during upgrades. + + -- Josselin Mouette Tue, 06 May 2008 20:52:16 +0200 + +gnome-menus (2.22.1-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Tue, 08 Apr 2008 12:59:28 +0200 + +gnome-menus (2.22.0-1) unstable; urgency=low + + [ Josselin Mouette ] + * 11_accessibility_accessories.patch: new patch; exclude accessibility + tools from the Accessories directory, they are already in the + Universal Access menu. + + [ Sebastian Dröge ] + * New upstream stable release: + + debian/control.in: + - Update build dependencies. + + debian/patches/07_gnomevfs.patch: + - Dropped, not necessary anymore as GIO is used for monitoring now. + + debian/patches/70_reautogen.patch: + - Dropped, not necessary anymore. + + -- Sebastian Dröge Tue, 11 Mar 2008 17:12:21 +0100 + +gnome-menus (2.20.3-1) unstable; urgency=low + + * New upstream release with translation updates only: + + debian/patches/70_reautogen.patch: + - Regenerated for the new version. + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + + -- Sebastian Dröge Thu, 10 Jan 2008 10:53:18 +0100 + +gnome-menus (2.20.2-1) unstable; urgency=low + + * New upstream bugfix release with translation updates: + + debian/patches/70_reautogen.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Tue, 27 Nov 2007 06:27:02 +0100 + +gnome-menus (2.20.1-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/70_reautogen.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Fri, 26 Oct 2007 20:16:34 +0200 + +gnome-menus (2.20.0-2) unstable; urgency=low + + * debian/patches/07_gnomevfs.patch: + + Include gnome-vfs-utils.h to fix implicit pointer conversion which + breaks on archs where sizeof(void*)>sizeof(int). Thanks to + Dann Frazier for the patch (Closes: #443339). + + -- Sebastian Dröge Thu, 20 Sep 2007 20:20:12 +0200 + +gnome-menus (2.20.0-1) unstable; urgency=low + + [ Loic Minier ] + * Expand tabs in control. + * Cleanup rules. + * Update path 07_gnomevfs to use GnomeVFS to escape URIs; solves handling of + pathnames with spaces; from Ubuntu; thanks Sébastien Bacher. + + [ Sebastian Dröge ] + * New upstream release. + * Upload to unstable, drop check-dist include. + * debian/patches/70_reautogen.patch: + + Updated for the new version. + + -- Sebastian Dröge Thu, 20 Sep 2007 11:16:44 +0200 + +gnome-menus (2.19.6-1) experimental; urgency=low + + * New patch, but disabled by default, 20_show-admin-tools-for-admin-group, + permits hiding menu entries requiring root rights when the user isn't in + the admin group; found in the Ubuntu package. + * New upstream release series; these are development releases, the API may + still change incompatibly; no API change in this release though. + - Target at experimental; include check-dist.mk. + - Refresh patches 09_games-menu, 20_show-admin-tools-for-admin-group to + apply cleanly. + - Update relibtoolizing patch, 70_reautogen; run intltoolize too. + - New patch, 21_default-python-in-shebang, fixes shebang of + gmenu-simple-editor to use the default Python version. + + -- Loic Minier Fri, 03 Aug 2007 11:55:44 +0200 + +gnome-menus (2.18.3-2) unstable; urgency=low + + [ Josselin Mouette ] + * Debian.directory: don't display the Debian menu by default. It can + be enabled with the menu editor. + * Convert patches to quilt; build-depend on quilt. + * Remove pycompat and the dh_python call. + * Make the included menu translatable; build-depend on intltool. + * 09_games-menu.patch: split the games menu in submenus following the + desktop specification keywords. Use a default layout that doesn't + show them unless there are at least 8 games in the submenu. This + should avoid showing submenus by default while making the menu + usable for people with lots of games installed. + * The desktop-files/ directory contains desktop entries for these + submenus. + * The po-up/ directory contains translations for these entries. + + [ Christian Perrier ] + * Translations for po-up/: + - Picked 56 PO files from po-sections/ in the menu package. + Updates: + - Punjabi. Closes: #433570, #433571 + - Korean. Closes: #433576 + - Tamil. Closes: #433588 + - Gujarati. Closes: #433595 + - Thai. Closes: #433600 + - Spanish. Closes: #433601 + - Hungarian. Closes: #433605 + - Simplified Chinese. Closes: #433606 + - Basque. Closes: #433610 + - Polish. Closes: #433614 + - Bulgarian. Closes: #433617 + - German. Closes: #433628 + - Brazilian Portuguese. Closes: #433680 + - Wolof. Closes: #433696, #433702 + - Indonesian. Closes: #433764 + - Vietnamese. Closes: #433795 + - Swedish. Closes: #433930 + - Marathi. + - Czech. Closes: #434001 + - Simplified Chinese. Closes: #433606 + - Russian. Closes: #434780 + - German. Closes: #434785 + + [ Josselin Mouette ] + * Translations for po-up/: + - Lithuanian. Closes: #434805. + - Portuguese. Closes: #435032. + * Minor fixes in French translation. + + -- Josselin Mouette Sun, 29 Jul 2007 18:57:54 +0200 + +gnome-menus (2.18.3-1) unstable; urgency=low + + * New upstream stable release; no API change. + - Update autotools patch, 70_reautogen. + + -- Loic Minier Tue, 03 Jul 2007 19:58:18 +0200 + +gnome-menus (2.18.2-1) unstable; urgency=low + + * New upstream stable release; no API change. + - Let python-gmenu depend on python-gtk2 as GMenuSimpleEditor uses it. + - Update relibtoolizing patch which is required; add comments on how to + generate the patch. + + -- Loic Minier Mon, 28 May 2007 15:41:52 +0200 + +gnome-menus (2.18.0-2) unstable; urgency=low + + * Fix .orig file in patch 07_gnomevfs; fixes FTBFS on double build; + closes: #424341. + * Wrap build-deps and deps. + + -- Loic Minier Wed, 16 May 2007 16:37:00 +0200 + +gnome-menus (2.18.0-1) unstable; urgency=low + + * New upstream release. + * 07_gnomevfs.patch, 70_reautogen.patch: updated from the Ubuntu package. + gnome-vfs will still be used as default backend until inotify support is + enabled upstream by default. + + -- Sebastian Dröge Wed, 25 Apr 2007 06:26:26 +0200 + +gnome-menus (2.16.1-3) unstable; urgency=medium + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + + [ Josselin Mouette ] + * 06_menus_rename.patch: reinstate the renaming in the menu editor, as + we are lacking an interface for *saving* a renamed menu. + Closes: #411246. + + -- Josselin Mouette Sat, 17 Feb 2007 14:14:35 +0100 + +gnome-menus (2.16.1-2) unstable; urgency=low + + * 08_menus_prefix.patch: + + Only rename the specific menus we are renaming, avoid lookups + for gnome-anything.menu (closes: #403165, #403456). + + Strip the "gnome-" part specifically when opening the merged + directory. + + -- Josselin Mouette Thu, 21 Dec 2006 20:15:49 +0100 + +gnome-menus (2.16.1-1) unstable; urgency=low + + * New upstream translation release. + * 08_menus_prefix.patch: try "gnome-" as a prefix for menu files + instead of renaming them explicitly. This should make + applications-merged/ work as expected. + * 06_menus_rename.patch: only keep the gnome-preferences renaming. + * Build-depend on python-central 0.5 to please lintian. + * Bump shlibs version to 2.16.1-1 to allow relying on this feature. + + -- Josselin Mouette Mon, 4 Dec 2006 22:36:55 +0100 + +gnome-menus (2.16.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Loic Minier Thu, 19 Oct 2006 11:41:08 +0200 + +gnome-menus (2.16.0-1) experimental; urgency=low + + * New upstream release; no API change. + + -- Loic Minier Mon, 25 Sep 2006 16:42:44 +0200 + +gnome-menus (2.15.91-1) experimental; urgency=low + + * New upstream development releases, with API additions. + - Target at experimental. + - Bump up shlibs to >= 2.15.4. + - Update patches: 03_kde-legacydirs, 04_settings-legacydir, + 05_debian_menu, 06_menus_rename, 07_gnomevfs, 70_reautogen. + * Add CDBS' utils. + + -- Loic Minier Sun, 13 Aug 2006 19:04:07 +0200 + +gnome-menus (2.14.3-1) unstable; urgency=low + + * New upstream release, no API change. + - Update patch 70_reautogen. + + -- Loic Minier Tue, 8 Aug 2006 11:02:56 +0200 + +gnome-menus (2.14.0-8) unstable; urgency=low + + * Add debian/control to the pyversions -r call since it's mandatory, even if + the man page claims it's optional. + + -- Loic Minier Sat, 5 Aug 2006 20:53:29 +0200 + +gnome-menus (2.14.0-7) unstable; urgency=low + + * Let python-gmenu also Conflict with gnome-menus << 2.14.0-3, since the + historical Replace is not honored in Python packages following the newer + policy; thanks Josselin Mouette. (Closes: #381426) + + -- Loic Minier Sat, 5 Aug 2006 20:02:52 +0200 + +gnome-menus (2.14.0-6) unstable; urgency=low + + * Fix 07_gnomevfs patch which shipped a backup file. + + -- Loic Minier Thu, 27 Jul 2006 22:42:24 +0200 + +gnome-menus (2.14.0-5) unstable; urgency=medium + + * Add ${python:Provides} to python-gmenu. + * Build python-gmenu for all available versions of Python >= 2.3; + build-depend on python-all-dev. + * Remove trailing spaces. + * Move relibtoolizing patch (08_reautogen) to apply later, at 70_reautogen. + * New patch to use the default python path in gmenu-simple-editor, thanks + Joe Wreschnig. + + -- Loic Minier Thu, 27 Jul 2006 22:32:19 +0200 + +gnome-menus (2.14.0-4) unstable; urgency=low + + * Fix watch file. + * Update to new Python policy. (Closes: #373435) + - Bump up debhelper build-dep to 5.0.37.2. + - Set Python compatibility level to 2. + - Add XB-Python-Version to python-gmenu and gnome-menus. + - Add a python-central (>= 0.4.17) build-dep. + - Bump up cdbs build-dep to >= 0.4.43. + - Add a XS-Python-Version: current as gnome-menus is the only package to + depend on python-gmenu. + - Call dh_pycentral to fill XB-Python-Version and add a pycentral dep. + - Move the fixup snippet for the executable bit from binary-post-install + to binary-install, before dh_pycentral moves the files around. + + -- Loic Minier Thu, 13 Jul 2006 20:15:34 +0200 + +gnome-menus (2.14.0-3) unstable; urgency=low + + * Drop *.la files from libgnome-menu-dev as these were removed from its + reverse dependencies. + * Bump up Standards-Version to 3.7.2. + * Add even more ${misc:Depends}. + * Make package binNMU-safe. + - Add a dpkg-dev >= 1.13.19 build-dep. + - Use ${binary:Version} in inter-dependencies. + * Bump up Debhelper compatibility level to 5. + * Set executable bit on Python files with a shebang to make lintian happy. + * Install /usr/lib/python*/site-packages/GMenuSimpleEditor in python-gmenu + and not gnome-menus; let python-gmenu Replace gnome-menus << 2.14.0-3. + + -- Loic Minier Thu, 22 Jun 2006 15:28:27 +0200 + +gnome-menus (2.14.0-2) unstable; urgency=low + + [ Loic Minier ] + * Sync with overrides. + - Set libgnome-menu-dev Section to libdevel. + [debian/control, debian/control.in] + - Set python-gmenu Section to python. + [debian/control, debian/control.in] + + [ Josselin Mouette ] + * 07_gnomevfs.patch: use gnome-vfs instead of fam for monitoring. + This should be the end of the "menu disappeared" bugs. + * 08_reautogen.patch: the re-autogenisation that follows. + * control.in: replace dependencies and build-dependencies on fam by + gnome-vfs. Entirely remove the dependency for the -dev package, it's + not needed for a backend. + + -- Josselin Mouette Sat, 20 May 2006 07:11:17 +0200 + +gnome-menus (2.14.0-1) unstable; urgency=low + + * New upstream version + * Renamed the patches to use .patch instead of .diff + * debian/control.in: + - dropped gnomevfs requirement it doesn't use it + * debian/libgnome-menu2.shlibs: + - updated shlibs version + * debian/patches/06_menus_rename.patch: + - updated + * debian/patches/07_relibtoolise.patch: + - not required + * debian/watch: + - updated + + [ J.H.M. Dassen (Ray) ] + * [patches/07_relibtoolise.diff] Added to do away with unneeded direct + library dependencies in the gnome-menus package. + + [ Josselin Mouette ] + * Acknowledge NMU: + + Add python-glade2 depends for gnome-menus (Closes: #347176). + + -- Sebastien Bacher Sat, 29 Apr 2006 15:26:42 +0200 + +gnome-menus (2.12.0-2) unstable; urgency=low + + * debian/control.in: + - depend on ${python:Depends}. + * Upload to unstable. + + -- Josselin Mouette Mon, 2 Jan 2006 14:03:46 +0100 + +gnome-menus (2.12.0-1) experimental; urgency=low + + * New upstream version: + - ship a menu editor (Closes: #332976). + - use Education instead of Edutainment (Closes: #314491). + * debian/control.in: + - new python-gmenu package. + - updated for the soname change. + - updated the Build-Depends/Depends for the new packages. + - updated the Standards-Version. + * debian/gnome-menus.install: + - updated for new files. + * debian/patches/04_settings-legacydir.diff: + - updated. + * debian/patches/06_menus_rename.diff: + - updated. + * debian/rules: + - use dh_python. + * debian/watch: + - updated + + -- Sebastien Bacher Mon, 17 Oct 2005 14:45:15 +0200 + +gnome-menus (2.10.2-1) unstable; urgency=low + + * New upstream version: + - make user .desktop files correctly override system ones. + - remove from settings menu. + - fix memory leaks on re-load. + - fix issue with duplicate sub-menus. + + -- Sebastien Bacher Tue, 28 Jun 2005 11:19:50 +0200 + +gnome-menus (2.10.1-3) unstable; urgency=low + + * debian/patches/04_settings-legacydir.diff: + - don't use LegacyDir for the Desktop menu (Closes: #304326). + + -- Sebastien Bacher Tue, 14 Jun 2005 14:24:47 +0200 + +gnome-menus (2.10.1-2) unstable; urgency=low + + * Upload to unstable. + * debian/patches/06_menus_rename.diff: + - patch for the menus rename. + * debian/rules: + - renamed menu files to not conflict with other desktops + (Closes: #307098). + + -- Sebastien Bacher Tue, 7 Jun 2005 19:47:00 +0200 + +gnome-menus (2.10.1-1) experimental; urgency=low + + * Initial upload to debian. + + -- Sebastien Bacher Wed, 23 Mar 2005 18:35:08 +0100 + +gnome-menus (2.10.1-0ubuntu1) hoary; urgency=low + + * New upstream release: + - add support for new "type" argument to . + - monitor s for changes. + - make user desktop entries override system ones. + - make .directory files in s be pulled in. + - fix weirdess with [KDE Desktop Entry] files. + - fix s which don't contain any entries in the toplevel. + - make sure items in s as allocated. + - make s with a prefix work correctly. + * debian/patches/03_kde-legacydirs.diff: + - don't use KDELegacyDirs. + + -- Sebastien Bacher Wed, 23 Mar 2005 15:28:55 +0100 + +gnome-menus (2.10.0-0ubuntu1) hoary; urgency=low + + * New upstream release. + * debian/watch: + - updated. + + -- Sebastien Bacher Mon, 7 Mar 2005 16:09:23 +0100 + +gnome-menus (2.9.92-0ubuntu1) hoary; urgency=low + + * New upstream release: + - fix issue with file monitoring and subdirs of (Hoary: #5934). + + -- Sebastien Bacher Tue, 1 Mar 2005 12:39:23 +0100 + +gnome-menus (2.9.90-0ubuntu1) hoary; urgency=low + + * New upstream release: + - do not include the Core category in the Other menu (Hoary: #5484). + * debian/patches/06_launchbox.diff: + - removed, these changes are in the new version. + + -- Sebastien Bacher Tue, 25 Jan 2005 19:24:59 +0100 + +gnome-menus (2.9.4-0ubuntu2) hoary; urgency=low + + * debian/patches/06_launchbox.diff: + - added the patch for GNOME launch box. + + -- Sebastien Bacher Thu, 20 Jan 2005 13:09:25 +0100 + +gnome-menus (2.9.4-0ubuntu1) hoary; urgency=low + + * New upstream release: + - new menus layout. + - reload menus correctly when they are deleted/updated . + * debian/patches/03_menu_layout.diff: + - removed, the changes are included upstream. + + -- Sebastien Bacher Tue, 11 Jan 2005 00:18:45 +0100 + +gnome-menus (2.9.3-0ubuntu1) hoary; urgency=low + + * New upstream release. + * debian/patches/05_debian_menu.diff: + - patch for the Debian menu. + + -- Sebastien Bacher Tue, 21 Dec 2004 22:34:04 +0100 + +gnome-menus (2.9.2cvs041212-0ubuntu4) hoary; urgency=low + + * The Applications menu has an entry for the Debian menu now. If you want to + get it you only need to install menu and menu-xdg. + * layout/applications.menu: + - added an entry for the Debian menu. + * debian/Debian.directory: + - added. + * debian/gnome-menus.install: + - install Debian.directory. + + -- Sebastien Bacher Sun, 19 Dec 2004 21:32:34 +0100 + +gnome-menus (2.9.2cvs041212-0ubuntu3) hoary; urgency=low + + * control.in: should have been kdelibs-data not kdelibs + + -- Chris Halls Wed, 15 Dec 2004 00:29:08 +0000 + +gnome-menus (2.9.2cvs041212-0ubuntu2) hoary; urgency=low + + * control.in: gnome-menus Replaces pre-hoary kdelibs-data (file conflict) + + -- Chris Halls Tue, 14 Dec 2004 18:51:16 +0000 + +gnome-menus (2.9.2cvs041212-0ubuntu1) hoary; urgency=low + + * CVS snapshot. + * debian/patches/03_menu_layout.diff: + - patch by Vincent Untz for the new menu layout. + * debian/patches/04_settings-legacydir.diff: + - merged the old capplet .desktop locations here too. + + -- Sebastien Bacher Sun, 12 Dec 2004 19:44:20 +0100 + +gnome-menus (2.9.2-0ubuntu3) hoary; urgency=low + + * debian/patches/*: + - Merge the old capplet .desktop locations. + + -- Jeff Waugh Tue, 7 Dec 2004 16:55:37 +0100 + +gnome-menus (2.9.2-0ubuntu2) hoary; urgency=low + + * debian/control.in: + - updated the Build-Depends. + + -- Sebastien Bacher Tue, 30 Nov 2004 19:21:39 +0100 + +gnome-menus (2.9.2-0ubuntu1) hoary; urgency=low + + * Initial Release. + + -- Sebastien Bacher Tue, 30 Nov 2004 12:49:00 +0100 + --- gnome-menus-2.28.0.1.orig/debian/libgnome-menu-dev.install +++ gnome-menus-2.28.0.1/debian/libgnome-menu-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/*.a +debian/tmp/usr/lib/*.so +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig --- gnome-menus-2.28.0.1.orig/debian/gnome-menus.preinst +++ gnome-menus-2.28.0.1/debian/gnome-menus.preinst @@ -0,0 +1,33 @@ +#! /bin/sh +set -e + +# Remove a no-longer used conffile +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" le "2.22.2-4"; then + rm_conffile gnome-menus "/etc/xdg/menus/gnome-preferences.menu" + fi + if dpkg --compare-versions "$2" le "2.26.2-0ubuntu1"; then + rm_conffile gnome-menus "/etc/xdg/menus/gnome-applications.menu" + rm_conffile gnome-menus "/etc/xdg/menus/gnome-settings.menu" + fi +esac + +#DEBHELPER# --- gnome-menus-2.28.0.1.orig/debian/README.Debian +++ gnome-menus-2.28.0.1/debian/README.Debian @@ -0,0 +1,7 @@ +gnome-menus for Ubuntu +---------------------- + +The Ubuntu gnome-menus is patched to list the menu items using "X-KDE-SubstituteUID=true" when: +- the user is member of the "admin" group +- the uid=0 +- the USER_IS_ADMIN environment variable is defined --- gnome-menus-2.28.0.1.orig/debian/libgnome-menu2.shlibs +++ gnome-menus-2.28.0.1/debian/libgnome-menu2.shlibs @@ -0,0 +1 @@ +libgnome-menu 2 libgnome-menu2 (>= 2.27.92) --- gnome-menus-2.28.0.1.orig/debian/gnome-menus.install +++ gnome-menus-2.28.0.1/debian/gnome-menus.install @@ -0,0 +1,8 @@ +debian/tmp/etc +debian/tmp/usr/bin +debian/tmp/usr/share/locale +debian/tmp/usr/share/gnome-menus/ui +debian/tmp/usr/share/applications +debian/tmp/usr/share/desktop-directories +layout/settings.menu /etc/xdg/menus +debian/desktop-files/*.directory /usr/share/desktop-directories --- gnome-menus-2.28.0.1.orig/debian/control.in +++ gnome-menus-2.28.0.1/debian/control.in @@ -0,0 +1,104 @@ +Source: gnome-menus +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: @GNOME_TEAM@ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu +Build-Depends: debhelper (>= 5.0.37.2), + cdbs (>= 0.4.43), + libglib2.0-dev (>= 2.15.2), + python-all-dev, + python-all-dbg, + libxml-parser-perl, + gnome-pkg-tools, + dpkg-dev (>= 1.13.19), + python-support (>= 0.6), + quilt, + intltool (>= 0.40.0) +Standards-Version: 3.8.2 +XS-Python-Version: >= 2.3 + +Package: gnome-menus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python-gmenu (= ${binary:Version}) +Replaces: kdelibs-data (<< 4:3.3.2-1ubuntu1) +XB-Python-Version: ${python:Versions} +Description: an implementation of the freedesktop menu specification for GNOME + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + +Package: libgnome-menu2 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: an implementation of the freedesktop menu specification for GNOME + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + . + This package contains the shared library. + +Package: libgnome-menu-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + libgnome-menu2 (= ${binary:Version}), + libglib2.0-dev (>= 2.15.2) +Description: an implementation of the freedesktop menu specification for GNOME + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + . + This package contains the development headers. + +Package: python-gmenu +Architecture: any +Section: python +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python-gtk2 +Conflicts: gnome-menus (<< 2.14.0-3) +Replaces: gnome-menus (<< 2.14.0-3) +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: an implementation of the freedesktop menu specification for GNOME + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + . + This package contains the Python binding. + +Package: python-gmenu-dbg +Priority: extra +Architecture: any +Section: python +Depends: python-gmenu (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} +Description: Python bindings for the freedesktop menu specification for GNOME (debug extension) + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + This package contains the python binding for the debug interpreter. --- gnome-menus-2.28.0.1.orig/debian/compat +++ gnome-menus-2.28.0.1/debian/compat @@ -0,0 +1 @@ +5 --- gnome-menus-2.28.0.1.orig/debian/patches/70_autoregen.patch +++ gnome-menus-2.28.0.1/debian/patches/70_autoregen.patch @@ -0,0 +1,15751 @@ +diff -Nur gnome-menus-2.28.0.1/aclocal.m4 gnome-menus-2.28.0.1.ubuntu/aclocal.m4 +--- gnome-menus-2.28.0.1/aclocal.m4 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/aclocal.m4 2009-10-01 18:12:09.000000000 +0200 +@@ -13,2040 +13,2039 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +-[m4_warning([this file was generated for autoconf 2.63. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, ++[m4_warning([this file was generated for autoconf 2.64. + 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'.])]) + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-# (This private macro should not be called outside this file.) +-AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.11' +-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +-dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +-]) +- +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) +- +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl +-m4_ifndef([AC_AUTOCONF_VERSION], +- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +- +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- +- +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. + # +-# 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. +- +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. + # +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. ++# Macro to add for using GNU gettext. ++# Ulrich Drepper , 1995, 1996 + # +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 + # +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 + # +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 + # +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +-# Free Software Foundation, Inc. ++# Modified to require ngettext ++# Matthias Clasen 08/06/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. ++# We need this here as well, since someone might use autoconf-2.5x ++# to configure GLib then an older version to configure a package ++# using AM_GLIB_GNU_GETTEXT ++AC_PREREQ(2.53) + +-# serial 9 ++dnl ++dnl We go to great lengths to make sure that aclocal won't ++dnl try to pull in the installed version of these macros ++dnl when running aclocal in the glib directory. ++dnl ++m4_copy([AC_DEFUN],[glib_DEFUN]) ++m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++dnl ++dnl At the end, if we're not within glib, we'll define the public ++dnl definitions in terms of our private definitions. ++dnl + +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl +-m4_define([_AM_COND_VALUE_$1], [$2])dnl +-if $2; then +- $1_TRUE= +- $1_FALSE='#' ++# GLIB_LC_MESSAGES ++#-------------------- ++glib_DEFUN([GLIB_LC_MESSAGES], ++ [AC_CHECK_HEADERS([locale.h]) ++ if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++ fi]) ++ ++# GLIB_PATH_PROG_WITH_TEST ++#---------------------------- ++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) + else +- $1_TRUE='#' +- $1_FALSE= ++ AC_MSG_RESULT(no) + fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 10 ++AC_SUBST($1)dnl ++]) + +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [USE_NLS=yes ++ AC_SUBST(USE_NLS) + ++ gt_cv_have_gettext=no + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], UPC, [depcc="$UPC" am_compiler_list=], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- am__universal=false +- m4_case([$1], [CC], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac], +- [CXX], +- [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 ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !ngettext ("","", 1)], ++ gt_cv_func_ngettext_libc=yes, ++ gt_cv_func_ngettext_libc=no) ++ ]) ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, ++ gt_cv_func_dgettext_libc=no) ++ ]) + 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_$1_dependencies_compiler_type=$depmode +- break ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CHECK_FUNCS(bind_textdomain_codeset) + fi +- fi +- done + +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)])]) + ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv)], ++ :,-liconv) ++ fi + +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ LIBS="$glib_save_LIBS" + ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +-]) ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ]) + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is not GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" ++ fi ++ fi + +-#serial 5 ++ # We need to process the po/ directory. ++ POSUB=po + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[{ +- # Autoconf 2.62 quotes --file arguments for eval, but not when files +- # are listed without --file. Let's play safe and only enable the eval +- # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac +- shift +- for mf +- do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) ++ ++ 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. ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" + done +- done +-} +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS + ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(PO_IN_DATADIR_TRUE) ++ AC_SUBST(PO_IN_DATADIR_FALSE) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) + +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) ++# AM_GLIB_GNU_GETTEXT ++# ------------------- ++# Do checks necessary for use of gettext. If a suitable implementation ++# of gettext is found in either in libintl or in the C library, ++# it will set INTLLIBS to the libraries needed for use of gettext ++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ++# on various variables needed by the Makefile.in.in installed by ++# glib-gettextize. ++dnl ++glib_DEFUN([GLIB_GNU_GETTEXT], ++ [AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ ++ GLIB_LC_MESSAGES ++ GLIB_WITH_NLS + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ AC_MSG_CHECKING(for catalogs to be installed) ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ AC_MSG_RESULT($LINGUAS) ++ fi + +-# serial 8 ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi + +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) + +-# Do all the work for Automake. -*- Autoconf -*- ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` ++else ++ localedir=`eval echo "${datadir}/locale"` ++fi ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) ++]) ++ ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl + +-# serial 16 ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. + +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.62])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- fi +-fi ++# gnome-common.m4 ++# + +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +-AC_SUBST([CYGPATH_W]) ++dnl GNOME_COMMON_INIT + +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++AC_DEFUN([GNOME_COMMON_INIT], ++[ ++ dnl this macro should come after AC_CONFIG_MACRO_DIR ++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) + +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ dnl ensure that when the Automake generated makefile calls aclocal, ++ dnl it honours the $ACLOCAL_FLAGS environment variable ++ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" ++ if test -n "$ac_macro_dir"; then ++ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" ++ fi + +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +-]) +-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +-AC_CONFIG_COMMANDS_PRE(dnl +-[m4_provide_if([_AM_COMPILER_EXEEXT], +- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ++ AC_SUBST([ACLOCAL_AMFLAGS]) + ]) + +-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +-dnl mangled by Autoconf and run in a shell conditional statement. +-m4_define([_AC_COMPILER_EXEEXT], +-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) ++AC_DEFUN([GNOME_DEBUG_CHECK], ++[ ++ AC_ARG_ENABLE([debug], ++ AC_HELP_STRING([--enable-debug], ++ [turn on debugging]),, ++ [enable_debug=no]) + ++ if test x$enable_debug = xyes ; then ++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1, ++ [Enable additional debugging at the expense of performance and size]) ++ fi ++]) + +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. ++dnl GNOME_MAINTAINER_MODE_DEFINES () ++dnl define DISABLE_DEPRECATED ++dnl ++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], ++[ ++ AC_REQUIRE([AM_MAINTAINER_MODE]) + +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_arg=$1 +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $_am_arg | $_am_arg:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) ++ if test $USE_MAINTAINER_MODE = yes; then ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" ++ else ++ DISABLE_DEPRECATED="" ++ fi ++ AC_SUBST(DISABLE_DEPRECATED) ++]) + +-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl GNOME_COMPILE_WARNINGS ++dnl Turn on many useful compiler warnings ++dnl For now, only works on GCC ++AC_DEFUN([GNOME_COMPILE_WARNINGS],[ ++ dnl ****************************** ++ dnl More compiler warnings ++ dnl ****************************** + +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-if test x"${install_sh}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +- *) +- install_sh="\${SHELL} $am_aux_dir/install-sh" +- esac +-fi +-AC_SUBST(install_sh)]) ++ AC_ARG_ENABLE(compile-warnings, ++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], ++ [Turn on compiler warnings]),, ++ [enable_compile_warnings="m4_default([$1],[yes])"]) + +-# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ warnCFLAGS= ++ if test "x$GCC" != xyes; then ++ enable_compile_warnings=no ++ fi + +-# serial 2 ++ warning_flags= ++ realsave_CFLAGS="$CFLAGS" + +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) ++ case "$enable_compile_warnings" in ++ no) ++ warning_flags= ++ ;; ++ minimum) ++ warning_flags="-Wall" ++ ;; ++ yes) ++ warning_flags="-Wall -Wmissing-prototypes" ++ ;; ++ maximum|error) ++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" ++ CFLAGS="$warning_flags $CFLAGS" ++ for option in -Wno-sign-compare; do ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $option" ++ AC_MSG_CHECKING([whether gcc understands $option]) ++ AC_TRY_COMPILE([], [], ++ has_option=yes, ++ has_option=no,) ++ CFLAGS="$SAVE_CFLAGS" ++ AC_MSG_RESULT($has_option) ++ if test $has_option = yes; then ++ warning_flags="$warning_flags $option" ++ fi ++ unset has_option ++ unset SAVE_CFLAGS ++ done ++ unset option ++ if test "$enable_compile_warnings" = "error" ; then ++ warning_flags="$warning_flags -Werror" ++ fi ++ ;; ++ *) ++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) ++ ;; ++ esac ++ CFLAGS="$realsave_CFLAGS" ++ AC_MSG_CHECKING(what warning flags to pass to the C compiler) ++ AC_MSG_RESULT($warning_flags) + +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++ AC_ARG_ENABLE(iso-c, ++ AC_HELP_STRING([--enable-iso-c], ++ [Try to warn if code is not ISO C ]),, ++ [enable_iso_c=no]) + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) ++ complCFLAGS= ++ if test "x$enable_iso_c" != "xno"; then ++ if test "x$GCC" = "xyes"; then ++ case " $CFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -ansi" ;; ++ esac ++ case " $CFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCFLAGS) + +-# serial 5 ++ WARN_CFLAGS="$warning_flags $complCFLAGS" ++ AC_SUBST(WARN_CFLAGS) ++]) + +-# AM_MAINTAINER_MODE([DEFAULT-MODE]) +-# ---------------------------------- +-# Control maintainer-specific portions of Makefiles. +-# Default is to disable them, unless `enable' is passed literally. +-# For symmetry, `disable' may be passed as well. Anyway, the user +-# can override the default with the --enable/--disable switch. +-AC_DEFUN([AM_MAINTAINER_MODE], +-[m4_case(m4_default([$1], [disable]), +- [enable], [m4_define([am_maintainer_other], [disable])], +- [disable], [m4_define([am_maintainer_other], [enable])], +- [m4_define([am_maintainer_other], [enable]) +- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +- dnl maintainer-mode's default is 'disable' unless 'enable' is passed +- AC_ARG_ENABLE([maintainer-mode], +-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- [USE_MAINTAINER_MODE=$enableval], +- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST([MAINT])dnl +-] +-) ++dnl For C++, do basically the same thing. + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++AC_DEFUN([GNOME_CXX_WARNINGS],[ ++ AC_ARG_ENABLE(cxx-warnings, ++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] ++ [Turn on compiler warnings.]),, ++ [enable_cxx_warnings="m4_default([$1],[minimum])"]) + +-# Check to see how 'make' treats includes. -*- Autoconf -*- ++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) ++ warnCXXFLAGS= ++ if test "x$GXX" != xyes; then ++ enable_cxx_warnings=no ++ fi ++ if test "x$enable_cxx_warnings" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-Wall[\ \ ]*) ;; ++ *) warnCXXFLAGS="-Wall -Wno-unused" ;; ++ esac + +-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ ## -W is not all that useful. And it cannot be controlled ++ ## with individual -Wno-xxx flags, unlike -Wall ++ if test "x$enable_cxx_warnings" = "xyes"; then ++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" ++ fi ++ fi ++ fi ++ AC_MSG_RESULT($warnCXXFLAGS) + +-# serial 4 ++ AC_ARG_ENABLE(iso-cxx, ++ AC_HELP_STRING([--enable-iso-cxx], ++ [Try to warn if code is not ISO C++ ]),, ++ [enable_iso_cxx=no]) + +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo this is the am__doit target +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# Ignore all kinds of additional output from `make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- ;; +- esac +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) ++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) ++ complCXXFLAGS= ++ if test "x$enable_iso_cxx" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; ++ esac + +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ case " $CXXFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCXXFLAGS) + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ++ AC_SUBST(WARN_CXXFLAGS) ++]) + +-# serial 6 ++# nls.m4 serial 3 (gettext-0.15) ++dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++dnl ++dnl This file can can be used in projects which are not available under ++dnl the GNU General Public License or the GNU Library General Public ++dnl License but which still want to provide support for the GNU gettext ++dnl functionality. ++dnl Please note that the actual code of the GNU gettext library is covered ++dnl by the GNU Library General Public License, and the rest of the GNU ++dnl gettext package package is covered by the GNU General Public License. ++dnl They are *not* in the public domain. + +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++dnl Authors: ++dnl Ulrich Drepper , 1995-2000. ++dnl Bruno Haible , 2000-2003. + ++AC_PREREQ(2.50) + +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl +-if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac +-fi +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) +-fi ++AC_DEFUN([AM_NLS], ++[ ++ AC_MSG_CHECKING([whether NLS is requested]) ++ dnl Default is enabled NLS ++ AC_ARG_ENABLE(nls, ++ [ --disable-nls do not use Native Language Support], ++ USE_NLS=$enableval, USE_NLS=yes) ++ AC_MSG_RESULT($USE_NLS) ++ AC_SUBST(USE_NLS) + ]) + +-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant . + # +-# 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. +- +-# AM_PROG_MKDIR_P +-# --------------- +-# Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +-]) ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. + +-# Helper functions for option handling. -*- Autoconf -*- ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++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 ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG + +-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # +-# 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 ++# 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 ++# -------------------------------------------------------------- ++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_ifvaln([$3], [else ++ $3])dnl ++fi]) + +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG + +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED + +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 +-# Free Software Foundation, Inc. ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) + # +-# 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. +- +-# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-# --------------------------------------------------------------------------- +-# Adds support for distributing Python modules and packages. To +-# install modules, copy them to $(pythondir), using the python_PYTHON +-# automake variable. To install a package with the same name as the +-# automake package, install to $(pkgpythondir), or use the +-# pkgpython_PYTHON automake variable. + # +-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as +-# locations to install python extension modules (shared libraries). +-# Another macro is required to find the appropriate flags to compile +-# extension modules. ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac + # +-# If your package is configured with a different prefix to python, +-# users will have to add the install directory to the PYTHONPATH +-# environment variable, or create a .pth file (see the python +-# documentation for details). + # +-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will +-# cause an error if the version of python installed on the system +-# doesn't meet the requirement. MINIMUM-VERSION should consist of +-# numbers and dots only. +-AC_DEFUN([AM_PATH_PYTHON], +- [ +- dnl Find a Python interpreter. Python versions prior to 2.0 are not +- dnl supported. (2.0 was released on October 16, 2000). +- m4_define_default([_AM_PYTHON_INTERPRETER_LIST], +- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl +-python2.1 python2.0]) +- +- m4_if([$1],[],[ +- dnl No version check is needed. +- # Find any Python interpreter. +- if test -z "$PYTHON"; then +- AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) +- fi +- am_display_PYTHON=python +- ], [ +- dnl A version check is needed. +- if test -n "$PYTHON"; then +- # If the user set $PYTHON, use it and don't search something else. +- AC_MSG_CHECKING([whether $PYTHON version >= $1]) +- AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], +- [AC_MSG_RESULT(yes)], +- [AC_MSG_ERROR(too old)]) +- am_display_PYTHON=$PYTHON +- else +- # Otherwise, try each interpreter until we find one that satisfies +- # VERSION. +- AC_CACHE_CHECK([for a Python interpreter with version >= $1], +- [am_cv_pathless_PYTHON],[ +- for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do +- test "$am_cv_pathless_PYTHON" = none && break +- AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) +- done]) +- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. +- if test "$am_cv_pathless_PYTHON" = none; then +- PYTHON=: +- else +- AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) +- fi +- am_display_PYTHON=$am_cv_pathless_PYTHON +- fi +- ]) ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +- if test "$PYTHON" = :; then +- dnl Run any user-specified action, or abort. +- m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) +- else ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) + +- dnl Query Python for its version number. Getting [:3] seems to be +- dnl the best way to do this; it's what "site.py" does in the standard +- dnl library. ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +- AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], +- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) +- AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) + +- dnl Use the values of $prefix and $exec_prefix for the corresponding +- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made +- dnl distinct variables so they can be overridden if need be. However, +- dnl general consensus is that you shouldn't need this ability. ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + +- AC_SUBST([PYTHON_PREFIX], ['${prefix}']) +- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: + +- dnl At times (like when building shared libraries) you may want +- dnl to know which OS platform Python thinks this is. ++$$1_PKG_ERRORS + +- AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], +- [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) +- AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[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. + +- dnl Set up 4 directories: ++_PKG_TEXT + +- dnl pythondir -- where to install python scripts. This is the +- dnl site-packages directory, not the python standard library +- dnl directory like in previous automake betas. This behavior +- dnl is more consistent with lispdir.m4 for example. +- dnl Query distutils for this directory. distutils does not exist in +- dnl Python 1.5, so we fall back to the hardcoded directory if it +- dnl doesn't work. +- AC_CACHE_CHECK([for $am_display_PYTHON script directory], +- [am_cv_python_pythondir], +- [if test "x$prefix" = xNONE +- then +- am_py_prefix=$ac_default_prefix +- else +- am_py_prefix=$prefix +- fi +- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || +- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` +- case $am_cv_python_pythondir in +- $am_py_prefix*) +- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` +- ;; +- esac +- ]) +- AC_SUBST([pythondir], [$am_cv_python_pythondir]) ++To get pkg-config, see .])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES + +- dnl pkgpythondir -- $PACKAGE directory under pythondir. Was +- dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is +- dnl more consistent with the rest of automake. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.11' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.11], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) + +- dnl pyexecdir -- directory for installing python extension modules +- dnl (shared libraries) +- dnl Query distutils for this directory. distutils does not exist in +- dnl Python 1.5, so we fall back to the hardcoded directory if it +- dnl doesn't work. +- AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], +- [am_cv_python_pyexecdir], +- [if test "x$exec_prefix" = xNONE +- then +- am_py_exec_prefix=$am_py_prefix +- else +- am_py_exec_prefix=$exec_prefix +- fi +- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || +- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` +- case $am_cv_python_pyexecdir in +- $am_py_exec_prefix*) +- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` +- ;; +- esac +- ]) +- AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + +- dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++[AM_AUTOMAKE_VERSION([1.11])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +- AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +- dnl Run any user-specified action. +- $2 +- fi ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-]) ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. + ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) + +-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +-# --------------------------------------------------------------------------- +-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. +-# Run ACTION-IF-FALSE otherwise. +-# This test uses sys.hexversion instead of the string equivalent (first +-# word of sys.version), in order to cope with versions such as 2.2c1. +-# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). +-AC_DEFUN([AM_PYTHON_CHECK_VERSION], +- [prog="import sys +-# split strings by '.' and convert to numeric. Append some zeros +-# because we need at least 4 digits for the hex conversion. +-# map returns an iterator in Python 3.0 and a list in 2.x +-minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] +-minverhex = 0 +-# xrange is not present in Python 3.0 and range returns an iterator +-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] +-sys.exit(sys.hexversion < minverhex)" +- AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) ++# AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 ++# Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# AM_RUN_LOG(COMMAND) +-# ------------------- +-# Run COMMAND, save the exit status in ac_status, and log it. +-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +-AC_DEFUN([AM_RUN_LOG], +-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD +- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- (exit $ac_status); }]) ++# serial 9 + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 ++# serial 10 + +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Reject unsafe characters in $srcdir or the absolute working directory +-# name. Accept space and tab only in the latter. +-am_lf=' +-' +-case `pwd` in +- *[[\\\"\#\$\&\'\`$am_lf]]*) +- AC_MSG_ERROR([unsafe absolute working directory name]);; +-esac +-case $srcdir in +- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) +- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +-esac ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ ++ ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl ++ ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) ++ ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) + +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ 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 + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi ++ # 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_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : ++ cd .. ++ rm -rf conftest.dir + else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) ++ am_cv_$1_dependencies_compiler_type=none + fi +-AC_MSG_RESULT(yes)]) +- +-# Copyright (C) 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) + +-# serial 1 + +-# AM_SILENT_RULES([DEFAULT]) +-# -------------------------- +-# Enable less verbose build rules; with the default set to DEFAULT +-# (`yes' being less verbose, `no' or empty being verbose). +-AC_DEFUN([AM_SILENT_RULES], +-[AC_ARG_ENABLE([silent-rules], +-[ --enable-silent-rules less verbose build output (undo: `make V=1') +- --disable-silent-rules verbose build output (undo: `make V=0')]) +-case $enable_silent_rules in +-yes) AM_DEFAULT_VERBOSITY=0;; +-no) AM_DEFAULT_VERBOSITY=1;; +-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +-esac +-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +-AM_BACKSLASH='\' +-AC_SUBST([AM_BACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl + ]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. + +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' + fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) + +-# Copyright (C) 2006, 2008 Free Software Foundation, Inc. ++# Generate code to set up dependency tracking. -*- Autoconf -*- ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 ++#serial 5 + +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++ done ++} ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS + +-# AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Public sister of _AM_SUBST_NOTMAKE. +-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +-# Check how to create a tarball. -*- Autoconf -*- ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) + +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 +- +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. +-# +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar +-# +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac +- +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break ++# serial 8 + +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR ++# Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1995-2002 Free Software Foundation, Inc. +-# Copyright (C) 2001-2003,2004 Red Hat, Inc. +-# +-# This file is free software, distributed under the terms of the GNU +-# General Public License. As a special exception to the GNU General +-# Public License, this file may be distributed as part of a program +-# that contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# This file can be copied and used freely without restrictions. It can +-# be used in projects which are not available under the GNU Public License +-# but which still want to provide support for the GNU gettext functionality. +-# +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995, 1996 +-# +-# Modified to never use included libintl. +-# Owen Taylor , 12/15/1998 +-# +-# Major rework to remove unused code +-# Owen Taylor , 12/11/2002 +-# +-# Added better handling of ALL_LINGUAS from GNU gettext version +-# written by Bruno Haible, Owen Taylor 5/30/3002 +-# +-# Modified to require ngettext +-# Matthias Clasen 08/06/2004 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. + # +-# We need this here as well, since someone might use autoconf-2.5x +-# to configure GLib then an older version to configure a package +-# using AM_GLIB_GNU_GETTEXT +-AC_PREREQ(2.53) ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-dnl +-dnl We go to great lengths to make sure that aclocal won't +-dnl try to pull in the installed version of these macros +-dnl when running aclocal in the glib directory. +-dnl +-m4_copy([AC_DEFUN],[glib_DEFUN]) +-m4_copy([AC_REQUIRE],[glib_REQUIRE]) +-dnl +-dnl At the end, if we're not within glib, we'll define the public +-dnl definitions in terms of our private definitions. +-dnl ++# serial 16 + +-# GLIB_LC_MESSAGES +-#-------------------- +-glib_DEFUN([GLIB_LC_MESSAGES], +- [AC_CHECK_HEADERS([locale.h]) +- if test $ac_cv_header_locale_h = yes; then +- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, +- [AC_TRY_LINK([#include ], [return LC_MESSAGES], +- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) +- if test $am_cv_val_LC_MESSAGES = yes; then +- AC_DEFINE(HAVE_LC_MESSAGES, 1, +- [Define if your file defines LC_MESSAGES.]) +- fi +- fi]) ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. + +-# GLIB_PATH_PROG_WITH_TEST +-#---------------------------- +-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +- AC_MSG_RESULT([$]$1) +-else +- AC_MSG_RESULT(no) ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.62])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi + fi +-AC_SUBST($1)dnl +-]) + +-# GLIB_WITH_NLS +-#----------------- +-glib_DEFUN([GLIB_WITH_NLS], +- dnl NLS is obligatory +- [USE_NLS=yes +- AC_SUBST(USE_NLS) +- +- gt_cv_have_gettext=no ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) + +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +- AC_CHECK_HEADER(libintl.h, +- [gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +- # +- # First check in libc +- # +- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !ngettext ("","", 1)], +- gt_cv_func_ngettext_libc=yes, +- gt_cv_func_ngettext_libc=no) +- ]) +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !dgettext ("","")], +- gt_cv_func_dgettext_libc=yes, +- gt_cv_func_dgettext_libc=no) +- ]) +- fi +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- fi ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ++]) + +- # +- # If we don't have everything we want, check in libintl +- # +- if test "$gt_cv_func_dgettext_libc" != "yes" \ +- || test "$gt_cv_func_ngettext_libc" != "yes" \ +- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +- +- AC_CHECK_LIB(intl, bindtextdomain, +- [AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dgettext, +- gt_cv_func_dgettext_libintl=yes)])]) ++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further ++dnl mangled by Autoconf and run in a shell conditional statement. ++m4_define([_AC_COMPILER_EXEEXT], ++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- AC_MSG_CHECKING([if -liconv is needed to use gettext]) +- AC_MSG_RESULT([]) +- AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dcgettext, +- [gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv], +- :,-liconv)], +- :,-liconv) +- fi + +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- LIBS="$glib_save_LIBS" ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. + +- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then +- gt_cv_func_dgettext_libc=no +- else +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- && test "$gt_cv_func_ngettext_libc" = "yes"; then +- gt_cv_func_dgettext_libintl=no +- fi +- fi +- fi +- fi ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_arg=$1 ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi +- +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +- +- if test "$gt_cv_have_gettext" = "yes"; then +- AC_DEFINE(HAVE_GETTEXT,1, +- [Define if the GNU gettext() function is already present or preinstalled.]) +- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" +- AC_CHECK_FUNCS(dcgettext) +- MSGFMT_OPTS= +- AC_MSG_CHECKING([if msgfmt accepts -c]) +- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +-msgid "" +-msgstr "" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Project-Id-Version: test 1.0\n" +-"PO-Revision-Date: 2007-02-15 12:01+0100\n" +-"Last-Translator: test \n" +-"Language-Team: C \n" +-"MIME-Version: 1.0\n" +-"Content-Transfer-Encoding: 8bit\n" +-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) +- AC_SUBST(MSGFMT_OPTS) +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share and +- dnl and CATOBJEXT=.gmo in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [CATOBJEXT=.mo +- DATADIRNAME=lib]) +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac]) +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi +- ]) ++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- if test "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++AC_SUBST(install_sh)]) + +- dnl Test whether we really found GNU xgettext. +- if test "$XGETTEXT" != ":"; then +- dnl If it is not GNU xgettext we define it as : so that the +- dnl Makefiles still can work. +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- AC_MSG_RESULT( +- [found xgettext program is not GNU xgettext; ignore it]) +- XGETTEXT=":" +- fi +- fi ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- # We need to process the po/ directory. +- POSUB=po ++# serial 2 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) + +- AC_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering + +- 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. +- for lang in $ALL_LINGUAS; do +- GMOFILES="$GMOFILES $lang.gmo" +- POFILES="$POFILES $lang.po" +- done ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- dnl Make all variables we use known to autoconf. +- AC_SUBST(CATALOGS) +- AC_SUBST(CATOBJEXT) +- AC_SUBST(DATADIRNAME) +- AC_SUBST(GMOFILES) +- AC_SUBST(INSTOBJEXT) +- AC_SUBST(INTLLIBS) +- AC_SUBST(PO_IN_DATADIR_TRUE) +- AC_SUBST(PO_IN_DATADIR_FALSE) +- AC_SUBST(POFILES) +- AC_SUBST(POSUB) +- ]) ++# serial 5 + +-# AM_GLIB_GNU_GETTEXT +-# ------------------- +-# Do checks necessary for use of gettext. If a suitable implementation +-# of gettext is found in either in libintl or in the C library, +-# it will set INTLLIBS to the libraries needed for use of gettext +-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +-# on various variables needed by the Makefile.in.in installed by +-# glib-gettextize. +-dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], +- [AC_REQUIRE([AC_PROG_CC])dnl +- AC_REQUIRE([AC_HEADER_STDC])dnl +- +- GLIB_LC_MESSAGES +- GLIB_WITH_NLS ++# AM_MAINTAINER_MODE([DEFAULT-MODE]) ++# ---------------------------------- ++# Control maintainer-specific portions of Makefiles. ++# Default is to disable them, unless `enable' is passed literally. ++# For symmetry, `disable' may be passed as well. Anyway, the user ++# can override the default with the --enable/--disable switch. ++AC_DEFUN([AM_MAINTAINER_MODE], ++[m4_case(m4_default([$1], [disable]), ++ [enable], [m4_define([am_maintainer_other], [disable])], ++ [disable], [m4_define([am_maintainer_other], [enable])], ++ [m4_define([am_maintainer_other], [enable]) ++ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) ++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed ++ AC_ARG_ENABLE([maintainer-mode], ++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST([MAINT])dnl ++] ++) + +- if test "$gt_cv_have_gettext" = "yes"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- AC_MSG_CHECKING(for catalogs to be installed) +- NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi +- done +- LINGUAS=$NEW_LINGUAS +- AC_MSG_RESULT($LINGUAS) +- fi ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +- dnl Construct list of names of catalog files to be constructed. +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi ++# Check to see how 'make' treats includes. -*- Autoconf -*- + +- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly +- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). +- dnl Try to locate is. +- MKINSTALLDIRS= +- if test -n "$ac_aux_dir"; then +- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +- fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +- fi +- AC_SUBST(MKINSTALLDIRS) ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- dnl Generate list of files to be processed by xgettext which will +- dnl be included in po/Makefile. +- test -d po || mkdir po +- if test "x$srcdir" != "x."; then +- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +- posrcprefix="$srcdir/" +- else +- posrcprefix="../$srcdir/" +- fi +- else +- posrcprefix="../" +- fi +- rm -f po/POTFILES +- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ +- < $srcdir/po/POTFILES.in > po/POTFILES +- ]) ++# serial 4 + +-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +-# ------------------------------- +-# Define VARIABLE to the location where catalog files will +-# be installed by po/Makefile. +-glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +-glib_save_prefix="$prefix" +-glib_save_exec_prefix="$exec_prefix" +-glib_save_datarootdir="$datarootdir" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` +-else +- localedir=`eval echo "${datadir}/locale"` ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo this is the am__doit target ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-datarootdir="$glib_save_datarootdir" +-AC_DEFINE_UNQUOTED($1, "$localedir", +- [Define the location where the catalogs will be installed]) ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf + ]) + +-dnl +-dnl Now the definitions that aclocal will find +-dnl +-ifdef(glib_configure_in,[],[ +-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +-])dnl ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +-# +-# Create a temporary file with TEST-FILE as its contents and pass the +-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +-# 0 and perform ACTION-IF-FAIL for any other exit status. +-AC_DEFUN([GLIB_RUN_PROG], +-[cat >conftest.foo <<_ACEOF +-$2 +-_ACEOF +-if AC_RUN_LOG([$1 conftest.foo]); then +- m4_ifval([$3], [$3], [:]) +-m4_ifvaln([$4], [else $4])dnl +-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +-fi]) ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + ++# serial 6 + +-# gnome-common.m4 +-# ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi ++]) + +-dnl GNOME_COMMON_INIT ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([GNOME_COMMON_INIT], +-[ +- dnl this macro should come after AC_CONFIG_MACRO_DIR +- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) ++# AM_PROG_MKDIR_P ++# --------------- ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) + +- dnl ensure that when the Automake generated makefile calls aclocal, +- dnl it honours the $ACLOCAL_FLAGS environment variable +- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" +- if test -n "$ac_macro_dir"; then +- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" +- fi ++# Helper functions for option handling. -*- Autoconf -*- + +- AC_SUBST([ACLOCAL_AMFLAGS]) +-]) ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([GNOME_DEBUG_CHECK], +-[ +- AC_ARG_ENABLE([debug], +- AC_HELP_STRING([--enable-debug], +- [turn on debugging]),, +- [enable_debug=no]) ++# serial 4 + +- if test x$enable_debug = xyes ; then +- AC_DEFINE(GNOME_ENABLE_DEBUG, 1, +- [Enable additional debugging at the expense of performance and size]) +- fi +-]) ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +-dnl GNOME_MAINTAINER_MODE_DEFINES () +-dnl define DISABLE_DEPRECATED +-dnl +-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +-[ +- AC_REQUIRE([AM_MAINTAINER_MODE]) ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +- DISABLE_DEPRECATED="" +- if test $USE_MAINTAINER_MODE = yes; then +- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" +- for DOMAIN in $DOMAINS; do +- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" +- done +- fi ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +- AC_SUBST(DISABLE_DEPRECATED) +-]) ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +-dnl GNOME_COMPILE_WARNINGS +-dnl Turn on many useful compiler warnings +-dnl For now, only works on GCC +-AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +- dnl ****************************** +- dnl More compiler warnings +- dnl ****************************** ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_ARG_ENABLE(compile-warnings, +- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], +- [Turn on compiler warnings]),, +- [enable_compile_warnings="m4_default([$1],[yes])"]) ++# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# --------------------------------------------------------------------------- ++# Adds support for distributing Python modules and packages. To ++# install modules, copy them to $(pythondir), using the python_PYTHON ++# automake variable. To install a package with the same name as the ++# automake package, install to $(pkgpythondir), or use the ++# pkgpython_PYTHON automake variable. ++# ++# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as ++# locations to install python extension modules (shared libraries). ++# Another macro is required to find the appropriate flags to compile ++# extension modules. ++# ++# If your package is configured with a different prefix to python, ++# users will have to add the install directory to the PYTHONPATH ++# environment variable, or create a .pth file (see the python ++# documentation for details). ++# ++# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will ++# cause an error if the version of python installed on the system ++# doesn't meet the requirement. MINIMUM-VERSION should consist of ++# numbers and dots only. ++AC_DEFUN([AM_PATH_PYTHON], ++ [ ++ dnl Find a Python interpreter. Python versions prior to 2.0 are not ++ dnl supported. (2.0 was released on October 16, 2000). ++ m4_define_default([_AM_PYTHON_INTERPRETER_LIST], ++ [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl ++python2.1 python2.0]) + +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no ++ m4_if([$1],[],[ ++ dnl No version check is needed. ++ # Find any Python interpreter. ++ if test -z "$PYTHON"; then ++ AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) ++ fi ++ am_display_PYTHON=python ++ ], [ ++ dnl A version check is needed. ++ if test -n "$PYTHON"; then ++ # If the user set $PYTHON, use it and don't search something else. ++ AC_MSG_CHECKING([whether $PYTHON version >= $1]) ++ AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], ++ [AC_MSG_RESULT(yes)], ++ [AC_MSG_ERROR(too old)]) ++ am_display_PYTHON=$PYTHON ++ else ++ # Otherwise, try each interpreter until we find one that satisfies ++ # VERSION. ++ AC_CACHE_CHECK([for a Python interpreter with version >= $1], ++ [am_cv_pathless_PYTHON],[ ++ for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do ++ test "$am_cv_pathless_PYTHON" = none && break ++ AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) ++ done]) ++ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. ++ if test "$am_cv_pathless_PYTHON" = none; then ++ PYTHON=: ++ else ++ AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) ++ fi ++ am_display_PYTHON=$am_cv_pathless_PYTHON + fi ++ ]) + +- warning_flags= +- realsave_CFLAGS="$CFLAGS" ++ if test "$PYTHON" = :; then ++ dnl Run any user-specified action, or abort. ++ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) ++ else + +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- AC_MSG_CHECKING([whether gcc understands $option]) +- AC_TRY_COMPILE([], [], +- has_option=yes, +- has_option=no,) +- CFLAGS="$SAVE_CFLAGS" +- AC_MSG_RESULT($has_option) +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- AC_MSG_CHECKING(what warning flags to pass to the C compiler) +- AC_MSG_RESULT($warning_flags) ++ dnl Query Python for its version number. Getting [:3] seems to be ++ dnl the best way to do this; it's what "site.py" does in the standard ++ dnl library. + +- AC_ARG_ENABLE(iso-c, +- AC_HELP_STRING([--enable-iso-c], +- [Try to warn if code is not ISO C ]),, +- [enable_iso_c=no]) ++ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], ++ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) ++ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) + +- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCFLAGS) ++ dnl Use the values of $prefix and $exec_prefix for the corresponding ++ dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made ++ dnl distinct variables so they can be overridden if need be. However, ++ dnl general consensus is that you shouldn't need this ability. ++ ++ AC_SUBST([PYTHON_PREFIX], ['${prefix}']) ++ AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) + +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- AC_SUBST(WARN_CFLAGS) +-]) ++ dnl At times (like when building shared libraries) you may want ++ dnl to know which OS platform Python thinks this is. + +-dnl For C++, do basically the same thing. ++ AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], ++ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) ++ AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + +-AC_DEFUN([GNOME_CXX_WARNINGS],[ +- AC_ARG_ENABLE(cxx-warnings, +- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] +- [Turn on compiler warnings.]),, +- [enable_cxx_warnings="m4_default([$1],[minimum])"]) + +- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) +- warnCXXFLAGS= +- if test "x$GXX" != xyes; then +- enable_cxx_warnings=no +- fi +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; +- esac ++ dnl Set up 4 directories: + +- ## -W is not all that useful. And it cannot be controlled +- ## with individual -Wno-xxx flags, unlike -Wall +- if test "x$enable_cxx_warnings" = "xyes"; then +- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" +- fi +- fi +- fi +- AC_MSG_RESULT($warnCXXFLAGS) ++ dnl pythondir -- where to install python scripts. This is the ++ dnl site-packages directory, not the python standard library ++ dnl directory like in previous automake betas. This behavior ++ dnl is more consistent with lispdir.m4 for example. ++ dnl Query distutils for this directory. distutils does not exist in ++ dnl Python 1.5, so we fall back to the hardcoded directory if it ++ dnl doesn't work. ++ AC_CACHE_CHECK([for $am_display_PYTHON script directory], ++ [am_cv_python_pythondir], ++ [if test "x$prefix" = xNONE ++ then ++ am_py_prefix=$ac_default_prefix ++ else ++ am_py_prefix=$prefix ++ fi ++ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || ++ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` ++ case $am_cv_python_pythondir in ++ $am_py_prefix*) ++ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` ++ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` ++ ;; ++ esac ++ ]) ++ AC_SUBST([pythondir], [$am_cv_python_pythondir]) + +- AC_ARG_ENABLE(iso-cxx, +- AC_HELP_STRING([--enable-iso-cxx], +- [Try to warn if code is not ISO C++ ]),, +- [enable_iso_cxx=no]) ++ dnl pkgpythondir -- $PACKAGE directory under pythondir. Was ++ dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is ++ dnl more consistent with the rest of automake. + +- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) +- complCXXFLAGS= +- if test "x$enable_iso_cxx" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; +- esac ++ AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) + +- case " $CXXFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; +- esac ++ dnl pyexecdir -- directory for installing python extension modules ++ dnl (shared libraries) ++ dnl Query distutils for this directory. distutils does not exist in ++ dnl Python 1.5, so we fall back to the hardcoded directory if it ++ dnl doesn't work. ++ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], ++ [am_cv_python_pyexecdir], ++ [if test "x$exec_prefix" = xNONE ++ then ++ am_py_exec_prefix=$am_py_prefix ++ else ++ am_py_exec_prefix=$exec_prefix + fi +- fi +- AC_MSG_RESULT($complCXXFLAGS) +- +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- AC_SUBST(WARN_CXXFLAGS) +-]) ++ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || ++ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` ++ case $am_cv_python_pyexecdir in ++ $am_py_exec_prefix*) ++ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` ++ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` ++ ;; ++ esac ++ ]) ++ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + +-# nls.m4 serial 3 (gettext-0.15) +-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +-dnl This file is free software; the Free Software Foundation +-dnl gives unlimited permission to copy and/or distribute it, +-dnl with or without modifications, as long as this notice is preserved. +-dnl +-dnl This file can can be used in projects which are not available under +-dnl the GNU General Public License or the GNU Library General Public +-dnl License but which still want to provide support for the GNU gettext +-dnl functionality. +-dnl Please note that the actual code of the GNU gettext library is covered +-dnl by the GNU Library General Public License, and the rest of the GNU +-dnl gettext package package is covered by the GNU General Public License. +-dnl They are *not* in the public domain. ++ dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) + +-dnl Authors: +-dnl Ulrich Drepper , 1995-2000. +-dnl Bruno Haible , 2000-2003. ++ AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + +-AC_PREREQ(2.50) ++ dnl Run any user-specified action. ++ $2 ++ fi + +-AC_DEFUN([AM_NLS], +-[ +- AC_MSG_CHECKING([whether NLS is requested]) +- dnl Default is enabled NLS +- AC_ARG_ENABLE(nls, +- [ --disable-nls do not use Native Language Support], +- USE_NLS=$enableval, USE_NLS=yes) +- AC_MSG_RESULT($USE_NLS) +- AC_SUBST(USE_NLS) + ]) + +-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +-# +-# Copyright © 2004 Scott James Remnant . +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program is distributed in the hope that it will be useful, but +-# WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-# General Public License for more details. ++ ++# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) ++# --------------------------------------------------------------------------- ++# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. ++# Run ACTION-IF-FALSE otherwise. ++# This test uses sys.hexversion instead of the string equivalent (first ++# word of sys.version), in order to cope with versions such as 2.2c1. ++# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). ++AC_DEFUN([AM_PYTHON_CHECK_VERSION], ++ [prog="import sys ++# split strings by '.' and convert to numeric. Append some zeros ++# because we need at least 4 digits for the hex conversion. ++# map returns an iterator in Python 3.0 and a list in 2.x ++minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] ++minverhex = 0 ++# xrange is not present in Python 3.0 and range returns an iterator ++for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] ++sys.exit(sys.hexversion < minverhex)" ++ AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# This 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. ++ ++# AM_RUN_LOG(COMMAND) ++# ------------------- ++# Run COMMAND, save the exit status in ac_status, and log it. ++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) ++AC_DEFUN([AM_RUN_LOG], ++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ (exit $ac_status); }]) ++ ++# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 ++# Free Software Foundation, Inc. + # +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++# 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. + +-# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +-# ---------------------------------- +-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 +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++# serial 5 ++ ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac ++ ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t "$srcdir/configure" conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) + fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=m4_default([$1], [0.9.0]) +- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- PKG_CONFIG="" +- fi +- +-fi[]dnl +-])# PKG_PROG_PKG_CONFIG ++AC_MSG_RESULT(yes)]) + +-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-# +-# Check to see whether a particular set of modules exists. Similar +-# to PKG_CHECK_MODULES(), but does not set variables or print errors. +-# ++# Copyright (C) 2009 Free Software Foundation, Inc. + # +-# 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 +-# -------------------------------------------------------------- +-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_ifvaln([$3], [else +- $3])dnl +-fi]) ++# 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 1 + +-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +-# --------------------------------------------- +-m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried +-fi[]dnl +-])# _PKG_CONFIG ++# AM_SILENT_RULES([DEFAULT]) ++# -------------------------- ++# Enable less verbose build rules; with the default set to DEFAULT ++# (`yes' being less verbose, `no' or empty being verbose). ++AC_DEFUN([AM_SILENT_RULES], ++[AC_ARG_ENABLE([silent-rules], ++[ --enable-silent-rules less verbose build output (undo: `make V=1') ++ --disable-silent-rules verbose build output (undo: `make V=0')]) ++case $enable_silent_rules in ++yes) AM_DEFAULT_VERBOSITY=0;; ++no) AM_DEFAULT_VERBOSITY=1;; ++*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; ++esac ++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl ++AM_BACKSLASH='\' ++AC_SUBST([AM_BACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++]) + +-# _PKG_SHORT_ERRORS_SUPPORTED +-# ----------------------------- +-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi[]dnl +-])# _PKG_SHORT_ERRORS_SUPPORTED ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +-# [ACTION-IF-NOT-FOUND]) +-# +-# +-# Note that if there is a possibility the first call to +-# PKG_CHECK_MODULES might not happen, you should be sure to include an +-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +-# ++# Copyright (C) 2006, 2008 Free Software Foundation, Inc. + # +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_MODULES], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++# 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. + +-pkg_failed=no +-AC_MSG_CHECKING([for $1]) ++# serial 2 + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) + +-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +-and $1[]_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details.]) ++# AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Public sister of _AM_SUBST_NOTMAKE. ++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +-if test $pkg_failed = yes; then +- _PKG_SHORT_ERRORS_SUPPORTED +- if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` +- else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++# Check how to create a tarball. -*- Autoconf -*- + +- ifelse([$4], , [AC_MSG_ERROR(dnl +-[Package requirements ($2) were not met: ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-$$1_PKG_ERRORS ++# serial 2 + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac + +-_PKG_TEXT +-])], +- [AC_MSG_RESULT([no]) +- $4]) +-elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl +-[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. ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break + +-_PKG_TEXT ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir + +-To get pkg-config, see .])], +- [$4]) +-else +- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS +- AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) +-fi[]dnl +-])# PKG_CHECK_MODULES ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR + + m4_include([m4/intltool.m4]) + m4_include([m4/libtool.m4]) +diff -Nur gnome-menus-2.28.0.1/config.h.in gnome-menus-2.28.0.1.ubuntu/config.h.in +--- gnome-menus-2.28.0.1/config.h.in 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/config.h.in 2009-10-01 18:12:09.000000000 +0200 +@@ -70,6 +70,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +diff -Nur gnome-menus-2.28.0.1/configure gnome-menus-2.28.0.1.ubuntu/configure +--- gnome-menus-2.28.0.1/configure 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/configure 2009-10-01 18:12:09.000000000 +0200 +@@ -1,20 +1,22 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.63 for gnome-menus 2.28.0.1. ++# Generated by GNU Autoconf 2.64 for gnome-menus 2.28.0.1. + # + # Report bugs to . + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software ++# Foundation, Inc. ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -22,23 +24,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -46,7 +40,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -57,7 +57,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -80,13 +80,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -96,15 +89,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -116,12 +109,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -133,330 +130,301 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +- +-# Name of the executable. +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- + # CDPATH. +-$as_unset CDPATH +- ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + if test "x$CONFIG_SHELL" = x; then +- if (eval ":") 2>/dev/null; then +- as_have_required=yes ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST + else +- as_have_required=no ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +- +- if test $as_have_required = yes && (eval ": +-(as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } + + exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ 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" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_have_required=no + fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +-test \$exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=\$LINENO +- as_lineno_2=\$LINENO +- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && +- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +-") 2> /dev/null; then +- : + else +- as_candidate_shells= +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- case $as_dir in ++ as_found=: ++ case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do +- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi + done;; + esac ++ as_found=false + done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } + IFS=$as_save_IFS + + +- for as_shell in $as_candidate_shells $SHELL; do +- # Try only shells that exist, to save several forks. +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { ("$as_shell") 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-_ASEOF +-}; then +- CONFIG_SHELL=$as_shell +- as_have_required=yes +- if { "$as_shell" 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-(as_func_return () { +- (exit $1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test $exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +- +-_ASEOF +-}; then +- break +-fi +- +-fi +- +- done +- +- if test "x$CONFIG_SHELL" != x; then +- for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + +- +- if test $as_have_required = no; then +- echo This script requires a shell more modern than all the +- echo shells that I found on your system. Please install a +- echo modern shell, or manually run the script under such a +- echo shell if you do have one. +- { (exit 1); exit 1; } ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and ++$0: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus ++$0: about your system, including any error possibly output ++$0: before this message. Then install a modern shell, or ++$0: manually run the script under such a shell if you do ++$0: have one." ++ fi ++ exit 1 + fi +- +- + fi +- + fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS + ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ 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" + + +-(eval "as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append + +-exitcode=0 +-if as_func_success; then +- : ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' + else +- exitcode=1 +- echo as_func_success failed. +-fi ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith + +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi + +-if as_func_ret_success; then +- : ++# as_fn_error 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. ++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 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr + else +- exitcode=1 +- echo as_func_ret_success failed. ++ as_expr=false + fi + +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false + fi + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_dirname=false + fi + +-test \$exitcode = 0") || { +- echo No shell found that supports shell functions. +- echo Please tell bug-autoconf@gnu.org about your system, +- echo including any error possibly output before this message. +- echo This can help us improve future autoconf versions. +- echo Configuration will now proceed without shell functions. +-} ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO 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'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= +@@ -473,8 +441,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +@@ -484,29 +451,18 @@ + exit + } + +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -536,7 +492,7 @@ + rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -555,10 +511,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -573,7 +529,6 @@ + + + +- + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +@@ -740,7 +695,6 @@ + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. + PACKAGE_NAME='gnome-menus' +@@ -748,6 +702,7 @@ + PACKAGE_VERSION='2.28.0.1' + PACKAGE_STRING='gnome-menus 2.28.0.1' + PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus' ++PACKAGE_URL='' + + ac_unique_file="libmenu/gmenu-tree.h" + # Factoring default headers for most tests. +@@ -962,6 +917,7 @@ + program_transform_name + prefix + exec_prefix ++PACKAGE_URL + PACKAGE_BUGREPORT + PACKAGE_STRING + PACKAGE_VERSION +@@ -1108,8 +1064,7 @@ + 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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ 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 +@@ -1135,8 +1090,7 @@ + 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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ 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 +@@ -1340,8 +1294,7 @@ + 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_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ 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 +@@ -1357,8 +1310,7 @@ + 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_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ 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 +@@ -1388,17 +1340,17 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information." + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + +@@ -1415,15 +1367,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 +- { (exit 1); exit 1; }; } ;; ++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1446,8 +1396,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; } ++ 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' +@@ -1477,11 +1426,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { $as_echo "$as_me: error: working directory cannot be determined" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1520,13 +1467,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } ++ 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_echo "$as_me: error: $ac_msg" >&2 +- { (exit 1); exit 1; }; } ++ 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 +@@ -1732,25 +1677,382 @@ + done + fi + +-test -n "$ac_init_help" && exit $ac_status +-if $ac_init_version; then +- cat <<\_ACEOF +-gnome-menus configure 2.28.0.1 +-generated by GNU Autoconf 2.63 ++test -n "$ac_init_help" && exit $ac_status ++if $ac_init_version; then ++ cat <<\_ACEOF ++gnome-menus configure 2.28.0.1 ++generated by GNU Autoconf 2.64 ++ ++Copyright (C) 2009 Free Software Foundation, Inc. ++This configure script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it. ++_ACEOF ++ exit ++fi ++ ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++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_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_compile ++ ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++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_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_cpp ++ ++# ac_fn_c_try_run LINENO ++# ---------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++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_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { 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_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_run ++ ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++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 : ++ { $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 : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&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;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$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 ++## -------------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus ## ++## -------------------------------------------------------------------------- ## ++_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 : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_mongrel ++ ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++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 : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++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_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_link + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-This configure script is free software; the Free Software Foundation +-gives unlimited permission to copy, distribute and modify it. ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++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 : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} + _ACEOF +- exit ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" + fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_func + 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 gnome-menus $as_me 2.28.0.1, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ + +@@ -1786,8 +2088,8 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" +-done ++ $as_echo "PATH: $as_dir" ++ done + IFS=$as_save_IFS + + } >&5 +@@ -1824,9 +2126,9 @@ + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else +@@ -1842,13 +2144,13 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args '$ac_arg'" ++ as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done + done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} + + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there +@@ -1873,13 +2175,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -1951,39 +2253,41 @@ + exit $exit_status + ' 0 + for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -f -r conftest* confdefs.h + ++$as_echo "/* confdefs.h */" > confdefs.h ++ + # Predefined preprocessor variables. + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_NAME "$PACKAGE_NAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_VERSION "$PACKAGE_VERSION" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_STRING "$PACKAGE_STRING" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + _ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF ++ + + # Let the site file select an alternate cache file if it wants to. + # Prefer an explicitly selected file to automatically selected ones. +@@ -2002,7 +2306,7 @@ + do + test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then +- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++ { $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" +@@ -2013,7 +2317,7 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; +@@ -2021,7 +2325,7 @@ + esac + fi + else +- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 + $as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -2036,11 +2340,11 @@ + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 + $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; +@@ -2050,17 +2354,17 @@ + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 + $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else +- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi +- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 + $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 + $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac +@@ -2072,43 +2376,20 @@ + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi + done + if $ac_cache_corrupted; then +- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++ { $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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -2123,24 +2404,16 @@ + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- 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 ++ 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 + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} +- { (exit 1); exit 1; }; } ++ 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, +@@ -2166,10 +2439,10 @@ + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + # Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then ++if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2177,11 +2450,11 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -2218,7 +2491,7 @@ + ;; + esac + +-done ++ done + IFS=$as_save_IFS + + rm -rf conftest.one conftest.two conftest.dir +@@ -2234,7 +2507,7 @@ + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 + $as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2245,7 +2518,7 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 + $as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 +@@ -2256,15 +2529,11 @@ + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 +-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 +-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2286,11 +2555,8 @@ + # 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_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file +@@ -2299,13 +2565,10 @@ + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +@@ -2333,7 +2596,7 @@ + am_missing_run="$MISSING --run " + else + am_missing_run= +- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 + $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +@@ -2354,9 +2617,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -2367,24 +2630,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2394,9 +2657,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -2407,24 +2670,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2433,7 +2696,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -2446,10 +2709,10 @@ + fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then ++ if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2457,7 +2720,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do ++ for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +@@ -2469,7 +2732,7 @@ + esac + done + done +-done ++ done + IFS=$as_save_IFS + + fi +@@ -2485,7 +2748,7 @@ + MKDIR_P="$ac_install_sh -d" + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" +@@ -2498,9 +2761,9 @@ + 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:$LINENO: checking for $ac_word" >&5 ++{ $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_AWK+set}" = set; then ++if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -2511,24 +2774,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_AWK="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 + $as_echo "$AWK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2536,11 +2799,11 @@ + test -n "$AWK" && break + done + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 + $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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2558,11 +2821,11 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -2582,9 +2845,7 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -2641,7 +2902,7 @@ + + + # Check whether --enable-silent-rules was given. +-if test "${enable_silent_rules+set}" = set; then ++if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; + fi + +@@ -2657,16 +2918,16 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +-if test "${enable_maintainer_mode+set}" = set; then ++if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + else + USE_MAINTAINER_MODE=no + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 + $as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= +@@ -2682,17 +2943,14 @@ + + + +- DISABLE_DEPRECATED="" + if test $USE_MAINTAINER_MODE = yes; then +- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" +- for DOMAIN in $DOMAINS; do +- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" +- done ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" ++ else ++ DISABLE_DEPRECATED="" + fi + + + +- + # Before making a release, the LT_VERSION string should be modified. + # The string is of the form C:R:A. + # - If interfaces have been changed or added, but binary compatibility has +@@ -2724,7 +2982,7 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 + $as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= +@@ -2752,12 +3010,12 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 + $as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then ++if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; + fi + +@@ -2782,9 +3040,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2795,24 +3053,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2822,9 +3080,9 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -2835,24 +3093,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2861,7 +3119,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -2875,9 +3133,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2888,24 +3146,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2915,9 +3173,9 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2929,18 +3187,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -2959,10 +3217,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2974,9 +3232,9 @@ + 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:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2987,24 +3245,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3018,9 +3276,9 @@ + 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:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3031,24 +3289,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3061,7 +3319,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -3072,73 +3330,55 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++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_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++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:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" ++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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 ++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=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include + int + main () + { ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 + $as_echo_n "checking for C compiler default output file name... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +@@ -3155,17 +3395,17 @@ + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, +@@ -3182,7 +3422,7 @@ + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -3201,84 +3441,75 @@ + else + ac_file='' + fi +- +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 + $as_echo "$ac_file" >&6; } +-if test -z "$ac_file"; then ++if test -z "$ac_file"; then : + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } ++{ as_fn_set_status 77 ++as_fn_error "C compiler cannot create executables ++See \`config.log' for more details." "$LINENO" 5; }; } + fi +- + ac_exeext=$ac_cv_exeext + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 + $as_echo_n "checking whether the C compiler works... " >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (case "(($ac_try" in ++ { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: 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." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + fi + fi + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out + ac_clean_files=$ac_clean_files_save + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 + $as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 + $as_echo "$cross_compiling" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } +-if { (ac_try="$ac_link" ++if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -3293,32 +3524,24 @@ + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then ++if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3330,17 +3553,17 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +@@ -3353,31 +3576,23 @@ + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 + $as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $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_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3391,37 +3606,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -3430,20 +3624,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3454,35 +3644,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3493,36 +3659,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3533,42 +3675,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + 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_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -3585,18 +3702,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -3653,32 +3766,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -3689,17 +3779,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -3709,9 +3801,9 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $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_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -3819,7 +3911,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -3840,14 +3932,14 @@ + 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 +-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++{ $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; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -3862,11 +3954,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -3875,78 +3963,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_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 >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++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 ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -3958,7 +4002,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 + $as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -3969,11 +4013,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -3982,87 +4022,40 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_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 >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++if $ac_preproc_ok; then : ++ + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } + fi + + ac_ext=c +@@ -4072,9 +4065,9 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then ++if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -4085,7 +4078,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do ++ for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +@@ -4105,7 +4098,7 @@ + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" +@@ -4120,26 +4113,24 @@ + $ac_path_GREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ 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 + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 + $as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then ++if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -4153,7 +4144,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do ++ for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +@@ -4173,7 +4164,7 @@ + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" +@@ -4188,12 +4179,10 @@ + $ac_path_EGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ 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 +@@ -4201,21 +4190,17 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 + $as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -4230,48 +4215,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -4281,18 +4241,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -4302,14 +4258,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -4336,118 +4288,34 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +- +- +- +- +- +- +- +- + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++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 : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -4458,151 +4326,12 @@ + + + +- +-for ac_header in locale.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus ## +-## -------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_header in locale.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" ++if test "x$ac_cv_header_locale_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_LOCALE_H 1 + _ACEOF + + fi +@@ -4610,16 +4339,12 @@ + done + + if test $ac_cv_header_locale_h = yes; then +- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 + $as_echo_n "checking for LC_MESSAGES... " >&6; } +-if test "${am_cv_val_LC_MESSAGES+set}" = set; then ++if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -4630,207 +4355,45 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- am_cv_val_LC_MESSAGES=no ++ am_cv_val_LC_MESSAGES=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 + $as_echo "$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LC_MESSAGES 1 +-_ACEOF ++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h + + fi + fi + USE_NLS=yes + + +- gt_cv_have_gettext=no +- +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= +- +- if test "${ac_cv_header_libintl_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 +-$as_echo_n "checking libintl.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 +-$as_echo_n "checking libintl.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++ gt_cv_have_gettext=no + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus ## +-## -------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_libintl_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-fi +-if test "x$ac_cv_header_libintl_h" = x""yes; then ++ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" ++if test "x$ac_cv_header_libintl_h" = x""yes; then : + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + + # + # First check in libc + # +- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 + $as_echo_n "checking for ngettext in libc... " >&6; } +-if test "${gt_cv_func_ngettext_libc+set}" = set; then ++if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -4843,54 +4406,25 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_ngettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_ngettext_libc=no ++ gt_cv_func_ngettext_libc=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 + $as_echo "$gt_cv_func_ngettext_libc" >&6; } + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 + $as_echo_n "checking for dgettext in libc... " >&6; } +-if test "${gt_cv_func_dgettext_libc+set}" = set; then ++if test "${gt_cv_func_dgettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -4903,141 +4437,26 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_dgettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_dgettext_libc=no ++ gt_cv_func_dgettext_libc=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 + $as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF + + fi +@@ -5052,18 +4471,14 @@ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + +- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 + $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then ++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -5081,55 +4496,26 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_bindtextdomain=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_bindtextdomain=no ++ ac_cv_lib_intl_bindtextdomain=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 + $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -5147,55 +4533,26 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_ngettext=no ++ ac_cv_lib_intl_ngettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 + $as_echo_n "checking for dgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dgettext+set}" = set; then ++if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -5213,43 +4570,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_dgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_dgettext=no ++ ac_cv_lib_intl_dgettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 + $as_echo "$ac_cv_lib_intl_dgettext" >&6; } +-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then ++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes + fi + +@@ -5259,22 +4591,18 @@ + + + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 + $as_echo_n "checking if -liconv is needed to use gettext... " >&6; } +- { $as_echo "$as_me:$LINENO: result: " >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 + $as_echo "" >&6; } +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -5292,161 +4620,27 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_ngettext=no ++ ac_cv_lib_intl_ngettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 + $as_echo_n "checking for dcgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dcgettext (); +-int +-main () +-{ +-return dcgettext (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_intl_dcgettext=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_dcgettext=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then +- gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv +-else +- : +-fi +- +-else +- : +-fi +- +- fi +- +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl -liconv $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -5454,64 +4648,54 @@ + #ifdef __cplusplus + extern "C" + #endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- ++char dcgettext (); + int + main () + { +-return $ac_func (); ++return dcgettext (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_dcgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" ++ ac_cv_lib_intl_dcgettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 ++$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } ++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : ++ gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv ++else ++ : + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++else ++ : + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ ++ fi ++ ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF + + fi +@@ -5541,15 +4725,13 @@ + + if test "$gt_cv_have_gettext" = "yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_GETTEXT 1 +-_ACEOF ++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGFMT+set}" = set; then ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$MSGFMT" in +@@ -5574,118 +4756,28 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != "no"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + $as_echo "$MSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" +- +-for ac_func in dcgettext +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_func in dcgettext ++do : ++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" ++if test "x$ac_cv_func_dcgettext" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_DCGETTEXT 1 + _ACEOF + + fi + done + + MSGFMT_OPTS= +- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 + $as_echo_n "checking if msgfmt accepts -c... " >&6; } + cat >conftest.foo <<_ACEOF + +@@ -5700,14 +4792,14 @@ + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 + ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +-else { $as_echo "$as_me:$LINENO: result: no" >&5 ++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + echo "$as_me: failed input was:" >&5 + sed 's/^/| /' conftest.foo >&5 +@@ -5715,9 +4807,9 @@ + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GMSGFMT+set}" = set; then ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -5730,14 +4822,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +@@ -5746,19 +4838,19 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + $as_echo "$GMSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XGETTEXT+set}" = set; then ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$XGETTEXT" in +@@ -5783,18 +4875,14 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + $as_echo "$XGETTEXT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -5806,121 +4894,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + CATOBJEXT=.gmo + DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- case $host in ++ case $host in + *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. +- For example, HP-UX 11i declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef bind_textdomain_codeset +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bind_textdomain_codeset (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +-choke me +-#endif +- +-int +-main () +-{ +-return bind_textdomain_codeset (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_bind_textdomain_codeset=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_bind_textdomain_codeset=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -5935,10 +4916,8 @@ + ;; + esac + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else +@@ -5952,9 +4931,7 @@ + + if test "$gt_cv_have_gettext" = "yes" ; then + +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_NLS 1 +-_ACEOF ++$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + fi + +@@ -5962,7 +4939,7 @@ + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else +- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 + $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi +@@ -5995,7 +4972,7 @@ + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else +- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 + $as_echo_n "checking for catalogs to be installed... " >&6; } + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do +@@ -6020,7 +4997,7 @@ + fi + done + LINGUAS=$NEW_LINGUAS +- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 + $as_echo "$LINGUAS" >&6; } + fi + +@@ -6054,16 +5031,16 @@ + + + +- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 + $as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +-if test "${enable_nls+set}" = set; then ++if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval + else + USE_NLS=yes + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 + $as_echo "$USE_NLS" >&6; } + + +@@ -6071,35 +5048,31 @@ + + case "$am__api_version" in + 1.01234) +- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 +-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + ;; + *) + ;; + esac + + if test -n "0.40.0"; then +- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5 + $as_echo_n "checking for intltool >= 0.40.0... " >&6; } + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 ++ { $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_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5 +-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5 + fi + + # Extract the first word of "intltool-update", so it can be a program name with args. + set dummy intltool-update; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_UPDATE in +@@ -6112,14 +5085,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -6127,19 +5100,19 @@ + fi + INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE + if test -n "$INTLTOOL_UPDATE"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 + $as_echo "$INTLTOOL_UPDATE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "intltool-merge", so it can be a program name with args. + set dummy intltool-merge; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_MERGE in +@@ -6152,14 +5125,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -6167,19 +5140,19 @@ + fi + INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE + if test -n "$INTLTOOL_MERGE"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 + $as_echo "$INTLTOOL_MERGE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "intltool-extract", so it can be a program name with args. + set dummy intltool-extract; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_EXTRACT in +@@ -6192,14 +5165,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -6207,18 +5180,16 @@ + fi + INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT + if test -n "$INTLTOOL_EXTRACT"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 + $as_echo "$INTLTOOL_EXTRACT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then +- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 +-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} +- { (exit 1); exit 1; }; } ++ 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 $< $@' +@@ -6264,9 +5235,9 @@ + # Check the gettext tools to make sure they are GNU + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XGETTEXT+set}" = set; then ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $XGETTEXT in +@@ -6279,14 +5250,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -6294,19 +5265,19 @@ + fi + XGETTEXT=$ac_cv_path_XGETTEXT + if test -n "$XGETTEXT"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + $as_echo "$XGETTEXT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "msgmerge", so it can be a program name with args. + set dummy msgmerge; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGMERGE+set}" = set; then ++if test "${ac_cv_path_MSGMERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGMERGE in +@@ -6319,14 +5290,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -6334,19 +5305,19 @@ + fi + MSGMERGE=$ac_cv_path_MSGMERGE + if test -n "$MSGMERGE"; then +- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 + $as_echo "$MSGMERGE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGFMT+set}" = set; then ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGFMT in +@@ -6359,14 +5330,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -6374,19 +5345,19 @@ + fi + MSGFMT=$ac_cv_path_MSGFMT + if test -n "$MSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + $as_echo "$MSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GMSGFMT+set}" = set; then ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -6399,14 +5370,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +@@ -6415,33 +5386,29 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + $as_echo "$GMSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then +- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ 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_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ 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. + set dummy perl; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_PERL in +@@ -6454,188 +5421,71 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; + esac + fi + INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL +-if test -n "$INTLTOOL_PERL"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 +-$as_echo "$INTLTOOL_PERL" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-if test -z "$INTLTOOL_PERL"; then +- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 +-$as_echo "$as_me: error: perl not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then +- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 +-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test "x" != "xno-xml"; then +- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 +-$as_echo_n "checking for XML::Parser... " >&6; } +- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then +- { $as_echo "$as_me:$LINENO: result: ok" >&5 +-$as_echo "ok" >&6; } +- else +- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} +- { (exit 1); exit 1; }; } +- fi +-fi +- +-# Substitute ALL_LINGUAS so we can use it in po/Makefile +- +- +-# Set DATADIRNAME correctly if it is not set yet +-# (copied from glib-gettext.m4) +-if test -z "$DATADIRNAME"; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +-extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- DATADIRNAME=share ++if test -n "$INTLTOOL_PERL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 ++$as_echo "$INTLTOOL_PERL" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi + +- case $host in +- *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. +- For example, HP-UX 11i declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++if test -z "$INTLTOOL_PERL"; then ++ as_fn_error "perl not found; required for intltool" "$LINENO" 5 ++fi ++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then ++ as_fn_error "perl 5.x required for intltool" "$LINENO" 5 ++fi ++if test "x" != "xno-xml"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 ++$as_echo_n "checking for XML::Parser... " >&6; } ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ { $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 ++ fi ++fi + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++# Substitute ALL_LINGUAS so we can use it in po/Makefile + +-#undef bind_textdomain_codeset + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bind_textdomain_codeset (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +-choke me +-#endif ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + + int + main () + { +-return bind_textdomain_codeset (); ++extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_bind_textdomain_codeset=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_bind_textdomain_codeset=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then ++ case $host in ++ *-*-solaris*) ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + DATADIRNAME=share + else + DATADIRNAME=lib +@@ -6647,10 +5497,8 @@ + ;; + esac + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + + +@@ -6658,17 +5506,13 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 + $as_echo_n "checking for library containing strerror... " >&6; } +-if test "${ac_cv_search_strerror+set}" = set; then ++if test "${ac_cv_search_strerror+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -6693,54 +5537,27 @@ + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_strerror=$ac_res +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_strerror+set}" = set; then ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_strerror+set}" = set; then : + break + fi + done +-if test "${ac_cv_search_strerror+set}" = set; then +- : ++if test "${ac_cv_search_strerror+set}" = set; then : ++ + else + ac_cv_search_strerror=no + fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 + $as_echo "$ac_cv_search_strerror" >&6; } + ac_res=$ac_cv_search_strerror +-if test "$ac_res" != no; then ++if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi +@@ -6753,9 +5570,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -6766,24 +5583,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6793,9 +5610,9 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -6806,24 +5623,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6832,7 +5649,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -6846,9 +5663,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -6859,24 +5676,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6886,9 +5703,9 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -6900,18 +5717,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -6930,10 +5747,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6945,9 +5762,9 @@ + 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:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -6958,24 +5775,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6989,9 +5806,9 @@ + 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:$LINENO: checking for $ac_word" >&5 ++{ $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_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -7002,24 +5819,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_CC="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7032,7 +5849,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -7043,62 +5860,42 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++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_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++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:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++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=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $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_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7112,37 +5909,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -7151,20 +5927,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7175,35 +5947,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7214,36 +5962,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7254,42 +5978,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + 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_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -7306,18 +6005,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -7374,32 +6069,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -7410,17 +6082,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -7430,9 +6104,9 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $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_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -7540,7 +6214,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -7555,16 +6229,12 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -7579,48 +6249,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -7630,18 +6275,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -7651,14 +6292,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -7685,86 +6322,49 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if test "${ac_cv_build+set}" = set; then ++if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } ++ 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_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-$as_echo "$as_me: error: invalid value of canonical build" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -7780,28 +6380,24 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking host system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if test "${ac_cv_host+set}" = set; then ++if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-$as_echo "$as_me: error: invalid value of canonical host" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -7824,9 +6420,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. + set dummy ${ac_tool_prefix}as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_AS+set}" = set; then ++if test "${ac_cv_prog_AS+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AS"; then +@@ -7837,24 +6433,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_AS="${ac_tool_prefix}as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AS=$ac_cv_prog_AS + if test -n "$AS"; then +- { $as_echo "$as_me:$LINENO: result: $AS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 + $as_echo "$AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7864,9 +6460,9 @@ + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. + set dummy as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_AS+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AS"; then +@@ -7877,24 +6473,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_AS="as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_AS=$ac_cv_prog_ac_ct_AS + if test -n "$ac_ct_AS"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 + $as_echo "$ac_ct_AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7903,7 +6499,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -7916,9 +6512,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_DLLTOOL+set}" = set; then ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DLLTOOL"; then +@@ -7929,24 +6525,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_DLLTOOL="${ac_tool_prefix}dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 + $as_echo "$DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7956,9 +6552,9 @@ + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_DLLTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DLLTOOL"; then +@@ -7969,24 +6565,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_DLLTOOL="dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 + $as_echo "$ac_ct_DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7995,7 +6591,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -8008,9 +6604,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -8021,24 +6617,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8048,9 +6644,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -8061,24 +6657,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8087,7 +6683,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -8122,7 +6718,7 @@ + + case `pwd` in + *\ * | *\ *) +- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + +@@ -8145,9 +6741,9 @@ + + ltmain="$ac_aux_dir/ltmain.sh" + +-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++{ $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 ++if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +@@ -8155,7 +6751,7 @@ + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed +- $as_unset ac_script || ac_script= ++ { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST +@@ -8164,7 +6760,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in sed gsed; do ++ for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +@@ -8184,7 +6780,7 @@ + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" +@@ -8199,19 +6795,17 @@ + $ac_path_SED_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 + $as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed +@@ -8229,9 +6823,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 + $as_echo_n "checking for fgrep... " >&6; } +-if test "${ac_cv_path_FGREP+set}" = set; then ++if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +@@ -8245,7 +6839,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in fgrep; do ++ for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +@@ -8265,7 +6859,7 @@ + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" +@@ -8280,12 +6874,10 @@ + $ac_path_FGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ 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 +@@ -8293,7 +6885,7 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 + $as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + +@@ -8319,7 +6911,7 @@ + + + # Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then ++if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +@@ -8328,7 +6920,7 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) +@@ -8358,13 +6950,13 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + $as_echo_n "checking for GNU ld... " >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if test "${lt_cv_path_LD+set}" = set; then ++if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -8395,18 +6987,16 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 + $as_echo "$LD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&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 ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -8419,7 +7009,7 @@ + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 + $as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + +@@ -8431,9 +7021,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 + $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +-if test "${lt_cv_path_NM+set}" = set; then ++if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then +@@ -8480,7 +7070,7 @@ + : ${lt_cv_path_NM=no} + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 + $as_echo "$lt_cv_path_NM" >&6; } + if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +@@ -8491,9 +7081,9 @@ + 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:$LINENO: checking for $ac_word" >&5 ++{ $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_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DUMPBIN"; then +@@ -8504,24 +7094,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_DUMPBIN="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 + $as_echo "$DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8535,9 +7125,9 @@ + 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:$LINENO: checking for $ac_word" >&5 ++{ $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_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DUMPBIN"; then +@@ -8548,24 +7138,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_DUMPBIN="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 + $as_echo "$ac_ct_DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8578,7 +7168,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -8598,44 +7188,44 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } +-if test "${lt_cv_nm_interface+set}" = set; then ++if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:8608: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:7198: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:8611: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:7201: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:8614: output\"" >&5) ++ (eval echo "\"\$as_me:7204: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 + $as_echo "$lt_cv_nm_interface" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 + $as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 + $as_echo "no, using $LN_S" >&6; } + fi + + # find the maximum length of command line arguments +-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 + $as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + i=0 +@@ -8753,10 +7343,10 @@ + fi + + if test -n $lt_cv_sys_max_cmd_len ; then +- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 + $as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: none" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 + $as_echo "none" >&6; } + fi + max_cmd_len=$lt_cv_sys_max_cmd_len +@@ -8770,7 +7360,7 @@ + : ${MV="mv -f"} + : ${RM="rm -f"} + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 + $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } + # Try some XSI features + xsi_shell=no +@@ -8780,17 +7370,17 @@ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 + $as_echo "$xsi_shell" >&6; } + + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 + $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } + lt_shell_append=no + ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 + $as_echo "$lt_shell_append" >&6; } + + +@@ -8825,14 +7415,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 + $as_echo_n "checking for $LD option to reload object files... " >&6; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then ++if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 + $as_echo "$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in +@@ -8861,9 +7451,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -8874,24 +7464,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8901,9 +7491,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -8914,24 +7504,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8940,7 +7530,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -8957,9 +7547,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 + $as_echo_n "checking how to recognize dependent libraries... " >&6; } +-if test "${lt_cv_deplibs_check_method+set}" = set; then ++if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' +@@ -9153,7 +7743,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 + $as_echo "$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method +@@ -9173,9 +7763,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_AR+set}" = set; then ++if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then +@@ -9186,24 +7776,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_AR="${ac_tool_prefix}ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 + $as_echo "$AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9213,9 +7803,9 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_AR+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AR"; then +@@ -9226,24 +7816,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_AR="ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 + $as_echo "$ac_ct_AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9252,7 +7842,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -9278,9 +7868,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -9291,24 +7881,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9318,9 +7908,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -9331,24 +7921,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9357,7 +7947,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -9377,9 +7967,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_RANLIB+set}" = set; then ++if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -9390,24 +7980,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 + $as_echo "$RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9417,9 +8007,9 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_RANLIB+set}" = set; then ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -9430,24 +8020,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_RANLIB="ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 + $as_echo "$ac_ct_RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9456,7 +8046,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -9534,9 +8124,9 @@ + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 + $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -9652,18 +8242,18 @@ + int main(){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + +- if { (eval echo "$as_me:$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:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&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:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s "$nlist"; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +@@ -9716,11 +8306,11 @@ + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext}; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" +@@ -9754,10 +8344,10 @@ + lt_cv_sys_global_symbol_to_cdecl= + fi + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- { $as_echo "$as_me:$LINENO: result: failed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 + $as_echo "failed" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } + fi + +@@ -9783,7 +8373,7 @@ + + + # Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then ++if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; + fi + +@@ -9795,11 +8385,11 @@ + ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$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:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" +@@ -9813,12 +8403,12 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 9816 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ echo '#line 8406 "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -9852,11 +8442,11 @@ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$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:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in +@@ -9905,9 +8495,9 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 + $as_echo_n "checking whether the C compiler needs -belf... " >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then ++if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=c +@@ -9916,11 +8506,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -9931,38 +8517,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_cc_needs_belf=no ++ lt_cv_cc_needs_belf=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -9970,7 +8531,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 + $as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +@@ -9980,11 +8541,11 @@ + sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$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:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +@@ -10010,9 +8571,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then +@@ -10023,24 +8584,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_DSYMUTIL="${ac_tool_prefix}dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 + $as_echo "$DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10050,9 +8611,9 @@ + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then +@@ -10063,24 +8624,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_DSYMUTIL="dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 + $as_echo "$ac_ct_DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10089,7 +8650,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -10102,9 +8663,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NMEDIT"; then +@@ -10115,24 +8676,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_NMEDIT="${ac_tool_prefix}nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 + $as_echo "$NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10142,9 +8703,9 @@ + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_NMEDIT"; then +@@ -10155,24 +8716,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_NMEDIT="nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 + $as_echo "$ac_ct_NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10181,7 +8742,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -10194,9 +8755,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_LIPO+set}" = set; then ++if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LIPO"; then +@@ -10207,24 +8768,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_LIPO="${ac_tool_prefix}lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 + $as_echo "$LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10234,9 +8795,9 @@ + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_LIPO+set}" = set; then ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_LIPO"; then +@@ -10247,24 +8808,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_LIPO="lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 + $as_echo "$ac_ct_LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10273,7 +8834,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -10286,9 +8847,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_OTOOL+set}" = set; then ++if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL"; then +@@ -10299,24 +8860,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_OTOOL="${ac_tool_prefix}otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 + $as_echo "$OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10326,9 +8887,9 @@ + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_OTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL"; then +@@ -10339,24 +8900,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_OTOOL="otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 + $as_echo "$ac_ct_OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10365,7 +8926,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -10378,9 +8939,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL64"; then +@@ -10391,24 +8952,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_OTOOL64="${ac_tool_prefix}otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 + $as_echo "$OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10418,9 +8979,9 @@ + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $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_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL64"; then +@@ -10431,24 +8992,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_OTOOL64="otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 + $as_echo "$ac_ct_OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -10457,7 +9018,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -10493,9 +9054,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 + $as_echo_n "checking for -single_module linker flag... " >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no +@@ -10520,22 +9081,18 @@ + rm -f conftest.* + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 + $as_echo "$lt_cv_apple_cc_single_mod" >&6; } +- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10546,42 +9103,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_ld_exported_symbols_list=no ++ lt_cv_ld_exported_symbols_list=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) +@@ -10618,62 +9150,13 @@ + ;; + esac + +- + for ac_header in dlfcn.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_DLFCN_H 1 + _ACEOF + + fi +@@ -10691,7 +9174,7 @@ + + + # Check whether --enable-shared was given. +-if test "${enable_shared+set}" = set; then ++if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +@@ -10722,7 +9205,7 @@ + + + # Check whether --enable-static was given. +-if test "${enable_static+set}" = set; then ++if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; +@@ -10754,7 +9237,7 @@ + + + # Check whether --with-pic was given. +-if test "${with_pic+set}" = set; then ++if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" + else + pic_mode=default +@@ -10770,7 +9253,7 @@ + + + # Check whether --enable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then ++if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; +@@ -10851,9 +9334,9 @@ + setopt NO_GLOB_SUBST + fi + +-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 + $as_echo_n "checking for objdir... " >&6; } +-if test "${lt_cv_objdir+set}" = set; then ++if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null +@@ -10866,7 +9349,7 @@ + fi + rmdir .libs 2>/dev/null + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 + $as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + +@@ -10959,9 +9442,9 @@ + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 + $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -11012,10 +9495,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -11025,9 +9508,9 @@ + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- { $as_echo "$as_me:$LINENO: checking for file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 + $as_echo_n "checking for file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -11078,10 +9561,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -11162,9 +9645,9 @@ + if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++ { $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; } +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no +@@ -11180,11 +9663,11 @@ + -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:11183: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9666: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11187: \$? = $ac_status" >&5 ++ echo "$as_me:9670: \$? = $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. +@@ -11197,7 +9680,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 + $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +@@ -11217,7 +9700,7 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 + $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then +@@ -11489,7 +9972,7 @@ + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 + $as_echo "$lt_prog_compiler_pic" >&6; } + + +@@ -11501,9 +9984,9 @@ + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then +- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works=no +@@ -11519,11 +10002,11 @@ + -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:11522: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10005: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11526: \$? = $ac_status" >&5 ++ echo "$as_me:10009: \$? = $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. +@@ -11536,7 +10019,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 + $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +@@ -11560,9 +10043,9 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no +@@ -11588,7 +10071,7 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 + $as_echo "$lt_cv_prog_compiler_static_works" >&6; } + + if test x"$lt_cv_prog_compiler_static_works" = xyes; then +@@ -11603,9 +10086,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -11624,11 +10107,11 @@ + -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:11627: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10110: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:11631: \$? = $ac_status" >&5 ++ echo "$as_me:10114: \$? = $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 +@@ -11650,7 +10133,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -11658,9 +10141,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -11679,11 +10162,11 @@ + -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:11682: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10165: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:11686: \$? = $ac_status" >&5 ++ echo "$as_me:10169: \$? = $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 +@@ -11705,7 +10188,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -11714,7 +10197,7 @@ + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* +@@ -11722,10 +10205,10 @@ + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 + $as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +@@ -11738,7 +10221,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= +@@ -12180,11 +10663,7 @@ + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -12195,27 +10674,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -12229,16 +10688,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -12251,11 +10703,7 @@ + else + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -12266,27 +10714,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -12300,16 +10728,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -12521,42 +10942,16 @@ + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat >conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + int foo(void) {} + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++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' + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++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' +@@ -12812,7 +11207,7 @@ + fi + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 + $as_echo "$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + +@@ -12849,16 +11244,16 @@ + # 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. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++ { $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 { (eval echo "$as_me:$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:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then ++ $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 +@@ -12872,11 +11267,11 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ 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:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } + then + archive_cmds_need_lc=no + else +@@ -12887,7 +11282,7 @@ + cat conftest.err 1>&5 + fi + $RM conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 + $as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac +@@ -13051,7 +11446,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + + if test "$GCC" = yes; then +@@ -13473,11 +11868,7 @@ + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -13488,41 +11879,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then ++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 + fi +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +@@ -13734,7 +12097,7 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 + $as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +@@ -13836,7 +12199,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++ { $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= + if test -n "$hardcode_libdir_flag_spec" || +@@ -13861,7 +12224,7 @@ + # directories. + hardcode_action=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 + $as_echo "$hardcode_action" >&6; } + + if test "$hardcode_action" = relink || +@@ -13896,121 +12259,25 @@ + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +- +- darwin*) +- # if libdl is installed we need to link against it +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dl_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- +-fi ++ lt_cv_dlopen_libs= ++ ;; + ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= + ;; + +- *) +- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +-$as_echo_n "checking for shl_load... " >&6; } +-if test "${ac_cv_func_shl_load+set}" = set; then ++ darwin*) ++ # if libdl is installed we need to link against it ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define shl_load to an innocuous variant, in case declares shl_load. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shl_load innocuous_shl_load +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shl_load + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -14018,72 +12285,51 @@ + #ifdef __cplusplus + extern "C" + #endif +-char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_shl_load || defined __stub___shl_load +-choke me +-#endif +- ++char dlopen (); + int + main () + { +-return shl_load (); ++return dlopen (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_shl_load=no ++ ac_cv_lib_dl_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-$as_echo "$ac_cv_func_shl_load" >&6; } +-if test "x$ac_cv_func_shl_load" = x""yes; then ++ ++ ;; ++ ++ *) ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" + else +- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 + $as_echo_n "checking for shl_load in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14101,145 +12347,32 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_shl_load=no ++ ac_cv_lib_dld_shl_load=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 + $as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +-$as_echo_n "checking for dlopen... " >&6; } +-if test "${ac_cv_func_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define dlopen to an innocuous variant, in case declares dlopen. +- For example, HP-UX 11i declares gettimeofday. */ +-#define dlopen innocuous_dlopen +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef dlopen +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_dlopen || defined __stub___dlopen +-choke me +-#endif +- +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-$as_echo "$ac_cv_func_dlopen" >&6; } +-if test "x$ac_cv_func_dlopen" = x""yes; then ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14257,57 +12390,28 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 + $as_echo_n "checking for dlopen in -lsvld... " >&6; } +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14325,57 +12429,28 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_svld_dlopen=no ++ ac_cv_lib_svld_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14393,43 +12468,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_dld_link=no ++ ac_cv_lib_dld_dld_link=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 + $as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + +@@ -14468,9 +12518,9 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 + $as_echo_n "checking whether a program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self+set}" = set; then ++if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -14479,7 +12529,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 14482 "configure" ++#line 12532 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14538,11 +12588,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -14559,14 +12609,14 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 + $as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 + $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self_static+set}" = set; then ++if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -14575,7 +12625,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 14578 "configure" ++#line 12628 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14634,11 +12684,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -14655,7 +12705,7 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 + $as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + +@@ -14694,12 +12744,12 @@ + + striplib= + old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } + if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough +@@ -14708,15 +12758,15 @@ + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + ;; + esac +@@ -14734,12 +12784,12 @@ + + + # Report which library types will actually be built +- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 + $as_echo_n "checking if libtool supports shared libraries... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 + $as_echo "$can_build_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 + $as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + +@@ -14760,14 +12810,14 @@ + fi + ;; + esac +- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 + $as_echo "$enable_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 + $as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 + $as_echo "$enable_static" >&6; } + + +@@ -14812,9 +12862,9 @@ + 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. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in +@@ -14827,14 +12877,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -14842,10 +12892,10 @@ + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 + $as_echo "$PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -14855,9 +12905,9 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in +@@ -14870,14 +12920,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -14885,10 +12935,10 @@ + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 + $as_echo "$ac_pt_PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -14897,7 +12947,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $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 +@@ -14910,13 +12960,13 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 + $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + PKG_CONFIG="" + fi +@@ -14924,40 +12974,44 @@ + fi + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 + $as_echo_n "checking for GLIB... " >&6; } + +-if test -n "$GLIB_CFLAGS"; then +- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_CFLAGS"; then ++ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GLIB_LIBS"; then +- pkg_cv_GLIB_LIBS="$GLIB_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_LIBS"; then ++ pkg_cv_GLIB_LIBS="$GLIB_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -14970,25 +13024,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2" 2>&1` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2"` + else +- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2" 2>&1` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2) were not met: +- +-$GLIB_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables GLIB_CFLAGS +-and GLIB_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2) were not met: ++ as_fn_error "Package requirements (glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2) were not met: + + $GLIB_PKG_ERRORS + +@@ -14998,22 +13041,11 @@ + Alternatively, you may set the environment variables GLIB_CFLAGS + and GLIB_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: 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. +- +-Alternatively, you may set the environment variables GLIB_CFLAGS +-and GLIB_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: 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. + +@@ -15022,12 +13054,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -15037,7 +13068,7 @@ + + + # Check whether --enable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then ++if test "${enable_compile_warnings+set}" = set; then : + enableval=$enable_compile_warnings; + else + enable_compile_warnings="yes" +@@ -15068,13 +13099,9 @@ + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" +- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 + $as_echo_n "checking whether gcc understands $option... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -15085,35 +13112,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + has_option=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- has_option=no ++ has_option=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" +- { $as_echo "$as_me:$LINENO: result: $has_option" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 + $as_echo "$has_option" >&6; } + if test $has_option = yes; then + warning_flags="$warning_flags $option" +@@ -15127,26 +13133,24 @@ + fi + ;; + *) +- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 + ;; + esac + CFLAGS="$realsave_CFLAGS" +- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 + $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5 + $as_echo "$warning_flags" >&6; } + + # Check whether --enable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then ++if test "${enable_iso_c+set}" = set; then : + enableval=$enable_iso_c; + else + enable_iso_c=no + fi + + +- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5 + $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then +@@ -15161,7 +13165,7 @@ + esac + fi + fi +- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 + $as_echo "$complCFLAGS" >&6; } + + WARN_CFLAGS="$warning_flags $complCFLAGS" +@@ -15169,7 +13173,7 @@ + + + # Check whether --enable-deprecations was given. +-if test "${enable_deprecations+set}" = set; then ++if test "${enable_deprecations+set}" = set; then : + enableval=$enable_deprecations; + else + enable_deprecations=no +@@ -15183,7 +13187,7 @@ + + + # Check whether --enable-debug was given. +-if test "${enable_debug+set}" = set; then ++if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; + else + enable_debug=yes +@@ -15201,7 +13205,7 @@ + + + # Check whether --enable-python was given. +-if test "${enable_python+set}" = set; then ++if test "${enable_python+set}" = set; then : + enableval=$enable_python; enable_deprecations=$enableval + else + enable_deprecations=auto +@@ -15212,7 +13216,7 @@ + if test "x$enable_python" = "xno" ; then + have_python=no + else +- { $as_echo "$as_me:$LINENO: Checking to see if we can build Python bindings" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking to see if we can build Python bindings" >&5 + $as_echo "$as_me: Checking to see if we can build Python bindings" >&6;} + have_python=no + +@@ -15221,7 +13225,7 @@ + + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. +- { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3" >&5 + $as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; } + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros +@@ -15236,22 +13240,19 @@ + ($PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ (exit $ac_status); }; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: too old" >&5 +-$as_echo "$as_me: error: too old" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "too old" "$LINENO" 5 + fi +- + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. +- { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3" >&5 + $as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; } +-if test "${am_cv_pathless_PYTHON+set}" = set; then ++if test "${am_cv_pathless_PYTHON+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -15270,13 +13271,12 @@ + ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ (exit $ac_status); }; then : + break + fi +- + done + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 + $as_echo "$am_cv_pathless_PYTHON" >&6; } + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then +@@ -15284,9 +13284,9 @@ + else + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. + set dummy $am_cv_pathless_PYTHON; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PYTHON+set}" = set; then ++if test "${ac_cv_path_PYTHON+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PYTHON in +@@ -15299,14 +13299,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ 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_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -15314,10 +13314,10 @@ + fi + PYTHON=$ac_cv_path_PYTHON + if test -n "$PYTHON"; then +- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 + $as_echo "$PYTHON" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -15328,20 +13328,18 @@ + + + if test "$PYTHON" = :; then +- { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 +-$as_echo "$as_me: error: no suitable Python interpreter found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no suitable Python interpreter found" "$LINENO" 5 + else + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 + $as_echo_n "checking for $am_display_PYTHON version... " >&6; } +-if test "${am_cv_python_version+set}" = set; then ++if test "${am_cv_python_version+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version + +@@ -15353,23 +13351,23 @@ + + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 + $as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +-if test "${am_cv_python_platform+set}" = set; then ++if test "${am_cv_python_platform+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 + $as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + + + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 + $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +-if test "${am_cv_python_pythondir+set}" = set; then ++if test "${am_cv_python_pythondir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$prefix" = xNONE +@@ -15388,7 +13386,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 + $as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + +@@ -15397,9 +13395,9 @@ + pkgpythondir=\${pythondir}/$PACKAGE + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 + $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +-if test "${am_cv_python_pyexecdir+set}" = set; then ++if test "${am_cv_python_pyexecdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$exec_prefix" = xNONE +@@ -15418,7 +13416,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 + $as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + +@@ -15433,7 +13431,7 @@ + + + if test "x$PYTHON" = "x" ; then +- { $as_echo "$as_me:$LINENO: WARNING: Python not found" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python not found" >&5 + $as_echo "$as_me: WARNING: Python not found" >&2;} + else + +@@ -15444,7 +13442,7 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5 + $as_echo_n "checking for headers required to compile python extensions... " >&6; } + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +@@ -15458,35 +13456,15 @@ + fi + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 + $as_echo "found" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for python libraries" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python libraries" >&5 + $as_echo_n "checking for python libraries... " >&6; } + + +@@ -15511,11 +13489,7 @@ + + CC="$PYTHON_CC" + LIBS="$LIBS $PYTHON_EMBED_LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15529,53 +13503,26 @@ + main () + { + return Py_Initialize (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + + LIBS="$save_LIBS"; + if $link_pymodules_libpython; then + PYTHON_LIBS="$PYTHON_EMBED_LIBS"; + fi +- { $as_echo "$as_me:$LINENO: result: $PYTHON_EMBED_LIBS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EMBED_LIBS" >&5 + $as_echo "$PYTHON_EMBED_LIBS" >&6; }; + have_python_headers=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + + + PYTHON_EMBED_LIBS="-L${PYTHON_LIBPL} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}" + + LIBS="$save_LIBS $PYTHON_EMBED_LIBS"; +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15593,64 +13540,33 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + LIBS="$save_LIBS"; + if $link_pymodules_libpython; then + PYTHON_LIBS="$PYTHON_EMBED_LIBS"; + fi +- { $as_echo "$as_me:$LINENO: result: $PYTHON_EMBED_LIBS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EMBED_LIBS" >&5 + $as_echo "$PYTHON_EMBED_LIBS" >&6; }; + have_python_headers=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { $as_echo "$as_me:$LINENO: result: not found" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + $as_echo "not found" >&6; }; have_python_headers=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + CC="$save_CC" + + have_python_headers=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { $as_echo "$as_me:$LINENO: result: not found" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + $as_echo "not found" >&6; } + have_python_headers=no + fi +- + rm -f conftest.err conftest.$ac_ext + CPPFLAGS="$save_CPPFLAGS" + +@@ -15661,11 +13577,9 @@ + + if test "x$have_python" = "xno" ; then + if test "x$enable_python" = "xyes" ; then +- { { $as_echo "$as_me:$LINENO: error: Building python explicitly requested, but can't build python bindings" >&5 +-$as_echo "$as_me: error: Building python explicitly requested, but can't build python bindings" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Building python explicitly requested, but can't build python bindings" "$LINENO" 5 + else +- { $as_echo "$as_me:$LINENO: WARNING: Couldn't find the Python headers, not building Python bindings" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find the Python headers, not building Python bindings" >&5 + $as_echo "$as_me: WARNING: Couldn't find the Python headers, not building Python bindings" >&2;} + fi + fi +@@ -15685,59 +13599,28 @@ + # -fno-strict-aliasing (as used in Python build) switches warnings off + NO_STRICT_ALIASING_CFLAGS="" + if test "x$GCC" = "xyes" ; then +- { $as_echo "$as_me:$LINENO: checking whether $CC accepts -fno-strict-aliasing" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -fno-strict-aliasing" >&5 + $as_echo_n "checking whether $CC accepts -fno-strict-aliasing... " >&6; } + ac_save_cc="$CC" + CC="$CC -fno-strict-aliasing" +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + ac_cv_no_strict_aliasing_ok=no + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + int main() { return 0; } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_no_strict_aliasing_ok=yes + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-ac_cv_no_strict_aliasing_ok=no ++ ac_cv_no_strict_aliasing_ok=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + CC="$ac_save_cc" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_no_strict_aliasing_ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_strict_aliasing_ok" >&5 + $as_echo "$ac_cv_no_strict_aliasing_ok" >&6; } + if test "x$ac_cv_no_strict_aliasing_ok" = "xyes" ; then + NO_STRICT_ALIASING_CFLAGS="-fno-strict-aliasing" +@@ -15774,13 +13657,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -15788,8 +13671,8 @@ + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +@@ -15812,11 +13695,11 @@ + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && +- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi +@@ -15836,8 +13719,8 @@ + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. +- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + +@@ -15853,52 +13736,38 @@ + fi + + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ 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_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + ac_config_commands="$ac_config_commands po/stamp-it" + + + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" 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_echo "$as_me:$LINENO: error: conditional \"HAVE_PYTHON\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_PYTHON\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_PYTHON\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + : ${CONFIG_STATUS=./config.status} + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 + $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -15908,17 +13777,18 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -15926,23 +13796,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -15950,7 +13812,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -15961,7 +13829,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -15984,13 +13852,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -16000,15 +13861,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -16020,12 +13881,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -16037,7 +13902,89 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error 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. ++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 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -16051,8 +13998,12 @@ + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +@@ -16072,76 +14023,25 @@ + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -16170,8 +14070,56 @@ + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null + ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ 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" ++ ++ ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -16190,10 +14138,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -16208,13 +14156,19 @@ + + + exec 6>&1 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +-# Save the log message, to keep $[0] and so on meaningful, and to ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" + This file was extended by gnome-menus $as_me 2.28.0.1, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -16246,10 +14200,11 @@ + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. + +-Usage: $0 [OPTION]... [FILE]... ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit +@@ -16271,16 +14226,16 @@ + Configuration commands: + $config_commands + +-Report bugs to ." ++Report bugs to ." + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ + gnome-menus config.status 2.28.0.1 +-configured by $0, generated by GNU Autoconf 2.63, ++configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -16323,20 +14278,19 @@ + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; };; ++ as_fn_error "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +@@ -16344,11 +14298,10 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) { $as_echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; + +- *) ac_config_targets="$ac_config_targets $1" ++ *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac +@@ -16673,9 +14626,7 @@ + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; + +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; ++ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -16702,7 +14653,7 @@ + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + ' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 ++ trap 'as_fn_exit 1' 1 2 13 15 + } + # Create a (secure) tmp directory for tmp files. + +@@ -16713,11 +14664,7 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || +-{ +- $as_echo "$as_me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} ++} || 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. +@@ -16725,10 +14672,16 @@ + if test -n "$CONFIG_FILES"; then + + +-ac_cr=' ' ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /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 +@@ -16742,24 +14695,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ 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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ 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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -16848,9 +14795,7 @@ + else + cat + fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +-$as_echo "$as_me: error: could not setup config files machinery" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not setup config files machinery" "$LINENO" 5 + _ACEOF + + # VPATH may cause trouble with some makes, so we remove $(srcdir), +@@ -16891,9 +14836,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -16978,9 +14921,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +-$as_echo "$as_me: error: could not setup config headers machinery" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -16993,9 +14934,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} +- { (exit 1); exit 1; }; };; ++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -17023,12 +14962,10 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- ac_file_inputs="$ac_file_inputs '$ac_f'" ++ as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't +@@ -17039,7 +14976,7 @@ + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 + $as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. +@@ -17052,9 +14989,7 @@ + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ;; ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -17082,47 +15017,7 @@ + q + } + s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + + case "$ac_dir" in +@@ -17179,7 +15074,6 @@ + # If the template does not know about datarootdir, expand it. + # FIXME: This hack should be removed a few years after 2.60. + ac_datarootdir_hack=; ac_datarootdir_seen= +- + ac_sed_dataroot=' + /datarootdir/ { + p +@@ -17189,12 +15083,11 @@ + /@docdir@/p + /@infodir@/p + /@localedir@/p +-/@mandir@/p +-' ++/@mandir@/p' + case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +@@ -17204,7 +15097,7 @@ + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; ++ s&\\\${datarootdir}&$datarootdir&g' ;; + esac + _ACEOF + +@@ -17233,14 +15126,12 @@ + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || 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:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++ { $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 + $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;} +@@ -17250,9 +15141,7 @@ + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -17263,25 +15152,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || 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:$LINENO: $ac_file is unchanged" >&5 ++ { $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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || 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_echo "$as_me:$LINENO: error: could not create -" >&5 +-$as_echo "$as_me: error: could not create -" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -17319,7 +15202,7 @@ + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 + $as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac +@@ -17414,47 +15297,7 @@ + q + } + s/.*/./; q'` +- { as_dir=$dirpart/$fdir +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +@@ -18107,9 +15950,7 @@ + ;; + "po/stamp-it":C) + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then +- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 +-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} +- { (exit 1); exit 1; }; } ++ 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" +@@ -18132,15 +15973,12 @@ + done # for ac_tag + + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _ACEOF +-chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -18161,10 +15999,10 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit $? + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + +diff -Nur gnome-menus-2.28.0.1/desktop-directories/Makefile.in gnome-menus-2.28.0.1.ubuntu/desktop-directories/Makefile.in +--- gnome-menus-2.28.0.1/desktop-directories/Makefile.in 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/desktop-directories/Makefile.in 2009-10-01 18:12:09.000000000 +0200 +@@ -178,6 +178,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +diff -Nur gnome-menus-2.28.0.1/layout/Makefile.in gnome-menus-2.28.0.1.ubuntu/layout/Makefile.in +--- gnome-menus-2.28.0.1/layout/Makefile.in 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/layout/Makefile.in 2009-10-01 18:12:09.000000000 +0200 +@@ -178,6 +178,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +diff -Nur gnome-menus-2.28.0.1/libmenu/Makefile.in gnome-menus-2.28.0.1.ubuntu/libmenu/Makefile.in +--- gnome-menus-2.28.0.1/libmenu/Makefile.in 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/libmenu/Makefile.in 2009-10-01 18:12:09.000000000 +0200 +@@ -83,7 +83,8 @@ + am__objects_1 = + am_libgnome_menu_la_OBJECTS = canonicalize.lo desktop-entries.lo \ + entry-directories.lo gmenu-tree.lo menu-layout.lo \ +- menu-monitor.lo menu-util.lo $(am__objects_1) ++ menu-monitor.lo menu-util.lo user-is-sudoer.lo \ ++ $(am__objects_1) + libgnome_menu_la_OBJECTS = $(am_libgnome_menu_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +@@ -223,6 +224,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -331,6 +333,8 @@ + menu-monitor.h \ + menu-util.c \ + menu-util.h \ ++ user-is-sudoer.c \ ++ user-is-sudoer.h \ + $(MONITOR_SOURCES) \ + $(NULL) + +@@ -442,6 +446,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-layout.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-monitor.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-util.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user-is-sudoer.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +diff -Nur gnome-menus-2.28.0.1/Makefile.in gnome-menus-2.28.0.1.ubuntu/Makefile.in +--- gnome-menus-2.28.0.1/Makefile.in 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/Makefile.in 2009-10-01 18:12:09.000000000 +0200 +@@ -209,6 +209,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +diff -Nur gnome-menus-2.28.0.1/python/Makefile.in gnome-menus-2.28.0.1.ubuntu/python/Makefile.in +--- gnome-menus-2.28.0.1/python/Makefile.in 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/python/Makefile.in 2009-10-01 18:12:09.000000000 +0200 +@@ -211,6 +211,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +diff -Nur gnome-menus-2.28.0.1/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.28.0.1.ubuntu/simple-editor/GMenuSimpleEditor/Makefile.in +--- gnome-menus-2.28.0.1/simple-editor/GMenuSimpleEditor/Makefile.in 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/simple-editor/GMenuSimpleEditor/Makefile.in 2009-10-01 18:12:09.000000000 +0200 +@@ -178,6 +178,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +diff -Nur gnome-menus-2.28.0.1/simple-editor/Makefile.in gnome-menus-2.28.0.1.ubuntu/simple-editor/Makefile.in +--- gnome-menus-2.28.0.1/simple-editor/Makefile.in 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/simple-editor/Makefile.in 2009-10-01 18:12:09.000000000 +0200 +@@ -221,6 +221,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +diff -Nur gnome-menus-2.28.0.1/util/Makefile.in gnome-menus-2.28.0.1.ubuntu/util/Makefile.in +--- gnome-menus-2.28.0.1/util/Makefile.in 2009-10-01 18:11:54.000000000 +0200 ++++ gnome-menus-2.28.0.1.ubuntu/util/Makefile.in 2009-10-01 18:12:09.000000000 +0200 +@@ -214,6 +214,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ --- gnome-menus-2.28.0.1.orig/debian/patches/series +++ gnome-menus-2.28.0.1/debian/patches/series @@ -0,0 +1,12 @@ +03_kde-legacydirs.patch +05_debian_menu.patch +#06_menus_rename.patch +#08_menus_prefix.patch +09_app_install_entry.patch +09_games-menu.patch +10_use-default-python-path.patch +20_show-admin-tools-for-admin-group.patch +11_science-menu.patch +21_default-python-in-shebang.patch +69_aclocal_amflags +70_autoregen.patch --- gnome-menus-2.28.0.1.orig/debian/patches/11_science-menu.patch +++ gnome-menus-2.28.0.1/debian/patches/11_science-menu.patch @@ -0,0 +1,49 @@ +Index: gnome-menus-2.24.2/layout/applications.menu +=================================================================== +--- gnome-menus-2.24.2.orig/layout/applications.menu 2008-12-26 17:08:38.587592137 +0100 ++++ gnome-menus-2.24.2/layout/applications.menu 2008-12-26 17:10:25.727590587 +0100 +@@ -65,10 +65,23 @@ + + + Education ++ Science + + + + ++ ++ ++ Science ++ GnomeScience.directory ++ ++ ++ Education ++ Science ++ ++ ++ ++ + + + Games +Index: gnome-menus-2.24.2/desktop-directories/Education.directory.in +=================================================================== +--- gnome-menus-2.24.2.orig/desktop-directories/Education.directory.in 2008-11-25 14:01:14.000000000 +0100 ++++ gnome-menus-2.24.2/desktop-directories/Education.directory.in 2008-12-26 17:10:25.731589699 +0100 +@@ -1,4 +1,4 @@ + [Desktop Entry] + _Name=Education +-Icon=applications-science ++Icon=applications-accessories + Type=Directory +Index: gnome-menus-2.24.2/desktop-directories/Utility.directory.in +=================================================================== +--- gnome-menus-2.24.2.orig/desktop-directories/Utility.directory.in 2008-12-26 17:10:52.531587812 +0100 ++++ gnome-menus-2.24.2/desktop-directories/Utility.directory.in 2008-12-26 17:11:01.619588523 +0100 +@@ -1,5 +1,5 @@ + [Desktop Entry] + _Name=Accessories + _Comment=Desktop accessories +-Icon=applications-accessories ++Icon=applications-utilities + Type=Directory --- gnome-menus-2.28.0.1.orig/debian/patches/08_menus_prefix.patch +++ gnome-menus-2.28.0.1/debian/patches/08_menus_prefix.patch @@ -0,0 +1,40 @@ +Index: gnome-menus-2.24.2/libmenu/gmenu-tree.c +=================================================================== +--- gnome-menus-2.24.2.orig/libmenu/gmenu-tree.c 2008-11-25 14:01:14.000000000 +0100 ++++ gnome-menus-2.24.2/libmenu/gmenu-tree.c 2008-12-26 17:08:16.271594014 +0100 +@@ -608,15 +608,24 @@ gmenu_tree_lookup (const char *menu_ + GMenuTreeFlags flags) + { + GMenuTree *retval; ++ char *lookup_file; + + g_return_val_if_fail (menu_file != NULL, NULL); ++ if (!strcmp(menu_file,"applications.menu") || ++ !strcmp(menu_file,"settings.menu") || ++ !strcmp(menu_file,"preferences.menu")) ++ lookup_file = g_strconcat ("gnome-", menu_file, NULL); ++ else ++ lookup_file = g_strdup (menu_file); + + flags &= GMENU_TREE_FLAGS_MASK; + + if (g_path_is_absolute (menu_file)) +- retval = gmenu_tree_lookup_absolute (menu_file, flags); ++ retval = gmenu_tree_lookup_absolute (lookup_file, flags); + else +- retval = gmenu_tree_lookup_basename (menu_file, flags); ++ retval = gmenu_tree_lookup_basename (lookup_file, flags); ++ ++ g_free (lookup_file); + + g_assert (retval != NULL); + +@@ -2103,6 +2112,8 @@ resolve_default_merge_dirs (GMenuTree + root = menu_layout_node_get_root (layout); + menu_name = menu_layout_node_root_get_name (root); + ++ if (g_str_has_prefix (menu_name, "gnome-")) ++ menu_name += 6; + merge_name = g_strconcat (menu_name, "-merged", NULL); + + system_config_dirs = g_get_system_config_dirs (); --- gnome-menus-2.28.0.1.orig/debian/patches/05_debian_menu.patch +++ gnome-menus-2.28.0.1/debian/patches/05_debian_menu.patch @@ -0,0 +1,15 @@ +diff -urN gnome-menus-2.15.91.orig/layout/applications.menu gnome-menus-2.15.91/layout/applications.menu +--- gnome-menus-2.15.91.orig/layout/applications.menu 2006-08-13 18:46:45.000000000 +0200 ++++ gnome-menus-2.15.91/layout/applications.menu 2006-08-13 18:49:52.000000000 +0200 +@@ -150,4 +150,11 @@ + + + ++ ++ ++ Debian ++ debian-menu.menu ++ Debian.directory ++ ++ + --- gnome-menus-2.28.0.1.orig/debian/patches/06_menus_rename.patch +++ gnome-menus-2.28.0.1/debian/patches/06_menus_rename.patch @@ -0,0 +1,13 @@ +Index: gnome-menus-2.24.2/simple-editor/GMenuSimpleEditor/menutreemodel.py +=================================================================== +--- gnome-menus-2.24.2.orig/simple-editor/GMenuSimpleEditor/menutreemodel.py 2008-11-25 14:01:14.000000000 +0100 ++++ gnome-menus-2.24.2/simple-editor/GMenuSimpleEditor/menutreemodel.py 2008-12-26 17:02:53.075589286 +0100 +@@ -104,7 +104,7 @@ class MenuTreeModel (gtk.TreeStore): + self.icon_theme = gtk.icon_theme_get_default () + + if (len (menu_files) < 1): +- menu_files = ["applications.menu", "settings.menu"] ++ menu_files = ["gnome-applications.menu", "gnome-settings.menu"] + + for menu_file in menu_files: + tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED) --- gnome-menus-2.28.0.1.orig/debian/patches/09_games-menu.patch +++ gnome-menus-2.28.0.1/debian/patches/09_games-menu.patch @@ -0,0 +1,147 @@ +Index: gnome-menus-2.28.0/layout/applications.menu +=================================================================== +--- gnome-menus-2.28.0.orig/layout/applications.menu 2009-09-21 23:46:04.000000000 +0200 ++++ gnome-menus-2.28.0/layout/applications.menu 2009-09-21 23:46:14.000000000 +0200 +@@ -76,8 +76,108 @@ + + + Game +- +- ++ ActionGame ++ AdventureGame ++ ArcadeGame ++ BoardGame ++ BlocksGame ++ CardGame ++ KidsGame ++ LogicGame ++ RolePlaying ++ Simulation ++ SportsGame ++ StrategyGame ++ ++ ++ ++ ++ ++ ++ ++ Action ++ ActionGames.directory ++ ++ ActionGame ++ ++ ++ ++ Adventure ++ AdventureGames.directory ++ ++ AdventureGame ++ ++ ++ ++ Arcade ++ ArcadeGames.directory ++ ++ ArcadeGame ++ ++ ++ ++ Board ++ BoardGames.directory ++ ++ BoardGame ++ ++ ++ ++ Blocks ++ BlocksGames.directory ++ ++ BlocksGame ++ ++ ++ ++ Cards ++ CardGames.directory ++ ++ CardGame ++ ++ ++ ++ Kids ++ KidsGames.directory ++ ++ KidsGame ++ ++ ++ ++ Logic ++ LogicGames.directory ++ ++ LogicGame ++ ++ ++ ++ Role Playing ++ RolePlayingGames.directory ++ ++ RolePlaying ++ ++ ++ ++ Simulation ++ SimulationGames.directory ++ ++ Simulation ++ ++ ++ ++ Sports ++ SportsGames.directory ++ ++ SportsGame ++ ++ ++ ++ Strategy ++ StrategyGames.directory ++ ++ StrategyGame ++ ++ + + + +@@ -132,6 +232,7 @@ + + System + Settings ++ Game + + + +Index: gnome-menus-2.28.0/po/POTFILES.in +=================================================================== +--- gnome-menus-2.28.0.orig/po/POTFILES.in 2009-06-30 01:13:03.000000000 +0200 ++++ gnome-menus-2.28.0/po/POTFILES.in 2009-09-21 23:46:04.000000000 +0200 +@@ -1,5 +1,19 @@ + # List of source files containing translatable strings. + # Please keep this file sorted alphabetically. ++debian/desktop-files/ActionGames.directory.in ++debian/desktop-files/AdventureGames.directory.in ++debian/desktop-files/ArcadeGames.directory.in ++debian/desktop-files/BlocksGames.directory.in ++debian/desktop-files/BoardGames.directory.in ++debian/desktop-files/CardGames.directory.in ++debian/desktop-files/Debian.directory.in ++debian/desktop-files/GnomeScience.directory.in ++debian/desktop-files/KidsGames.directory.in ++debian/desktop-files/LogicGames.directory.in ++debian/desktop-files/RolePlayingGames.directory.in ++debian/desktop-files/SimulationGames.directory.in ++debian/desktop-files/SportsGames.directory.in ++debian/desktop-files/StrategyGames.directory.in + desktop-directories/AudioVideo.directory.in + desktop-directories/Development.directory.in + desktop-directories/Education.directory.in --- gnome-menus-2.28.0.1.orig/debian/patches/10_use-default-python-path.patch +++ gnome-menus-2.28.0.1/debian/patches/10_use-default-python-path.patch @@ -0,0 +1,14 @@ +Index: gnome-menus-2.18.3/simple-editor/gmenu-simple-editor.in +=================================================================== +--- gnome-menus-2.18.3.orig/simple-editor/gmenu-simple-editor.in 2007-07-02 19:15:26.000000000 +0200 ++++ gnome-menus-2.18.3/simple-editor/gmenu-simple-editor.in 2007-07-17 18:45:40.274547699 +0200 +@@ -20,9 +20,6 @@ + + import sys + +-if not "@pyexecdir@" in sys.path: +- sys.path.insert (0, "@pyexecdir@") +- + import GMenuSimpleEditor.main + + GMenuSimpleEditor.main.main (sys.argv[1:]) --- gnome-menus-2.28.0.1.orig/debian/patches/21_default-python-in-shebang.patch +++ gnome-menus-2.28.0.1/debian/patches/21_default-python-in-shebang.patch @@ -0,0 +1,8 @@ +--- a/simple-editor/gmenu-simple-editor.in ++++ b/simple-editor/gmenu-simple-editor.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/python + + # + # Copyright (C) 2005 Red Hat, Inc. --- gnome-menus-2.28.0.1.orig/debian/patches/03_kde-legacydirs.patch +++ gnome-menus-2.28.0.1/debian/patches/03_kde-legacydirs.patch @@ -0,0 +1,12 @@ +Index: gnome-menus-2.26.1/layout/applications.menu +=================================================================== +--- gnome-menus-2.26.1.orig/layout/applications.menu 2009-04-14 00:01:00.000000000 +0200 ++++ gnome-menus-2.26.1/layout/applications.menu 2009-06-17 22:54:29.254809753 +0200 +@@ -7,7 +7,6 @@ + X-GNOME-Menu-Applications.directory + + +- + /etc/X11/applnk + /usr/share/gnome/apps + --- gnome-menus-2.28.0.1.orig/debian/patches/69_aclocal_amflags +++ gnome-menus-2.28.0.1/debian/patches/69_aclocal_amflags @@ -0,0 +1,10 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,7 @@ + NULL = + ++ACLOCAL_AMFLAGS = -I m4 ++ + if HAVE_PYTHON + PYTHON_SUBDIRS = python simple-editor + endif --- gnome-menus-2.28.0.1.orig/debian/patches/09_app_install_entry.patch +++ gnome-menus-2.28.0.1/debian/patches/09_app_install_entry.patch @@ -0,0 +1,33 @@ +Index: gnome-menus-2.28.0/layout/applications.menu +=================================================================== +--- gnome-menus-2.28.0.orig/layout/applications.menu 2009-09-24 11:34:44.000000000 +0200 ++++ gnome-menus-2.28.0/layout/applications.menu 2009-09-24 11:34:44.000000000 +0200 +@@ -157,4 +157,16 @@ + Debian.directory + + ++ ++ ubuntu-software-center.desktop ++ ++ ++ ++ ++ ++ ++ ++ ubuntu-software-center.desktop ++ ++ + +Index: gnome-menus-2.28.0/layout/settings.menu +=================================================================== +--- gnome-menus-2.28.0.orig/layout/settings.menu 2009-09-24 11:34:47.000000000 +0200 ++++ gnome-menus-2.28.0/layout/settings.menu 2009-09-24 11:35:22.000000000 +0200 +@@ -43,6 +43,7 @@ + + Settings + System ++ ubuntu-software-center.desktop + + + --- gnome-menus-2.28.0.1.orig/debian/patches/20_show-admin-tools-for-admin-group.patch +++ gnome-menus-2.28.0.1/debian/patches/20_show-admin-tools-for-admin-group.patch @@ -0,0 +1,227 @@ +Index: gnome-menus-2.27.92/libmenu/desktop-entries.c +=================================================================== +--- gnome-menus-2.27.92.orig/libmenu/desktop-entries.c 2009-09-07 19:22:21.000000000 +0200 ++++ gnome-menus-2.27.92/libmenu/desktop-entries.c 2009-09-09 10:22:17.000000000 +0200 +@@ -24,6 +24,7 @@ + #include + + #include "menu-util.h" ++#include "user-is-sudoer.h" + + #define DESKTOP_ENTRY_GROUP "Desktop Entry" + #define KDE_DESKTOP_ENTRY_GROUP "KDE Desktop Entry" +@@ -33,7 +34,8 @@ + DESKTOP_ENTRY_NO_DISPLAY = 1 << 0, + DESKTOP_ENTRY_HIDDEN = 1 << 1, + DESKTOP_ENTRY_SHOW_IN_GNOME = 1 << 2, +- DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3 ++ DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3, ++ DESKTOP_ENTRY_ROOT_REQUIRED = 1 << 4 + }; + + struct DesktopEntry +@@ -52,7 +54,7 @@ + gboolean terminal; + + guint type : 2; +- guint flags : 4; ++ guint flags : 5; + guint refcount : 24; + }; + +@@ -77,9 +79,20 @@ + gboolean hidden; + gboolean show_in_gnome; + gboolean tryexec_failed; ++ gboolean root_required_flag; + char *tryexec; + guint flags; + int i; ++ ++ static gboolean sudoer_flag_set = FALSE; ++ static gboolean sudoer_flag = TRUE; ++ ++ /* If we don't know yet whether the user is sudoer or not, let's see */ ++ if (!sudoer_flag_set) ++ { ++ sudoer_flag = user_is_sudoer (); ++ sudoer_flag_set = TRUE; ++ } + + error = NULL; + no_display = g_key_file_get_boolean (key_file, +@@ -159,6 +172,47 @@ + g_free (tryexec); + } + ++ error = NULL; ++ root_required_flag = g_key_file_get_boolean (key_file, ++ desktop_entry_group, ++ "X-KDE-SubstituteUID", ++ &error); ++ ++ if (error) ++ { ++ root_required_flag = FALSE; ++ g_error_free (error); ++ } ++ else { ++ if (root_required_flag) { ++ char *username = NULL; ++ username = g_key_file_get_value (key_file, ++ desktop_entry_group, ++ "X-KDE-Username", ++ NULL); ++ ++ if (!username || (username && !strcmp (username, "root"))) ++ root_required_flag = TRUE; ++ else ++ root_required_flag = FALSE; ++ g_free (username); ++ } ++ else ++ root_required_flag = FALSE; ++ } ++ ++ /* ++ * If the desktop entry has the field and indeed requires root ++ * privilege and the user isn't sudoer, then the entry needs to be ++ * hidden. ++ */ ++ ++ if (root_required_flag ++ && (!sudoer_flag)) ++ { ++ no_display = TRUE; ++ } ++ + flags = 0; + if (no_display) + flags |= DESKTOP_ENTRY_NO_DISPLAY; +@@ -168,6 +222,8 @@ + flags |= DESKTOP_ENTRY_SHOW_IN_GNOME; + if (tryexec_failed) + flags |= DESKTOP_ENTRY_TRYEXEC_FAILED; ++ if (root_required_flag) ++ flags |= DESKTOP_ENTRY_ROOT_REQUIRED; + + return flags; + } +@@ -301,7 +357,7 @@ + + #undef GET_LOCALE_STRING + +- menu_verbose ("Desktop entry \"%s\" (%s, %s, %s, %s, %s) flags: NoDisplay=%s, Hidden=%s, ShowInGNOME=%s, TryExecFailed=%s\n", ++ menu_verbose ("Desktop entry \"%s\" (%s, %s, %s, %s, %s) flags: NoDisplay=%s, Hidden=%s, RootRequired: %s, ShowInGNOME=%s, TryExecFailed=%s\n", + retval->basename, + retval->name, + retval->generic_name ? retval->generic_name : "(null)", +@@ -310,6 +366,7 @@ + retval->icon ? retval->icon : "(null)", + retval->flags & DESKTOP_ENTRY_NO_DISPLAY ? "(true)" : "(false)", + retval->flags & DESKTOP_ENTRY_HIDDEN ? "(true)" : "(false)", ++ retval->flags & DESKTOP_ENTRY_ROOT_REQUIRED ? "(true)" : "(false)", + retval->flags & DESKTOP_ENTRY_SHOW_IN_GNOME ? "(true)" : "(false)", + retval->flags & DESKTOP_ENTRY_TRYEXEC_FAILED ? "(true)" : "(false)"); + +Index: gnome-menus-2.27.92/libmenu/Makefile.am +=================================================================== +--- gnome-menus-2.27.92.orig/libmenu/Makefile.am 2009-05-02 02:22:52.000000000 +0200 ++++ gnome-menus-2.27.92/libmenu/Makefile.am 2009-09-09 10:22:17.000000000 +0200 +@@ -26,6 +26,8 @@ + menu-monitor.h \ + menu-util.c \ + menu-util.h \ ++ user-is-sudoer.c \ ++ user-is-sudoer.h \ + $(MONITOR_SOURCES) \ + $(NULL) + +Index: gnome-menus-2.27.92/libmenu/user-is-sudoer.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-menus-2.27.92/libmenu/user-is-sudoer.c 2009-09-09 10:22:17.000000000 +0200 +@@ -0,0 +1,58 @@ ++/* ++ * user-is-sudoer.c: ++ * ++ * Copyright (C) 2005 Manu Cornet ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ * ++ * Authors: ++ * Manu Cornet ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include "user-is-sudoer.h" ++ ++#define ADMIN_GROUP_NAME "admin" ++ ++gboolean ++user_is_sudoer (void) ++{ ++ const gchar *user_name; ++ int i = 0; ++ struct group *group; ++ ++ if (getuid() == 0 || g_getenv ("USER_IS_ADMIN")) ++ return TRUE; ++ ++ group = getgrnam (ADMIN_GROUP_NAME); ++ ++ if (!group) ++ return TRUE; ++ else { ++ user_name = g_get_user_name (); ++ ++ while (group->gr_mem[i]) { ++ if (!strcmp (user_name, group->gr_mem[i++])) ++ return TRUE; ++ } ++ } ++ ++ return FALSE; ++} +Index: gnome-menus-2.27.92/libmenu/user-is-sudoer.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-menus-2.27.92/libmenu/user-is-sudoer.h 2009-09-09 10:22:17.000000000 +0200 +@@ -0,0 +1,20 @@ ++/* ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#include ++ ++gboolean user_is_sudoer (void); --- gnome-menus-2.28.0.1.orig/debian/po-up/he.po +++ gnome-menus-2.28.0.1/debian/po-up/he.po @@ -0,0 +1,272 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-08-31 00:53+0300\n" +"Last-Translator: Lior Kaplan \n" +"Language-Team: Hebrew \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "חינוך" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "חינוך" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "הרפתקה" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "הרפתקה" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "משחקי וידאו" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "לוח" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "לוח" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "קלפים" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "מדע" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "סימולציה" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "סימולציה" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "ספורט" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "ספורט" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "אסטרטגיה" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "אסטרטגיה" + +#~ msgid "Editors" +#~ msgstr "עורכים" + +#~ msgid "Education" +#~ msgstr "חינוך" + +#~ msgid "Emulators" +#~ msgstr "אמולטורים" + +#~ msgid "Graphics" +#~ msgstr "גרפיקה" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "רשת" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "חינוך" + +#~ msgid "Programming" +#~ msgstr "תכנות" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "מסדי נתונים" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "מדע" + +#~ msgid "Shells" +#~ msgstr "מעטפות" + +#~ msgid "Sound" +#~ msgstr "קול" + +#~ msgid "System" +#~ msgstr "מערכת" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "אמולטורים" + +#~ msgid "Text" +#~ msgstr "טקסט" + +#~ msgid "Viewers" +#~ msgstr "כלי צפייה" + +#~ msgid "Games" +#~ msgstr "משחקים" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "נעילה" + +#~ msgid "Puzzles" +#~ msgstr "פאזלים" + +#~ msgid "Tools" +#~ msgstr "כלים" + +#~ msgid "Toys" +#~ msgstr "צעצועים" + +#~ msgid "Help" +#~ msgstr "עזרה" + +#~ msgid "Screen" +#~ msgstr "מסך" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "שמירה" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "נעילה" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "מנהלי חלונות" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "מודולים" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "מנהלי חלונות" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "מראה" + +#~ msgid "WorkSpace" +#~ msgstr "מרחב עבודה" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "רכיבי מוזיללה" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "דובונים" + +#~ msgid "Apps" +#~ msgstr "תוכנות" + +#~ msgid "Hamradio" +#~ msgstr "רדיו חובבים" + +#~ msgid "Math" +#~ msgstr "מתמטיקה" + +#~ msgid "Technical" +#~ msgstr "טכני" + +#~ msgid "Tetris-like" +#~ msgstr "דמויי טטריס" + +#~ msgid "Root-window" +#~ msgstr "חלון שורש" + +#~ msgid "XShells" +#~ msgstr "מעטפות ל-X" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "מנהל" --- gnome-menus-2.28.0.1.orig/debian/po-up/pa.po +++ gnome-menus-2.28.0.1/debian/po-up/pa.po @@ -0,0 +1,132 @@ +# translation of pa.po_[zq2xlb].po to Punjabi +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# A S Alam , 2007. +msgid "" +msgstr "" +"Project-Id-Version: pa.po_[zq2xlb]\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-18 05:37+0530\n" +"Last-Translator: A S Alam \n" +"Language-Team: Punjabi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "ਕਾਰਵਾਈ" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "ਕਾਰਵਾਈ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "ਮਨੋਰੰਜਨ" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "ਮਨੋਰੰਜਨ ਸਟਾਇਲ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "ਅਰਕਾਡੀ" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "ਅਰਕਾਡੀ ਸਟਾਇਲ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "ਡਿੱਗਦੇ ਬਲਾਕ" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "ਡਿੱਗਦੇ ਬਲਾਕ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "ਬੋਰਡ" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "ਬੋਰਡ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "ਤਾਸ਼ ਦੀਆਂ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "ਤਾਸ਼" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "ਡੇਬੀਅਨ" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "ਡੇਬੀਅਨ ਮੇਨੂ" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "ਬੱਚਿਆਂ ਲਈ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "ਬੱਚੇ" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "ਲਾਜ਼ਿਕ" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "ਲਾਜ਼ਿਕ ਅਤੇ ਬੁਝਾਰਤ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "ਰੋਲ ਕਰਨਾ" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "ਰੋਲ ਕਰਨਾ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "ਸਮਰੂਪ" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "ਸਮਰੂਪ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "ਖੇਡਾਂ" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "ਸਪੋਰਟਸ ਖੇਡਾਂ" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "ਨੀਤੀ" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "ਨੀਤੀ ਖੇਡਾਂ" --- gnome-menus-2.28.0.1.orig/debian/po-up/bn.po +++ gnome-menus-2.28.0.1/debian/po-up/bn.po @@ -0,0 +1,267 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Mahay Alam Khan (মাহে আলম) , 2006. +# Khandakar Mujahidul Islam , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-10-09 15:43+0600\n" +"Last-Translator: Mahay Alam Khan (মাহে আলম) \n" +"Language-Team: Bengali \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "শিক্ষামূলক" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "শিক্ষামূলক" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "অ্যাডভেঞ্চার" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "অ্যাডভেঞ্চার" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "আর্কেড" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "বোর্ড" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "বোর্ড" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "কার্ড" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "বিজ্ঞান" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "সিমুলেশন" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "সিমুলেশন" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "খেলাধূলা" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "খেলাধূলা" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "স্ট্রাটেজী" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "স্ট্রাটেজী" + +#~ msgid "Editors" +#~ msgstr "সম্পাদক" + +#~ msgid "Education" +#~ msgstr "শিক্ষামূলক" + +#~ msgid "Emulators" +#~ msgstr "এমুলেটর" + +#~ msgid "Graphics" +#~ msgstr "গ্রাফিক্স" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "নেট" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "শিক্ষামূলক" + +#~ msgid "Programming" +#~ msgstr "প্রোগ্রামিং" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "ডাটাবেস" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "বিজ্ঞান" + +#~ msgid "Shells" +#~ msgstr "শেল" + +#~ msgid "Sound" +#~ msgstr "সাউন্ড" + +#~ msgid "System" +#~ msgstr "সিস্টেম" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "এমুলেটর" + +#~ msgid "Text" +#~ msgstr "টেক্সট" + +#~ msgid "Viewers" +#~ msgstr "প্রদর্শক" + +#~ msgid "Games" +#~ msgstr "খেলা" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "লক" + +#~ msgid "Puzzles" +#~ msgstr "ধাঁধা" + +#~ msgid "Tools" +#~ msgstr "যণ্ত্র" + +#~ msgid "Toys" +#~ msgstr "খেলনা" + +#~ msgid "Help" +#~ msgstr "সহায়িকা" + +#~ msgid "Screen" +#~ msgstr "স্ক্রীন" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "সংরক্ষণ" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "লক" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "উইন্ডোম্যানেজার" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "মডিউল" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "উইন্ডোম্যানেজার" + +#~ msgid "Appearance" +#~ msgstr "অ্যাপিয়ারেন্স" + +#~ msgid "WorkSpace" +#~ msgstr "ওয়ার্কস্পেস" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "মোজিলা কম্পোনেন্টস" + +#~ msgid "Teddies" +#~ msgstr "টেডিস" + +#~ msgid "Apps" +#~ msgstr "অ্যাপ্লিকেশন" + +#~ msgid "Hamradio" +#~ msgstr "হ্যামরেডিও" + +#~ msgid "Math" +#~ msgstr "গণিত" + +#~ msgid "Technical" +#~ msgstr "টেকনিক্যাল" + +#~ msgid "Tetris-like" +#~ msgstr "টেট্রিসের-মত" + +#~ msgid "Root-window" +#~ msgstr "রুট-উইন্ডো" + +#~ msgid "XShells" +#~ msgstr "এক্সশেল" + +#~ msgid "Admin" +#~ msgstr "অ্যাডমিন" --- gnome-menus-2.28.0.1.orig/debian/po-up/zh_TW.po +++ gnome-menus-2.28.0.1/debian/po-up/zh_TW.po @@ -0,0 +1,268 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2005-02-17 10:01+0800\n" +"Last-Translator: Asho Yeh \n" +"Language-Team: Chinese (traditional) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Chinese\n" +"X-Poedit-Country: TAIWAN\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "教育" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "教育" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "冒險" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "冒險" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "大型遊戲機" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "棋盤" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "棋盤" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "紙牌" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "科學" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "戰略" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "戰略" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "運動" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "運動" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "策略" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "策略" + +#~ msgid "Editors" +#~ msgstr "編輯器" + +#~ msgid "Education" +#~ msgstr "教育" + +#~ msgid "Emulators" +#~ msgstr "模擬器" + +#~ msgid "Graphics" +#~ msgstr "圖形" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "網路" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "教育" + +#~ msgid "Programming" +#~ msgstr "程式語言" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "資料庫" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "科學" + +#~ msgid "Shells" +#~ msgstr "Shells" + +#~ msgid "Sound" +#~ msgstr "音效" + +#~ msgid "System" +#~ msgstr "系統" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "模擬器" + +#~ msgid "Text" +#~ msgstr "文字翻譯" + +#~ msgid "Viewers" +#~ msgstr "多媒體撥放" + +#~ msgid "Games" +#~ msgstr "遊戲" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "鎖定" + +#~ msgid "Puzzles" +#~ msgstr "拼圖迷宮" + +#~ msgid "Tools" +#~ msgstr "其他" + +#~ msgid "Toys" +#~ msgstr "玩具" + +#~ msgid "Help" +#~ msgstr "求助" + +#~ msgid "Screen" +#~ msgstr "螢幕" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "螢幕保護" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "鎖定" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "視窗管理程式" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "模組" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "視窗管理程式" + +#~ msgid "Appearance" +#~ msgstr "外觀" + +#~ msgid "WorkSpace" +#~ msgstr "工作區" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla 相關" + +#~ msgid "Teddies" +#~ msgstr "玩具熊" + +#~ msgid "Apps" +#~ msgstr "應用程式" + +#~ msgid "Hamradio" +#~ msgstr "業餘無線電" + +#~ msgid "Math" +#~ msgstr "數學" + +#~ msgid "Technical" +#~ msgstr "技術" + +#~ msgid "Tetris-like" +#~ msgstr "俄羅斯方塊類" + +#~ msgid "Root-window" +#~ msgstr "根視窗" + +#~ msgid "XShells" +#~ msgstr "XShells" + +#~ msgid "Admin" +#~ msgstr "系統管理程式" --- gnome-menus-2.28.0.1.orig/debian/po-up/uk.po +++ gnome-menus-2.28.0.1/debian/po-up/uk.po @@ -0,0 +1,271 @@ +# translation of menu-sections.po to Ukrainian +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Eugeniy Meshcheryakov , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-sections_uk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-04-16 16:10+0300\n" +"Last-Translator: Eugeniy Meshcheryakov \n" +"Language-Team: Ukrainian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\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" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Освіта" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Освіта" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Пригодницькі" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Пригодницькі" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Аркадні" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "На дошці" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "На дошці" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Карткові" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Наука" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Симулятори" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Симулятори" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Спортивні" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Спортивні" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Стратегічні" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Стратегічні" + +#~ msgid "Editors" +#~ msgstr "Редактори" + +#~ msgid "Education" +#~ msgstr "Освіта" + +#~ msgid "Emulators" +#~ msgstr "Емулятори" + +#~ msgid "Graphics" +#~ msgstr "Графіка" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Мережа" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Освіта" + +#~ msgid "Programming" +#~ msgstr "Програмування" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Бази даних" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Наука" + +#~ msgid "Shells" +#~ msgstr "Оболонки" + +#~ msgid "Sound" +#~ msgstr "Звук" + +#~ msgid "System" +#~ msgstr "Система" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Емулятори" + +#~ msgid "Text" +#~ msgstr "Текст" + +#~ msgid "Viewers" +#~ msgstr "Переглядачі" + +#~ msgid "Games" +#~ msgstr "Ігри" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Блокування" + +#~ msgid "Puzzles" +#~ msgstr "Головоломки" + +#~ msgid "Tools" +#~ msgstr "Інструменти" + +#~ msgid "Toys" +#~ msgstr "Іграшки" + +#~ msgid "Help" +#~ msgstr "Довідка" + +#~ msgid "Screen" +#~ msgstr "Екран" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Збереження" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Блокування" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Менеджери вікон" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Модулі" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Менеджери вікон" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Вигляд" + +#~ msgid "WorkSpace" +#~ msgstr "Стільниця" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Компоненти Mozilla" + +#~ msgid "Apps" +#~ msgstr "Програми" + +#~ msgid "Hamradio" +#~ msgstr "HAM радіо" + +#~ msgid "Math" +#~ msgstr "Математика" + +#~ msgid "Technical" +#~ msgstr "Технічні" + +#~ msgid "Tetris-like" +#~ msgstr "Подібні до тетрису" + +#~ msgid "Root-window" +#~ msgstr "Головне вікно" + +#~ msgid "XShells" +#~ msgstr "X термінали" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Адміністрування" --- gnome-menus-2.28.0.1.orig/debian/po-up/be.po +++ gnome-menus-2.28.0.1/debian/po-up/be.po @@ -0,0 +1,269 @@ +# translation of be.po to belarusian +# translation of menu-sections.po to belarusian +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Paul Petruk , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: be\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-04-20 02:59+0300\n" +"Last-Translator: Paul Petruk \n" +"Language-Team: belarusian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Адукацыя" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Адукацыя" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Прыгоды" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Прыгоды" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Аркады" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Настольныя" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Настольныя" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Картачныя" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Навука" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Сімулятары" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Сімулятары" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Спартыўныя" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Спартыўныя" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Стратэгічныя" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Стратэгічныя" + +#~ msgid "Editors" +#~ msgstr "Рэдактары" + +#~ msgid "Education" +#~ msgstr "Адукацыя" + +#~ msgid "Emulators" +#~ msgstr "Эмулятары" + +#~ msgid "Graphics" +#~ msgstr "Графіка" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Сецiва" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Адукацыя" + +#~ msgid "Programming" +#~ msgstr "Праграмаванне" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Базы дадзеных" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Навука" + +#~ msgid "Shells" +#~ msgstr "Абалонкі" + +#~ msgid "Sound" +#~ msgstr "Гук" + +#~ msgid "System" +#~ msgstr "Сістэма" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Эмулятары" + +#~ msgid "Text" +#~ msgstr "Тэкст" + +#~ msgid "Viewers" +#~ msgstr "Праглядчыкі" + +#~ msgid "Games" +#~ msgstr "Гульні" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Блакіроўка" + +#~ msgid "Puzzles" +#~ msgstr "Лагічныя" + +#~ msgid "Tools" +#~ msgstr "Сродкі" + +#~ msgid "Toys" +#~ msgstr "Простыя" + +#~ msgid "Help" +#~ msgstr "Дапамога" + +#~ msgid "Screen" +#~ msgstr "Экран" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Зберагальнікі экрана" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Блакіроўка" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Мэнэджэры вакон" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Модулі" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Мэнэджэры вакон" + +#~ msgid "Appearance" +#~ msgstr "Знешні выгляд" + +#~ msgid "WorkSpace" +#~ msgstr "Працоўная прастора" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Кампаненты Mozilla" + +#~ msgid "Teddies" +#~ msgstr "Плюшавыя мішкі" + +#~ msgid "Apps" +#~ msgstr "Праграмы" + +#~ msgid "Hamradio" +#~ msgstr "Радыё" + +#~ msgid "Math" +#~ msgstr "Матэматыка" + +#~ msgid "Technical" +#~ msgstr "Тэхнічныя" + +#~ msgid "Tetris-like" +#~ msgstr "Тэтрысы" + +#~ msgid "Root-window" +#~ msgstr "Карнявое акно" + +#~ msgid "XShells" +#~ msgstr "X-тэрміналы" + +#~ msgid "Admin" +#~ msgstr "Адміністраванне" --- gnome-menus-2.28.0.1.orig/debian/po-up/el.po +++ gnome-menus-2.28.0.1/debian/po-up/el.po @@ -0,0 +1,273 @@ +# translation of menu-sections.po to Greek +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Konstantinos Margaritis , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-sections\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-05-07 01:22EEST\n" +"Last-Translator: Konstantinos Margaritis \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Εκπαιδευτικά" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Εκπαιδευτικά" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Περιπέτεια" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Περιπέτεια" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Δράσης" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Επιτραπέζια" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Επιτραπέζια" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Χαρτιά" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Επιστημονικά" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Εξομοιωτές" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Εξομοιωτές" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Αθλητικά" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Αθλητικά" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Στρατηγικής" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Στρατηγικής" + +#~ msgid "Editors" +#~ msgstr "Κειμενογράφοι" + +#~ msgid "Education" +#~ msgstr "Εκπαιδευτικά" + +#~ msgid "Emulators" +#~ msgstr "Προσομοιωτές" + +#~ msgid "Graphics" +#~ msgstr "Γραφικά" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Δίκτυο" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Εκπαιδευτικά" + +#~ msgid "Programming" +#~ msgstr "Προγραμματισμός" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Βάσεις Δεδομένων" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Επιστημονικά" + +#~ msgid "Shells" +#~ msgstr "Κελύφη" + +#~ msgid "Sound" +#~ msgstr "Ήχος" + +#~ msgid "System" +#~ msgstr "Σύστημα" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Προσομοιωτές" + +#~ msgid "Text" +#~ msgstr "Κείμενο" + +#~ msgid "Viewers" +#~ msgstr "Προβολείς" + +#~ msgid "Games" +#~ msgstr "Παιχνίδια" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Κλείδωμα" + +#~ msgid "Puzzles" +#~ msgstr "Πάζλ" + +#~ msgid "Tools" +#~ msgstr "Εργαλεία" + +#~ msgid "Toys" +#~ msgstr "Ψυχαγωγικά" + +#~ msgid "Help" +#~ msgstr "Βοήθεια" + +#~ msgid "Screen" +#~ msgstr "Οθόνη" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Αποθήκευση" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Κλείδωμα" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Διαχειριστές Παραθύρων" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Μονάδες" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Διαχειριστές Παραθύρων" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Εμφάνισης" + +#~ msgid "WorkSpace" +#~ msgstr "Επιφάνεια Εργασίας" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Στοιχεία Mozilla" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Αρκουδάκια" + +#~ msgid "Apps" +#~ msgstr "Εφαρμογές" + +#~ msgid "Hamradio" +#~ msgstr "Ραδιοερασιτέχνες" + +#~ msgid "Math" +#~ msgstr "Μαθηματικά" + +#~ msgid "Technical" +#~ msgstr "Τεχνικά" + +#~ msgid "Tetris-like" +#~ msgstr "στυλ-Tetris" + +#~ msgid "Root-window" +#~ msgstr "Βασικό παράθυρο" + +#~ msgid "XShells" +#~ msgstr "Τερματικά Χ" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Διαχειριστικά" --- gnome-menus-2.28.0.1.orig/debian/po-up/ku.po +++ gnome-menus-2.28.0.1/debian/po-up/ku.po @@ -0,0 +1,238 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-09-16 17:18+0100\n" +"Last-Translator: Erdal Ronahi \n" +"Language-Team: Kurdish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Kurdish\n" +"X-Poedit-Country: Kurdistan\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Perwerdehî" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Perwerdehî" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Serpêhatî" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Serpêhatî" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Zanist" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Werzîş" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Werzîş" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Stratejî" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Stratejî" + +#~ msgid "Editors" +#~ msgstr "Edîtor" + +#~ msgid "Education" +#~ msgstr "Perwerdehî" + +#~ msgid "Emulators" +#~ msgstr "Emûlator" + +#~ msgid "Graphics" +#~ msgstr "Grafîk" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Tor" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Perwerdehî" + +#~ msgid "Programming" +#~ msgstr "Bernamekirin" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Danegir" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Zanist" + +#~ msgid "Sound" +#~ msgstr "Deng" + +#~ msgid "System" +#~ msgstr "Pergal" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emûlator" + +#~ msgid "Text" +#~ msgstr "Nivîs" + +#~ msgid "Games" +#~ msgstr "Listîk" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Kilît" + +#~ msgid "Tools" +#~ msgstr "Amûr" + +#~ msgid "Help" +#~ msgstr "Alîkarî" + +#~ msgid "Screen" +#~ msgstr "Dîmendêr" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Tomar bike" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Kilît" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "GerînendeyênPaceyan" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Modul" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "GerînendeyênPaceyan" + +#~ msgid "WorkSpace" +#~ msgstr "Kargeh" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Komponentên Mozillayê" + +#~ msgid "Apps" +#~ msgstr "Sepan" + +#~ msgid "Math" +#~ msgstr "Matematîk" + +#~ msgid "Technical" +#~ msgstr "Teknîkî" + +#~ msgid "Tetris-like" +#~ msgstr "Wekî Tetris" + +#~ msgid "Admin" +#~ msgstr "Rêveber" --- gnome-menus-2.28.0.1.orig/debian/po-up/it.po +++ gnome-menus-2.28.0.1/debian/po-up/it.po @@ -0,0 +1,272 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.7-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-05-23 22:07+0200\n" +"Last-Translator: Stefano Canepa \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"msgid \"\"\n" +"msgstr \"\"\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Apprendimento" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Apprendimento" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Avventura" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Avventura" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Da tavolo" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Da tavolo" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Carte" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Scienza" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulazione" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulazione" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sport" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sport" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategia" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategia" + +#~ msgid "Editors" +#~ msgstr "Editor" + +#~ msgid "Education" +#~ msgstr "Apprendimento" + +#~ msgid "Emulators" +#~ msgstr "Emulatori" + +#~ msgid "Graphics" +#~ msgstr "Grafica" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Rete" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Apprendimento" + +#~ msgid "Programming" +#~ msgstr "Programmazione" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Database" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Scienza" + +#~ msgid "Shells" +#~ msgstr "Shell" + +#~ msgid "Sound" +#~ msgstr "Suono" + +#~ msgid "System" +#~ msgstr "Sistema" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulatori" + +#~ msgid "Text" +#~ msgstr "Testo" + +#~ msgid "Viewers" +#~ msgstr "Visualizzatori" + +#~ msgid "Games" +#~ msgstr "Giochi" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Blocca" + +#~ msgid "Puzzles" +#~ msgstr "Rompicapi" + +#~ msgid "Tools" +#~ msgstr "Strumenti" + +#~ msgid "Toys" +#~ msgstr "Gingilli" + +#~ msgid "Help" +#~ msgstr "Aiuto" + +#~ msgid "Screen" +#~ msgstr "Schermo" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Salva schermo" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Blocca" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Window manager" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Moduli" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Window manager" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Aspetto" + +#~ msgid "WorkSpace" +#~ msgstr "Area di lavoro" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Componenti di mozilla" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Orsacchiotti" + +#~ msgid "Apps" +#~ msgstr "Applicazioni" + +#~ msgid "Hamradio" +#~ msgstr "Radiantismo" + +#~ msgid "Math" +#~ msgstr "Matematica" + +#~ msgid "Technical" +#~ msgstr "Tecnici" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris e affini" + +#~ msgid "Root-window" +#~ msgstr "Sfondo" + +#~ msgid "XShells" +#~ msgstr "Terminali per X" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Amministrazione" --- gnome-menus-2.28.0.1.orig/debian/po-up/hi.po +++ gnome-menus-2.28.0.1/debian/po-up/hi.po @@ -0,0 +1,259 @@ +# translation of menu_po-sections.hi.po to Hindi +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# G Karunakar , 2006. +msgid "" +msgstr "" +"Project-Id-Version: menu_po-sections.hi\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-11-09 12:29+0530\n" +"Last-Translator: G Karunakar \n" +"Language-Team: Hindi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "शिक्षा" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "शिक्षा" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "बोर्ड" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "बोर्ड" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "कार्ड" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "विज्ञान" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "खेलकूद" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "खेलकूद" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "रणनीति" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "रणनीति" + +#~ msgid "Editors" +#~ msgstr "संपादक" + +#~ msgid "Education" +#~ msgstr "शिक्षा" + +#~ msgid "Graphics" +#~ msgstr "ग्राफिक्स " + +#, fuzzy +#~ msgid "Network" +#~ msgstr "नेट" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "शिक्षा" + +#~ msgid "Programming" +#~ msgstr "प्रोग्रामिंग" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "डॉटाबेस" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "विज्ञान" + +#~ msgid "Shells" +#~ msgstr "शैल" + +#~ msgid "Sound" +#~ msgstr "ध्वनि" + +#~ msgid "System" +#~ msgstr "तंत्र " + +#~ msgid "Text" +#~ msgstr "पाठ" + +#~ msgid "Viewers" +#~ msgstr "प्रदर्शक" + +#~ msgid "Games" +#~ msgstr "खेल" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "तालाबंद" + +#~ msgid "Puzzles" +#~ msgstr "पहेलियाँ" + +#~ msgid "Tools" +#~ msgstr "औज़ार" + +#~ msgid "Toys" +#~ msgstr "खिलौने" + +#~ msgid "Help" +#~ msgstr "मदद" + +#~ msgid "Screen" +#~ msgstr "स्क्रीन" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "सहेजें" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "तालाबंद" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "विंडो प्रबंधक" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "मॉड्यूल्स" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "विंडो प्रबंधक" + +#~ msgid "Appearance" +#~ msgstr "रूप" + +#~ msgid "WorkSpace" +#~ msgstr "कार्यक्षेत्र" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "मोज़िला घटक" + +#~ msgid "Teddies" +#~ msgstr "टेड्डीस" + +#~ msgid "Apps" +#~ msgstr "अनुप्रयोग" + +#~ msgid "Hamradio" +#~ msgstr "हेमरेडियो" + +#~ msgid "Math" +#~ msgstr "गणित" + +#~ msgid "Technical" +#~ msgstr "तकनीकी" + +#~ msgid "Tetris-like" +#~ msgstr "टेट्रिस जैसे" + +#~ msgid "Root-window" +#~ msgstr "रूट विंडो" + +#~ msgid "XShells" +#~ msgstr "एक्सशैल" + +#~ msgid "Admin" +#~ msgstr "प्रशासक" --- gnome-menus-2.28.0.1.orig/debian/po-up/dz.po +++ gnome-menus-2.28.0.1/debian/po-up/dz.po @@ -0,0 +1,270 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +# +msgid "" +msgstr "" +"Project-Id-Version: menu-sections.pot\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-06-06 10:38+0530\n" +"Last-Translator: Jurmey Rabgay \n" +"Language-Team: dzongkha \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-Poedit-Language: dzongkha\n" +"X-Poedit-Country: bhutan\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "ཤེས་རིག" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "ཤེས་རིག" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "དཀའ་ཉེན་ཅན་གྱི་བྱ་བ།" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "དཀའ་ཉེན་ཅན་གྱི་བྱ་བ།" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "ཨར་ཀེཌི།" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "རྩེད་པང་།" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "རྩེད་པང་།" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "ཏ་སེ།" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "ཚན་རིག" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "གཡོ་རྫུས།" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "གཡོ་རྫུས།" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "རྩེད་རིགས་ཚུ།" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "རྩེད་རིགས་ཚུ།" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "ཐབས་འཇུས།" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "ཐབས་འཇུས།" + +#~ msgid "Editors" +#~ msgstr "ཞུན་དགཔ་ཚུ།" + +#~ msgid "Education" +#~ msgstr "ཤེས་རིག" + +#~ msgid "Emulators" +#~ msgstr "ནུས་འཕྲུལ་ཚུ།" + +#~ msgid "Graphics" +#~ msgstr "ཚད་རིས་ཚུ།" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "ནེཊི།" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "ཤེས་རིག" + +#~ msgid "Programming" +#~ msgstr "ལས་རིམ་བཟོ་བ།" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "གནད་སྡུད་གཞི་རྟེན་ཚུ།" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "ཚན་རིག" + +#~ msgid "Shells" +#~ msgstr "ཤལསི།" + +#~ msgid "Sound" +#~ msgstr "སྒྲ་སྐད།" + +#~ msgid "System" +#~ msgstr "རིམ་ལུགས།" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "ནུས་འཕྲུལ་ཚུ།" + +#~ msgid "Text" +#~ msgstr "ཚིག་ཡིག" + +#~ msgid "Viewers" +#~ msgstr "བལྟ་མི་ཚུ།" + +#~ msgid "Games" +#~ msgstr "རྩེདམོ།" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "ལྡེ་མིག་མ།" + +#~ msgid "Puzzles" +#~ msgstr "སྒྲིག་རྩེད་ཚུ།" + +#~ msgid "Tools" +#~ msgstr "ལག་ཆས་ཚུ།" + +#~ msgid "Toys" +#~ msgstr "བྱིས་པའི་རྩེདམོ།" + +#~ msgid "Help" +#~ msgstr "གྲོགས་རམ།" + +#~ msgid "Screen" +#~ msgstr "གསལ་གཞི།" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "སྲུང་ནི།" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "ལྡེ་མིག་མ།" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ་ཚུ།" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "ཚད་གཞི་ཚུ།" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ་ཚུ།" + +#~ msgid "Appearance" +#~ msgstr "འབྱུང་སྣང་།" + +#~ msgid "WorkSpace" +#~ msgstr "ལཱ་གི་ས་སྒོ" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "མོ་ཛིལ་ལ་ཆ་ཤས་ཚུ།" + +#~ msgid "Teddies" +#~ msgstr "ཊེ་ཌིསི།" + +#~ msgid "Apps" +#~ msgstr "གློག་རིམ་ཚུ།" + +#~ msgid "Hamradio" +#~ msgstr "ཧམ་རེ་ཌིའོ།" + +#~ msgid "Math" +#~ msgstr "ཨང་རྩིས།" + +#~ msgid "Technical" +#~ msgstr "ཐབས་རིག" + +#~ msgid "Tetris-like" +#~ msgstr "ཊེ་ཊེསི་བཟུམ་སྦེ།" + +#~ msgid "Root-window" +#~ msgstr "རྩ་བའི་སྒོ་སྒྲིག" + +#~ msgid "XShells" +#~ msgstr "ཨེགསི་ཤལསི།" + +#~ msgid "Admin" +#~ msgstr "བདག་སྐྱོང་།" --- gnome-menus-2.28.0.1.orig/debian/po-up/ml.po +++ gnome-menus-2.28.0.1/debian/po-up/ml.po @@ -0,0 +1,268 @@ +# translation of menu_po-sections_ml.po to malayalam +# Menu section translation to Malayalam +# Copyright (C) 2006 +# This file is distributed under the same license as the menu package. +# Contributers: Praveen A +# +# Praveen A , 2006. +msgid "" +msgstr "" +"Project-Id-Version: menu_po-sections_ml\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-12-07 19:46+0530\n" +"Last-Translator: Praveen A \n" +"Language-Team: malayalam \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "വിദ്യഭ്യാസം" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "വിദ്യഭ്യാസം" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "സാഹസികം" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "സാഹസികം" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "ആര്കേഡ്" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "ബോര്ഡ്" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "ബോര്ഡ്" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "കാര്ഡ്" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "ശാസ്ത്രം" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "സിമുലേഷന്‍" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "സിമുലേഷന്‍" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "കായികം" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "കായികം" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "തന്ത്രം" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "തന്ത്രം" + +#~ msgid "Editors" +#~ msgstr "എഡിറ്ററുകള്‍" + +#~ msgid "Education" +#~ msgstr "വിദ്യഭ്യാസം" + +#~ msgid "Emulators" +#~ msgstr "എമുലേറ്ററുകള്‍" + +#~ msgid "Graphics" +#~ msgstr "ഗ്രാഫിക്സ്" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "നെറ്റ്" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "വിദ്യഭ്യാസം" + +#~ msgid "Programming" +#~ msgstr "പ്രോഗ്രാമിങ്ങ്" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "ഡാറ്റാബേസുകള്‍" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "ശാസ്ത്രം" + +#~ msgid "Shells" +#~ msgstr "ഷെല്ലുകള്‍" + +#~ msgid "Sound" +#~ msgstr "ശബ്ദം" + +#~ msgid "System" +#~ msgstr "സിസ്റ്റം" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "എമുലേറ്ററുകള്‍" + +#~ msgid "Text" +#~ msgstr "ടെക്സ്റ്റ്" + +#~ msgid "Viewers" +#~ msgstr "വ്യൂവേര്സ്" + +#~ msgid "Games" +#~ msgstr "കളികള്‍" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "പൂട്ട്" + +#~ msgid "Puzzles" +#~ msgstr "പസിലുകള്‍" + +#~ msgid "Tools" +#~ msgstr "ടൂളുകള്‍" + +#~ msgid "Toys" +#~ msgstr "കളിപ്പാട്ടങ്ങള്‍" + +#~ msgid "Help" +#~ msgstr "സഹായം" + +#~ msgid "Screen" +#~ msgstr "സ്ക്രീന്‍" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "രക്ഷിക്കുക" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "പൂട്ട്" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "വിന്ഡോമാനേജറുകള്‍" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "മൊഡ്യൂളുകള്‍" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "വിന്ഡോമാനേജറുകള്‍" + +#~ msgid "Appearance" +#~ msgstr "അപ്പിയറന്സ്" + +#~ msgid "WorkSpace" +#~ msgstr "വര്ക്ക്സ്പെയ്സ്" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "മോസില്ല ഘടകങ്ങള്‍" + +#~ msgid "Teddies" +#~ msgstr "ടെഡ്ഡികള്‍" + +#~ msgid "Apps" +#~ msgstr "അപ്ലിക്കേഷനുകള്‍" + +#~ msgid "Hamradio" +#~ msgstr "ഹാംറേഡിയോ" + +#~ msgid "Math" +#~ msgstr "ഗണിതം" + +#~ msgid "Technical" +#~ msgstr "സാങ്കേതികം" + +#~ msgid "Tetris-like" +#~ msgstr "ടെട്രിസ്-പോലുള്ള" + +#~ msgid "Root-window" +#~ msgstr "റൂട്ട്-വിന്ഡോ" + +#~ msgid "XShells" +#~ msgstr "Xഷെല്ലുകള്‍" + +#~ msgid "Admin" +#~ msgstr "ഭരണം" --- gnome-menus-2.28.0.1.orig/debian/po-up/ja.po +++ gnome-menus-2.28.0.1/debian/po-up/ja.po @@ -0,0 +1,270 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-03-22 23:45+0900\n" +"Last-Translator: GOTO Masanori \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "ɥ٥㡼" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "ɥ٥㡼" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "ܡɥ" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "ܡɥ" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "ɥ" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "ʳ" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "ߥ졼" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "ߥ졼" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "ݡ" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "ݡ" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "ά" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "ά" + +#~ msgid "Editors" +#~ msgstr "ǥ" + +#~ msgid "Education" +#~ msgstr "" + +#~ msgid "Emulators" +#~ msgstr "ߥ졼" + +#~ msgid "Graphics" +#~ msgstr "եå" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "ͥå" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "" + +#~ msgid "Programming" +#~ msgstr "ץߥ" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "ǡ١" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "ʳ" + +#~ msgid "Shells" +#~ msgstr "" + +#~ msgid "Sound" +#~ msgstr "" + +#~ msgid "System" +#~ msgstr "ƥ" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "ߥ졼" + +#~ msgid "Text" +#~ msgstr "ƥ" + +#~ msgid "Viewers" +#~ msgstr "ӥ" + +#~ msgid "Games" +#~ msgstr "" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "å" + +#~ msgid "Puzzles" +#~ msgstr "ѥ" + +#~ msgid "Tools" +#~ msgstr "ġ" + +#~ msgid "Toys" +#~ msgstr "" + +#~ msgid "Help" +#~ msgstr "إ" + +#~ msgid "Screen" +#~ msgstr "" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "¸" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "å" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "ɥޥ͡" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "⥸塼" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "ɥޥ͡" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "" + +#~ msgid "WorkSpace" +#~ msgstr "ڡ" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozillaݡͥ" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "ƥǥ" + +#~ msgid "Apps" +#~ msgstr "ץꥱ" + +#~ msgid "Hamradio" +#~ msgstr "ϥ饸" + +#~ msgid "Math" +#~ msgstr "" + +#~ msgid "Technical" +#~ msgstr "" + +#~ msgid "Tetris-like" +#~ msgstr "ƥȥꥹ" + +#~ msgid "Root-window" +#~ msgstr "롼ȥɥ" + +#~ msgid "XShells" +#~ msgstr "Xü" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "" --- gnome-menus-2.28.0.1.orig/debian/po-up/bs.po +++ gnome-menus-2.28.0.1/debian/po-up/bs.po @@ -0,0 +1,268 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-11-06 16:22+0100\n" +"Last-Translator: Safir Secerovic \n" +"Language-Team: Bosnian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: 3\n" +"X-Poedit-Country: BOSNIA AND HERZEGOVINA\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Obrazovanje" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Obrazovanje" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Avanture" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Avanture" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkadne" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Ploča" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Ploča" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Kartaške" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Nauka" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulacije" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulacije" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sport" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sport" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategije" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategije" + +#~ msgid "Editors" +#~ msgstr "Uređivači" + +#~ msgid "Education" +#~ msgstr "Obrazovanje" + +#~ msgid "Emulators" +#~ msgstr "Emulatori" + +#~ msgid "Graphics" +#~ msgstr "Grafika" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Mreža" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Obrazovanje" + +#~ msgid "Programming" +#~ msgstr "Programiranje" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Baze podataka" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Nauka" + +#~ msgid "Shells" +#~ msgstr "Ljuske" + +#~ msgid "Sound" +#~ msgstr "Zvuk" + +#~ msgid "System" +#~ msgstr "Sistem" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulatori" + +#~ msgid "Text" +#~ msgstr "Tekst" + +#~ msgid "Viewers" +#~ msgstr "Preglednici" + +#~ msgid "Games" +#~ msgstr "Igre" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Zaključaj" + +#~ msgid "Puzzles" +#~ msgstr "Slagalice" + +#~ msgid "Tools" +#~ msgstr "Alati" + +#~ msgid "Toys" +#~ msgstr "Igračke" + +#~ msgid "Help" +#~ msgstr "Pomoć" + +#~ msgid "Screen" +#~ msgstr "Ekran" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Zaštiti" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Zaključaj" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Upravljači prozora" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Moduli" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Upravljači prozora" + +#~ msgid "Appearance" +#~ msgstr "Izgled" + +#~ msgid "WorkSpace" +#~ msgstr "Radni prostor" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla komponente" + +#~ msgid "Teddies" +#~ msgstr "Medvjedići" + +#~ msgid "Apps" +#~ msgstr "Aplikacije" + +#~ msgid "Hamradio" +#~ msgstr "Radio amaterstvo" + +#~ msgid "Math" +#~ msgstr "Matematika" + +#~ msgid "Technical" +#~ msgstr "Tehnički" + +#~ msgid "Tetris-like" +#~ msgstr "Tetrisi" + +#~ msgid "Root-window" +#~ msgstr "Pozadina" + +#~ msgid "XShells" +#~ msgstr "X ljuske" + +#~ msgid "Admin" +#~ msgstr "Administracija" --- gnome-menus-2.28.0.1.orig/debian/po-up/pt_BR.po +++ gnome-menus-2.28.0.1/debian/po-up/pt_BR.po @@ -0,0 +1,131 @@ +# gnome-menus Brazilian Portuguese translation +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# Eder L. Marques , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-menus 2.18.3-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-18 10:24-0300\n" +"Last-Translator: Eder L. Marques \n" +"Language-Team: l10n Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"pt_BR utf-8\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Ação" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Jogos de ação" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Aventura" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Jogos estilo aventura" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Fliperama" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Jogos estilo fliperama" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Blocos caindo" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Jogos de blocos caindo" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Tabuleiro" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Jogos de tabuleiro" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Jogos de carta" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Cartas" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "O menu Debian" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Jogos para crianças" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Crianças" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Lógica" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Jogos de lógica e quebra-cabeças" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "RPG" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Jogos estilo RPG" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulação" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Jogos de simulação" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Esportes" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Jogos de esportes" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Estratégia" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Jogos de estratégia" --- gnome-menus-2.28.0.1.orig/debian/po-up/bg.po +++ gnome-menus-2.28.0.1/debian/po-up/bg.po @@ -0,0 +1,133 @@ +# translation of bg.po to Bulgarian +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# +# +# Bill Allombert , 2003. +# Damyan Ivanov , 2007. +msgid "" +msgstr "" +"Project-Id-Version: bg\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-18 12:00+0300\n" +"Last-Translator: Damyan Ivanov \n" +"Language-Team: Bulgarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Екшън" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Екшън игри" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Приключенски" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Приключенски игри" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Аркадни" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Аркадни игри" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Падащи блокчета" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Игри с падащи блокчета" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Настолни" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Настолни игри" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Игри с карти" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Карти" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Дебиан" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Менюто на Дебиан" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Игри за деца" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Детски" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Логически" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Логически игри" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Роли" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Игри с роли" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Симулатори" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Симулационни игри" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Спортни" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Спортни игри" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Стратегически" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Стратегически игри" --- gnome-menus-2.28.0.1.orig/debian/po-up/ru.po +++ gnome-menus-2.28.0.1/debian/po-up/ru.po @@ -0,0 +1,134 @@ +# translation of ru.po to Russian +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# Russian L10N Team , 2005. +# Yuri Kozlov , 2007. +msgid "" +msgstr "" +"Project-Id-Version: ru_new\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-26 22:00+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\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" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Экшн" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Динамичные игры" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Приключения" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Приключенческие игры" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Аркады" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Аркадные игры" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Тетрисы" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Тетрисоподобные игры" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Настольные" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Настольные игры" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Карточные игры" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Карты" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Меню Debian" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Игры для детей" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Детские" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Логические" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Логические игры и головоломки" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Ролевые" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Ролевые игры" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Симуляторы" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Игры-симуляторы" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Спортивные" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Спортивные игры" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Стратегии" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Стратегические игры" --- gnome-menus-2.28.0.1.orig/debian/po-up/ko.po +++ gnome-menus-2.28.0.1/debian/po-up/ko.po @@ -0,0 +1,260 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Sunjae Park , 2006 - 2007. +# Bill Allombert , 2003. +# +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-17 22:18-0500\n" +"Last-Translator: Sunjae Park \n" +"Language-Team: Korean \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" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "액션" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "액션게임" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "어드벤처" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "어드벤처 게임" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "아케이드" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "아케이드 게임" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "벽돌" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "벽돌 게임" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "보드게임" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "보드게임" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "카드" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "카드게임" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "데비안" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "데비안 메뉴" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "어린이들을 위한 게임" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "어린이" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "논리" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "논리 게임과 퍼즐 게임" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "를플레잉" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "롤플레잉 게임" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "과학" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "시뮬레이션" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "시뮬레이션 게임" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "스포츠" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "스포츠 게임" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "전략" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "전략 게임" + +#~ msgid "Editors" +#~ msgstr "에디터" + +#~ msgid "Education" +#~ msgstr "교육" + +#~ msgid "Emulators" +#~ msgstr "에뮬레이터" + +#~ msgid "Graphics" +#~ msgstr "그림" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "네트워크" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "교육" + +#~ msgid "Programming" +#~ msgstr "프로그래밍" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "데이터베이스" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "과학" + +#~ msgid "Shells" +#~ msgstr "셸" + +#~ msgid "Sound" +#~ msgstr "소리" + +#~ msgid "System" +#~ msgstr "시스템" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "에뮬레이터" + +#~ msgid "Text" +#~ msgstr "문서" + +#~ msgid "Viewers" +#~ msgstr "뷰어" + +#~ msgid "Games" +#~ msgstr "게임" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "잠그기" + +#~ msgid "Puzzles" +#~ msgstr "퍼즐" + +#~ msgid "Tools" +#~ msgstr "도구" + +#~ msgid "Toys" +#~ msgstr "흥미거리" + +#~ msgid "Help" +#~ msgstr "도움말" + +#~ msgid "Screen" +#~ msgstr "화면" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "보호기" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "잠그기" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "윈도우 매니저" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "모듈" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "윈도우 매니저" + +#~ msgid "Appearance" +#~ msgstr "겉보기" + +#~ msgid "WorkSpace" +#~ msgstr "작업공간" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "모질라 관련" + +#~ msgid "Teddies" +#~ msgstr "테디베어" + +#~ msgid "Apps" +#~ msgstr "응용 프로그램" + +#~ msgid "Hamradio" +#~ msgstr "아마추어 무선" + +#~ msgid "Math" +#~ msgstr "수학" + +#~ msgid "Technical" +#~ msgstr "기술" + +#~ msgid "Tetris-like" +#~ msgstr "테트리스식" + +#~ msgid "Root-window" +#~ msgstr "루트 창" + +#~ msgid "XShells" +#~ msgstr "Xterm 계열" + +#~ msgid "Admin" +#~ msgstr "관리" --- gnome-menus-2.28.0.1.orig/debian/po-up/cs.po +++ gnome-menus-2.28.0.1/debian/po-up/cs.po @@ -0,0 +1,253 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Czech translation: Miroslav Kure, 2004-2007 +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-20 22:50+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Akce" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Akční hry" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Dobrodružné" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Dobrodružné hry" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkády" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Arkádové hry" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Padající bloky" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Hry s padajícími bloky" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Deskové" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Deskové hry" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Karetní hry" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Karty" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Menu Debianu" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Hry pro děti" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Dětské" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Logické" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Logické hry a hádanky" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Hraní na hrdiny" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Hry hraní na hrdiny" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Věda" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulátory" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Simulační hry" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sporty" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Sportovní hry" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategie" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Strategické hry" + +#~ msgid "Editors" +#~ msgstr "Editory" + +#~ msgid "Education" +#~ msgstr "Vzdělání" + +#~ msgid "Emulators" +#~ msgstr "Emulátory" + +#~ msgid "Graphics" +#~ msgstr "Grafika" + +#~ msgid "Network" +#~ msgstr "Síť" + +#~ msgid "Communication" +#~ msgstr "Komunikace" + +#~ msgid "Programming" +#~ msgstr "Programování" + +#~ msgid "Data Analysis" +#~ msgstr "Analýza dat" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Věda" + +#~ msgid "Shells" +#~ msgstr "Shelly" + +#~ msgid "Sound" +#~ msgstr "Zvuky" + +#~ msgid "System" +#~ msgstr "Systém" + +#~ msgid "Terminal Emulators" +#~ msgstr "Emulátory terminálu" + +#~ msgid "Text" +#~ msgstr "Text" + +#~ msgid "Viewers" +#~ msgstr "Prohlížeče" + +#~ msgid "Games" +#~ msgstr "Hry" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Zamknout" + +#~ msgid "Puzzles" +#~ msgstr "Hlavolamy" + +#~ msgid "Tools" +#~ msgstr "Nástroje" + +#~ msgid "Toys" +#~ msgstr "Hračky" + +#~ msgid "Help" +#~ msgstr "Nápověda" + +#~ msgid "Screen" +#~ msgstr "Obrazovka" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Šetřič" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Zamknout" + +#~ msgid "Window Managers" +#~ msgstr "Správci oken" + +#~ msgid "FVWM Modules" +#~ msgstr "Moduly FVWM" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Vzhled" + +#~ msgid "WorkSpace" +#~ msgstr "Pracovní plocha" + +# Fresuently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla - součásti" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Medvídci" + +#~ msgid "Apps" +#~ msgstr "Aplikace" + +#~ msgid "Hamradio" +#~ msgstr "Amatérské rádio" + +#~ msgid "Math" +#~ msgstr "Matematika" + +#~ msgid "Technical" +#~ msgstr "Technické" + +#~ msgid "Tetris-like" +#~ msgstr "Tetrisové variace" + +#~ msgid "Root-window" +#~ msgstr "Kořenové okno" + +#~ msgid "XShells" +#~ msgstr "XShelly" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Administrátor" --- gnome-menus-2.28.0.1.orig/debian/po-up/sk.po +++ gnome-menus-2.28.0.1/debian/po-up/sk.po @@ -0,0 +1,267 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Slovak translation: Peter Mann, 2005 +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-07-09 18:48+0200\n" +"Last-Translator: Peter Mann \n" +"Language-Team: Slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Výuka" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Výuka" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Dobrodružné" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Dobrodružné" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Videohry" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Stolné" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Stolné" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Kartové" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Veda" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulátory" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulátory" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Športy" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Športy" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategické" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategické" + +#~ msgid "Editors" +#~ msgstr "Editory" + +#~ msgid "Education" +#~ msgstr "Výuka" + +#~ msgid "Emulators" +#~ msgstr "Emulátory" + +#~ msgid "Graphics" +#~ msgstr "Grafika" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Sieť" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Výuka" + +#~ msgid "Programming" +#~ msgstr "Programovanie" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Databázy" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Veda" + +#~ msgid "Shells" +#~ msgstr "Shelly" + +#~ msgid "Sound" +#~ msgstr "Zvuky" + +#~ msgid "System" +#~ msgstr "Systém" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulátory" + +#~ msgid "Text" +#~ msgstr "Text" + +#~ msgid "Viewers" +#~ msgstr "Prehliadače" + +#~ msgid "Games" +#~ msgstr "Hry" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Zamknúť" + +#~ msgid "Puzzles" +#~ msgstr "Hlavolamy" + +#~ msgid "Tools" +#~ msgstr "Nástroje" + +#~ msgid "Toys" +#~ msgstr "Hračky" + +#~ msgid "Help" +#~ msgstr "Nápoveda" + +#~ msgid "Screen" +#~ msgstr "Obrazovka" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Šetrič" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Zamknúť" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Správcovia okien" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Moduly" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Správcovia okien" + +#~ msgid "Appearance" +#~ msgstr "Vzhľad" + +#~ msgid "WorkSpace" +#~ msgstr "Pracovná plocha" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla - súčasti" + +#~ msgid "Teddies" +#~ msgstr "Medvedíky" + +#~ msgid "Apps" +#~ msgstr "Aplikácie" + +#~ msgid "Hamradio" +#~ msgstr "Amatérske rádio" + +#~ msgid "Math" +#~ msgstr "Matematika" + +#~ msgid "Technical" +#~ msgstr "Technické" + +#~ msgid "Tetris-like" +#~ msgstr "Tetrisové variácie" + +#~ msgid "Root-window" +#~ msgstr "Koreňové okno" + +#~ msgid "XShells" +#~ msgstr "XShelly" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Administrátor" --- gnome-menus-2.28.0.1.orig/debian/po-up/mk.po +++ gnome-menus-2.28.0.1/debian/po-up/mk.po @@ -0,0 +1,268 @@ +# translation of menu_po-sections_mk.po to Macedonian +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# Georgi Stanojevski , 2006. +msgid "" +msgstr "" +"Project-Id-Version: menu_po-sections_mk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-10-20 11:03+0200\n" +"Last-Translator: Georgi Stanojevski \n" +"Language-Team: Macedonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.2\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Образовни" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Образовни" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Авантура" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Авантура" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Аркадни" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "На табла" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "На табла" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Карти" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Наука" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Симулација" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Симулација" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Спорт" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Спорт" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Стратегија" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Стратегија" + +#~ msgid "Editors" +#~ msgstr "Уредувачи" + +#~ msgid "Education" +#~ msgstr "Образовни" + +#~ msgid "Emulators" +#~ msgstr "Емулатори" + +#~ msgid "Graphics" +#~ msgstr "Графика" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Мрежа" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Образовни" + +#~ msgid "Programming" +#~ msgstr "Програмирање" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Бази со податоци" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Наука" + +#~ msgid "Shells" +#~ msgstr "Школки" + +#~ msgid "Sound" +#~ msgstr "Звук" + +#~ msgid "System" +#~ msgstr "Систем" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Емулатори" + +#~ msgid "Text" +#~ msgstr "Текст" + +#~ msgid "Viewers" +#~ msgstr "Прегледувачи" + +#~ msgid "Games" +#~ msgstr "Игри" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Заклучи" + +#~ msgid "Puzzles" +#~ msgstr "Загатки" + +#~ msgid "Tools" +#~ msgstr "Алатки" + +#~ msgid "Toys" +#~ msgstr "Играчки" + +#~ msgid "Help" +#~ msgstr "Помош" + +#~ msgid "Screen" +#~ msgstr "Екран" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Активирај" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Заклучи" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Менаџери за прозорци" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Модули" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Менаџери за прозорци" + +#~ msgid "Appearance" +#~ msgstr "Изглед" + +#~ msgid "WorkSpace" +#~ msgstr "Работна околина" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Мозила компоненти" + +#~ msgid "Teddies" +#~ msgstr "Мечиња" + +#~ msgid "Apps" +#~ msgstr "Програми" + +#~ msgid "Hamradio" +#~ msgstr "Аматерско радио" + +#~ msgid "Math" +#~ msgstr "Математички" + +#~ msgid "Technical" +#~ msgstr "Технички" + +#~ msgid "Tetris-like" +#~ msgstr "Тетрис" + +#~ msgid "Root-window" +#~ msgstr "Главен прозорец" + +#~ msgid "XShells" +#~ msgstr "ХШколки" + +#~ msgid "Admin" +#~ msgstr "Администрација" --- gnome-menus-2.28.0.1.orig/debian/po-up/tr.po +++ gnome-menus-2.28.0.1/debian/po-up/tr.po @@ -0,0 +1,271 @@ +# Turkish translation of menu-sections. +# This file is distributed under the same license as the menu-sections package. +# Recai Oktas , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-sections\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-04-13 22:39+0300\n" +"Last-Translator: Recai Oktas \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Eğitim" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Eğitim" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Serüven" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Serüven" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkad" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Tahta" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Tahta" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Kart" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Bilim" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulasyon" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulasyon" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sporlar" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sporlar" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strateji" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strateji" + +#~ msgid "Editors" +#~ msgstr "Düzenleyiciler" + +#~ msgid "Education" +#~ msgstr "Eğitim" + +#~ msgid "Emulators" +#~ msgstr "Emülatörler" + +#~ msgid "Graphics" +#~ msgstr "Grafik" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Ağ" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Eğitim" + +#~ msgid "Programming" +#~ msgstr "Programlama" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Veritabanları" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Bilim" + +#~ msgid "Shells" +#~ msgstr "Kabuklar" + +#~ msgid "Sound" +#~ msgstr "Ses" + +#~ msgid "System" +#~ msgstr "Sistem" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emülatörler" + +#~ msgid "Text" +#~ msgstr "Metin" + +#~ msgid "Viewers" +#~ msgstr "Görüntüleyiciler" + +#~ msgid "Games" +#~ msgstr "Oyunlar" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Kilitle" + +#~ msgid "Puzzles" +#~ msgstr "Bulmacalar" + +#~ msgid "Tools" +#~ msgstr "Araçlar" + +#~ msgid "Toys" +#~ msgstr "Oyuncaklar" + +#~ msgid "Help" +#~ msgstr "Yardım" + +#~ msgid "Screen" +#~ msgstr "Ekran" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Kaydet" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Kilitle" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Pencere Yöneticileri" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Bileşenler" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Pencere Yöneticileri" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Görünüm" + +#~ msgid "WorkSpace" +#~ msgstr "Çalışma alanı" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla Bileşenleri" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Ayıcıklar" + +#~ msgid "Apps" +#~ msgstr "Uygulamalar" + +#~ msgid "Hamradio" +#~ msgstr "Amatör Radyo" + +#~ msgid "Math" +#~ msgstr "Matematik" + +#~ msgid "Technical" +#~ msgstr "Teknik" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris-benzeri" + +#~ msgid "Root-window" +#~ msgstr "Kök-pencere" + +#~ msgid "XShells" +#~ msgstr "X kabukları" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Yönetim" --- gnome-menus-2.28.0.1.orig/debian/po-up/gu.po +++ gnome-menus-2.28.0.1/debian/po-up/gu.po @@ -0,0 +1,259 @@ +# Gujarati translation of Menu section +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +# Kartik Mistry , 2006-2007 +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-10-14 20:27+0530\n" +"Last-Translator: Kartik Mistry \n" +"Language-Team: Gujarati \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "ક્રિયા" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "ક્રિયા રમતો" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "સાહસ" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "સાહસ પ્રકારની રમતો" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "અર્કાડે" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "અર્કાડે પ્રકારની રમતો" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "પડતાં ચોકઠાંઓ" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "પડતાં ચોકઠાંઓ પ્રકારની રમતો" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "બોર્ડ" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "બોર્ડ રમતો" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "કાર્ડ રમતો" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "કાર્ડ" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "ડેબિયન" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "ડેબિયન મેનુ" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "બાળકો માટેની રમતો" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "બાળકો" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "તર્ક" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "તર્ક અને કોયડા રમતો" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "ભૂમિકા" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "ભૂમિકા રમતો" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "વિજ્ઞાન" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "સિમ્યુલેશન" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "સિમ્યુલેશન રમતો" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "રમતો" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "મેદાની રમતો" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "રણનીતિ" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "રણનીતિ રમતો" + +#~ msgid "Editors" +#~ msgstr "સંપાદકો" + +#~ msgid "Education" +#~ msgstr "શિક્ષણ" + +#~ msgid "Emulators" +#~ msgstr "ઇમ્યુલેટર્સ" + +#~ msgid "Graphics" +#~ msgstr "ગ્રાફિક્સ" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "નેટ" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "શિક્ષણ" + +#~ msgid "Programming" +#~ msgstr "પ્રોગ્રામિંગ" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "ડેટાબેઝ" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "વિજ્ઞાન" + +#~ msgid "Shells" +#~ msgstr "શેલ્સ" + +#~ msgid "Sound" +#~ msgstr "ધ્વનિ" + +#~ msgid "System" +#~ msgstr "સિસ્ટમ" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "ઇમ્યુલેટર્સ" + +#~ msgid "Text" +#~ msgstr "લખાણ" + +#~ msgid "Viewers" +#~ msgstr "દર્શકો" + +#~ msgid "Games" +#~ msgstr "રમતો" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "તાળું" + +#~ msgid "Puzzles" +#~ msgstr "કોયડાઓ" + +#~ msgid "Tools" +#~ msgstr "સાધનો" + +#~ msgid "Toys" +#~ msgstr "રમકડાંઓ" + +#~ msgid "Help" +#~ msgstr "મદદ" + +#~ msgid "Screen" +#~ msgstr "છબી" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "સંગ્રહો" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "તાળું" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "વિન્ડોસંચાલકો" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "મોડ્યુલો" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "વિન્ડોસંચાલકો" + +#~ msgid "Appearance" +#~ msgstr "દેખાવ" + +#~ msgid "WorkSpace" +#~ msgstr "વર્કસ્પેસ" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "મોઝિલા ભાગો" + +#~ msgid "Teddies" +#~ msgstr "ટેડી" + +#~ msgid "Apps" +#~ msgstr "કાર્યક્રમો" + +#~ msgid "Hamradio" +#~ msgstr "હેમરેડિઓ" + +#~ msgid "Math" +#~ msgstr "ગણિત" + +#~ msgid "Technical" +#~ msgstr "તકનીકી" + +#~ msgid "Tetris-like" +#~ msgstr "ટેટ્રિસ-જેવાં" + +#~ msgid "Root-window" +#~ msgstr "મુખ્ય-વિન્ડો" + +#~ msgid "XShells" +#~ msgstr "એક્સશેલ્સ" + +#~ msgid "Admin" +#~ msgstr "સંચાલક" --- gnome-menus-2.28.0.1.orig/debian/po-up/ca.po +++ gnome-menus-2.28.0.1/debian/po-up/ca.po @@ -0,0 +1,271 @@ +# Menu section translation to Catalan. +# Copyright (C) 2003, 2004 Software in the Public Interest, Inc. +# This file is distributed under the same license as the menu package. +# Jordi Mallach , 2003, 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-04-06 18:29+0200\n" +"Last-Translator: Jordi Mallach \n" +"Language-Team: Catalan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Educaci" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Educaci" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Aventura" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Aventura" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Tauler" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Tauler" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Cartes" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Cincia" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simuladors" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simuladors" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Esports" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Esports" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Estratgia" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Estratgia" + +#~ msgid "Editors" +#~ msgstr "Editors" + +#~ msgid "Education" +#~ msgstr "Educaci" + +#~ msgid "Emulators" +#~ msgstr "Emuladors" + +#~ msgid "Graphics" +#~ msgstr "Grfics" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Xarxa" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Educaci" + +#~ msgid "Programming" +#~ msgstr "Programaci" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Bases de dades" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Cincia" + +# Intrprets d'ordres queda massa llarg. Intrprets a seques, ambigu... jm +#~ msgid "Shells" +#~ msgstr "Shells" + +#~ msgid "Sound" +#~ msgstr "So" + +#~ msgid "System" +#~ msgstr "Sistema" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emuladors" + +#~ msgid "Text" +#~ msgstr "Text" + +#~ msgid "Viewers" +#~ msgstr "Visualitzadors" + +#~ msgid "Games" +#~ msgstr "Jocs" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Bloca" + +#~ msgid "Puzzles" +#~ msgstr "Puzzles" + +#~ msgid "Tools" +#~ msgstr "Eines" + +#~ msgid "Toys" +#~ msgstr "Joguets" + +#~ msgid "Help" +#~ msgstr "Ajuda" + +#~ msgid "Screen" +#~ msgstr "Pantalla" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Desa" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Bloca" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Gestors de finestres" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Mduls" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Gestors de finestres" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Aparena" + +#~ msgid "WorkSpace" +#~ msgstr "Espai de treball" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Components del Mozilla" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Teddies" + +#~ msgid "Apps" +#~ msgstr "Aplicacions" + +#~ msgid "Hamradio" +#~ msgstr "Radioaficionat" + +#~ msgid "Math" +#~ msgstr "Matemtiques" + +#~ msgid "Technical" +#~ msgstr "Tcniques" + +#~ msgid "Tetris-like" +#~ msgstr "Tipus tetris" + +#~ msgid "Root-window" +#~ msgstr "Finestra arrel" + +#~ msgid "XShells" +#~ msgstr "Shells per a X" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Administraci" --- gnome-menus-2.28.0.1.orig/debian/po-up/gl.po +++ gnome-menus-2.28.0.1/debian/po-up/gl.po @@ -0,0 +1,266 @@ +# Menu section translation (Galician) +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Jacobo Tarrio , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-03-26 14:27+0200\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Educativos" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Educativos" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Aventuras" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Aventuras" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Acción" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Taboleiro" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Taboleiro" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Cartas" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Ciencias" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulación" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulación" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Deportes" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Deportes" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Estratexia" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Estratexia" + +#~ msgid "Editors" +#~ msgstr "Editores" + +#~ msgid "Education" +#~ msgstr "Educativos" + +#~ msgid "Emulators" +#~ msgstr "Emuladores" + +#~ msgid "Graphics" +#~ msgstr "Gráficos" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Redes" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Educativos" + +#~ msgid "Programming" +#~ msgstr "Programación" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Bases de datos" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Ciencias" + +#~ msgid "Shells" +#~ msgstr "Intérpretes de ordes" + +#~ msgid "Sound" +#~ msgstr "Son" + +#~ msgid "System" +#~ msgstr "Sistema" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emuladores" + +#~ msgid "Text" +#~ msgstr "Texto" + +#~ msgid "Viewers" +#~ msgstr "Visores" + +#~ msgid "Games" +#~ msgstr "Xogos" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Bloquear" + +#~ msgid "Puzzles" +#~ msgstr "Lóxica" + +#~ msgid "Tools" +#~ msgstr "Ferramentas" + +#~ msgid "Toys" +#~ msgstr "Xoguetes" + +#~ msgid "Help" +#~ msgstr "Axuda" + +#~ msgid "Screen" +#~ msgstr "Pantalla" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Salvar" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Bloquear" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Xestores de fiestras" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Módulos" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Xestores de fiestras" + +#~ msgid "Appearance" +#~ msgstr "Aparencia" + +#~ msgid "WorkSpace" +#~ msgstr "Espazo de traballo" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Compoñentes de Mozilla" + +#~ msgid "Teddies" +#~ msgstr "Osiños" + +#~ msgid "Apps" +#~ msgstr "Aplicacións" + +#~ msgid "Hamradio" +#~ msgstr "Radio-afección" + +#~ msgid "Math" +#~ msgstr "Matemáticas" + +#~ msgid "Technical" +#~ msgstr "Técnico" + +#~ msgid "Tetris-like" +#~ msgstr "Tipo Tetris" + +#~ msgid "Root-window" +#~ msgstr "Fiestra raíz" + +#~ msgid "XShells" +#~ msgstr "Terminais gráficos" + +#~ msgid "Admin" +#~ msgstr "Administración" --- gnome-menus-2.28.0.1.orig/debian/po-up/th.po +++ gnome-menus-2.28.0.1/debian/po-up/th.po @@ -0,0 +1,330 @@ +# Thai translation of Menu sections +# Copyright (C) 2006-2007 Software in the Public Interest, Inc. +# This file is distributed under the same license as the menu package. +# Theppitak Karoonboonyanan , 2006-2007. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-18 13:57+0700\n" +"Last-Translator: Theppitak Karoonboonyanan \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "แอ็คชั่น" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "เกมแอ็คชั่น" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "ผจญภัย" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "เกมผจญภัย" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "โต้ตอบ" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "เกมโต้ตอบ" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "บล็อคหล่น" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "เกมบล็อคหล่น" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "กระดาน" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "เกมหมากกระดาน" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "เกมไพ่" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "ไพ่" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "เดเบียน" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "เมนูเดเบียน" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "เกมสำหรับเด็ก" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "เด็ก" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "ตรรกะ" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "เกมตรรกะและปริศนา" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "เล่นบทบาท" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "เกมเล่นบทบาท" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "วิทยาศาสตร์" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +#, fuzzy +msgid "Scientific applications" +msgstr "โปรแกรม" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "จำลอง" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "เกมจำลองสถานการณ์" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "กีฬา" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "เกมกีฬา" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "วางแผน" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "เกมวางแผน" + +#~ msgid "Accessibility" +#~ msgstr "สิ่งอำนวยความสะดวก" + +#~ msgid "Amateur Radio" +#~ msgstr "วิทยุสมัครเล่น" + +#~ msgid "Data Management" +#~ msgstr "การจัดการข้อมูล" + +#~ msgid "Editors" +#~ msgstr "เครื่องมือแก้ไข" + +#~ msgid "Education" +#~ msgstr "การศึกษา" + +#~ msgid "Emulators" +#~ msgstr "จำลอง" + +#~ msgid "File Management" +#~ msgstr "การจัดการแฟ้ม" + +#~ msgid "Graphics" +#~ msgstr "รูปภาพ" + +#~ msgid "Mobile Devices" +#~ msgstr "อุปกรณ์พกพา" + +#~ msgid "Network" +#~ msgstr "เครือข่าย" + +#~ msgid "Communication" +#~ msgstr "การสื่อสาร" + +#~ msgid "File Transfer" +#~ msgstr "การถ่ายโอนแฟ้ม" + +#~ msgid "Monitoring" +#~ msgstr "ติดตามสถานะ" + +#~ msgid "Web Browsing" +#~ msgstr "เว็บเบราว์เซอร์" + +#~ msgid "Web News" +#~ msgstr "ข่าวทางเว็บ" + +#~ msgid "Office" +#~ msgstr "สำนักงาน" + +#~ msgid "Programming" +#~ msgstr "เขียนโปรแกรม" + +#~ msgid "Project Management" +#~ msgstr "การจัดการโครงการ" + +#~ msgid "Astronomy" +#~ msgstr "ดาราศาสตร์" + +#~ msgid "Biology" +#~ msgstr "ชีววิทยา" + +#~ msgid "Chemistry" +#~ msgstr "เคมี" + +#~ msgid "Data Analysis" +#~ msgstr "การวิเคราะห์ข้อมูล" + +#~ msgid "Electronics" +#~ msgstr "อิเล็กทรอนิกส์" + +#~ msgid "Engineering" +#~ msgstr "วิศวกรรม" + +#~ msgid "Geoscience" +#~ msgstr "ภูมิศาสตร์" + +#~ msgid "Mathematics" +#~ msgstr "คณิตศาสตร์" + +#~ msgid "Medicine" +#~ msgstr "การแพทย์" + +#~ msgid "Physics" +#~ msgstr "ฟิสิกส์" + +#~ msgid "Social" +#~ msgstr "สังคมศาสตร์" + +#~ msgid "Shells" +#~ msgstr "เชลล์" + +#~ msgid "Sound" +#~ msgstr "เสียง" + +#~ msgid "System" +#~ msgstr "ระบบ" + +#~ msgid "Administration" +#~ msgstr "ดูแลระบบ" + +#~ msgid "Hardware" +#~ msgstr "ฮาร์ดแวร์" + +#~ msgid "Language Environment" +#~ msgstr "สภาพแวดล้อมเฉพาะภาษา" + +#~ msgid "Package Management" +#~ msgstr "การจัดการแพกเกจ" + +#~ msgid "Security" +#~ msgstr "ระบบรักษาความปลอดภัย" + +#~ msgid "Terminal Emulators" +#~ msgstr "จำลองเทอร์มินัล" + +#~ msgid "Text" +#~ msgstr "ประมวลข้อความ" + +#~ msgid "TV and Radio" +#~ msgstr "ทีวีและวิทยุ" + +#~ msgid "Viewers" +#~ msgstr "โปรแกรมแสดง" + +#~ msgid "Video" +#~ msgstr "วีดิทัศน์" + +#~ msgid "Web Development" +#~ msgstr "การพัฒนาเว็บ" + +#~ msgid "Games" +#~ msgstr "เกม" + +#~ msgid "Blocks" +#~ msgstr "บล็อค" + +#~ msgid "Puzzles" +#~ msgstr "ปริศนา" + +#~ msgid "Tools" +#~ msgstr "เครื่องมือ" + +#~ msgid "Toys" +#~ msgstr "ของเล่น" + +#~ msgid "Help" +#~ msgstr "วิธีใช้" + +#~ msgid "Screen" +#~ msgstr "หน้าจอ" + +#~ msgid "Saving" +#~ msgstr "รักษาหน้าจอ" + +#~ msgid "Locking" +#~ msgstr "ล็อค" + +#~ msgid "Window Managers" +#~ msgstr "โปรแกรมจัดการหน้าต่าง" + +#~ msgid "FVWM Modules" +#~ msgstr "มอดูล FVWM" + +#~ msgid "Window Maker" +#~ msgstr "Window Maker" + +#~ msgid "Appearance" +#~ msgstr "รูปโฉม" + +#~ msgid "WorkSpace" +#~ msgstr "พื้นที่ทำงาน" + +#~ msgid "Iceape Components" +#~ msgstr "องค์ประกอบ Iceape" + +#~ msgid "Teddies" +#~ msgstr "เท็ดดี้" + +#~ msgid "Apps" +#~ msgstr "โปรแกรม" + +#~ msgid "Hamradio" +#~ msgstr "วิทยุสมัครเล่น" + +#~ msgid "Math" +#~ msgstr "คณิตศาสตร์" + +#~ msgid "Technical" +#~ msgstr "ทางเทคนิค" + +#~ msgid "Tetris-like" +#~ msgstr "ประเภทเททริส" + +#~ msgid "Root-window" +#~ msgstr "พื้นหลัง" + +#~ msgid "XShells" +#~ msgstr "เชลล์ใน X" + +#~ msgid "Admin" +#~ msgstr "ดูแลระบบ" --- gnome-menus-2.28.0.1.orig/debian/po-up/es.po +++ gnome-menus-2.28.0.1/debian/po-up/es.po @@ -0,0 +1,133 @@ +# Gnome-Menus section translation +# Copyright (C) Software in the Public Interest, 2004 +# This file is distributed under the same license as the gnome-menus package. +# +# Translators: +# - Initial translation: Javier Fernandez-Sanguino , march 2004 +# (menu translation) +# - Revision: Javier Fernandez-Sanguino , july 2007 +# (update for gnome-menus) +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-menus 2.18.3-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-18 09:01+0200\n" +"Last-Translator: Javier Fernandez-Sanguino \n" +"Language-Team: Debian Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Accin" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Juegos de accin" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Aventura" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Juegos tipo aventura" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Juegos tipo arcade" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Bloques cayendo" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Juegos de bloques cayendo" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Tablero" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Juegos de tablero" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Juegos de cartas" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Cartas" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "El men de Debian" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Juegos para nios" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Nios" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Lgica" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Juegos de lgica y puzles" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Rol" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Juegos de rol" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulacin" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Juegos de simulacin" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Deportes" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Juegos de deportes" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Estrategia" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Juegos de estrategia" --- gnome-menus-2.28.0.1.orig/debian/po-up/km.po +++ gnome-menus-2.28.0.1/debian/po-up/km.po @@ -0,0 +1,270 @@ +# translation of menu_po-sections_km.po to Khmer +# translation of menu_po-sections_km.po to +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# Khoem Sokhem , 2006. +# auk piseth , 2006. +msgid "" +msgstr "" +"Project-Id-Version: menu_po-sections_km\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-06-12 15:21-0600\n" +"Last-Translator: auk piseth \n" +"Language-Team: Khmer \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "ការ​អប់​រំ​" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "ការ​អប់​រំ​" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "ការផ្សងព្រេង​" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "ការផ្សងព្រេង​" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "ល្បែងទូ​" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "ក្តារ​" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "ក្តារ​" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "កាត​" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "វិទ្យាសាស្ត្រ​" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "ការក្លែងធ្វើ​" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "ការក្លែងធ្វើ​" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "កីឡា" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "កីឡា" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "យុទ្ធសាស្ត្រ​" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "យុទ្ធសាស្ត្រ​" + +#~ msgid "Editors" +#~ msgstr "កម្មវិធី​និពន្ធ​" + +#~ msgid "Education" +#~ msgstr "ការ​អប់​រំ​" + +#~ msgid "Emulators" +#~ msgstr "វត្ថុ​ត្រាប់​តាម" + +#~ msgid "Graphics" +#~ msgstr "ក្រាហ្វិក​" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "សំណាញ់" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "ការ​អប់​រំ​" + +#~ msgid "Programming" +#~ msgstr "សរសេរ​កម្មវិធី​" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "មូលដ្ឋាន​ទិន្នន័យ​" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "វិទ្យាសាស្ត្រ​" + +#~ msgid "Shells" +#~ msgstr "សែល​" + +#~ msgid "Sound" +#~ msgstr "សម្លេង​" + +#~ msgid "System" +#~ msgstr "ប្រព័ន្ធ​" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "វត្ថុ​ត្រាប់​តាម" + +#~ msgid "Text" +#~ msgstr "អត្ថបទ​" + +#~ msgid "Viewers" +#~ msgstr "អ្នក​​មើល​" + +#~ msgid "Games" +#~ msgstr "ល្បែង​" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "ចាក់សោ" + +#~ msgid "Puzzles" +#~ msgstr "ល្បែង​ដោះស្រាយ​" + +#~ msgid "Tools" +#~ msgstr "ឧបករណ៍​" + +#~ msgid "Toys" +#~ msgstr "គ្រឿងលេង​" + +#~ msgid "Help" +#~ msgstr "ជំនួយ​" + +#~ msgid "Screen" +#~ msgstr "អេក្រង់​" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "រក្សាទុក​" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "ចាក់សោ" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "អ្នក​គ្រប់គ្រង​បង្អួច​" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "ម៉ូឌុល" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "អ្នក​គ្រប់គ្រង​បង្អួច​" + +#~ msgid "Appearance" +#~ msgstr "រូបរាង​" + +#~ msgid "WorkSpace" +#~ msgstr "តំបន់​ធ្វើការ" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "សមាសភាគ Mozilla " + +#~ msgid "Teddies" +#~ msgstr "Teddies" + +#~ msgid "Apps" +#~ msgstr "Apps" + +#~ msgid "Hamradio" +#~ msgstr "Hamradio" + +#~ msgid "Math" +#~ msgstr "គណិត​" + +#~ msgid "Technical" +#~ msgstr "បច្ចេកទេស​" + +#~ msgid "Tetris-like" +#~ msgstr "ដូច​ Tetris" + +#~ msgid "Root-window" +#~ msgstr "បង្អួច​ Root" + +#~ msgid "XShells" +#~ msgstr "សែល X" + +#~ msgid "Admin" +#~ msgstr "Admin" --- gnome-menus-2.28.0.1.orig/debian/po-up/ar.po +++ gnome-menus-2.28.0.1/debian/po-up/ar.po @@ -0,0 +1,268 @@ +# translation of menu_po.po to Arabic +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Ossama M. Khayat , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: menu_po\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2005-07-24 01:08+0300\n" +"Last-Translator: Ossama M. Khayat \n" +"Language-Team: Arabic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "التعليم" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "التعليم" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "المغامرة" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "المغامرة" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "آركاد" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "اللوح" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "اللوح" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "ورق" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "العلوم" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "المحاكاة" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "المحاكاة" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "الرياضة" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "الرياضة" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "الاستراتيجية" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "الاستراتيجية" + +#~ msgid "Editors" +#~ msgstr "المحررات" + +#~ msgid "Education" +#~ msgstr "التعليم" + +#~ msgid "Emulators" +#~ msgstr "المحاكيات" + +#~ msgid "Graphics" +#~ msgstr "الرسوم" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "الشبكة" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "التعليم" + +#~ msgid "Programming" +#~ msgstr "البرمجة" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "قواعد البيانات" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "العلوم" + +#~ msgid "Shells" +#~ msgstr "طرفيات" + +#~ msgid "Sound" +#~ msgstr "الصوتيات" + +#~ msgid "System" +#~ msgstr "النظام" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "المحاكيات" + +#~ msgid "Text" +#~ msgstr "النص" + +#~ msgid "Viewers" +#~ msgstr "المستعرضات" + +#~ msgid "Games" +#~ msgstr "الألعاب" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "أقفال" + +#~ msgid "Puzzles" +#~ msgstr "الأحجيات" + +#~ msgid "Tools" +#~ msgstr "أدوات" + +#~ msgid "Toys" +#~ msgstr "ألعاب" + +#~ msgid "Help" +#~ msgstr "مساعدة" + +#~ msgid "Screen" +#~ msgstr "شاشة" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "حافظة" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "أقفال" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "مدراء النوافذ" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "الوحدات" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "مدراء النوافذ" + +#~ msgid "Appearance" +#~ msgstr "المظهر" + +#~ msgid "WorkSpace" +#~ msgstr "مساحة العمل" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "محتويات موزيلا" + +#~ msgid "Teddies" +#~ msgstr "دمى" + +#~ msgid "Apps" +#~ msgstr "التطبيقات" + +#~ msgid "Hamradio" +#~ msgstr "راديو الهواة" + +#~ msgid "Math" +#~ msgstr "الرياضيات" + +#~ msgid "Technical" +#~ msgstr "تقني" + +#~ msgid "Tetris-like" +#~ msgstr "شبيهة بتترس" + +#~ msgid "Root-window" +#~ msgstr "نافذة جذرية" + +#~ msgid "XShells" +#~ msgstr "طرفيات X" + +#~ msgid "Admin" +#~ msgstr "الإدارة" --- gnome-menus-2.28.0.1.orig/debian/po-up/sq.po +++ gnome-menus-2.28.0.1/debian/po-up/sq.po @@ -0,0 +1,267 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-10-14 13:18+0200\n" +"Last-Translator: Elian Myftiu \n" +"Language-Team: Debian L10n Albanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Edukim" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Edukim" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Aventurë" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Aventurë" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Fushe" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Fushe" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Letra" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Shkencë" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulim" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulim" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sporte" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sporte" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategji" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategji" + +#~ msgid "Editors" +#~ msgstr "Editues" + +#~ msgid "Education" +#~ msgstr "Edukim" + +#~ msgid "Emulators" +#~ msgstr "Emulues" + +#~ msgid "Graphics" +#~ msgstr "Grafikë" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Rrjet" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Edukim" + +#~ msgid "Programming" +#~ msgstr "Programim" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Baza të dhënash" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Shkencë" + +#~ msgid "Shells" +#~ msgstr "Shells" + +#~ msgid "Sound" +#~ msgstr "Zë" + +#~ msgid "System" +#~ msgstr "Sistem" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulues" + +#~ msgid "Text" +#~ msgstr "Tekst" + +#~ msgid "Viewers" +#~ msgstr "Shikues" + +#~ msgid "Games" +#~ msgstr "Lojra" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Kyçje" + +#~ msgid "Puzzles" +#~ msgstr "Gjëza" + +#~ msgid "Tools" +#~ msgstr "Vegla" + +#~ msgid "Toys" +#~ msgstr "Lodra" + +#~ msgid "Help" +#~ msgstr "Ndihmë" + +#~ msgid "Screen" +#~ msgstr "Roje Ekrani" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Mbro" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Kyçje" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Organizues Dritaresh" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Module" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Organizues Dritaresh" + +#~ msgid "Appearance" +#~ msgstr "Pamje e Jashtme" + +#~ msgid "WorkSpace" +#~ msgstr "Hapësirë Pune" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Përbërës Mozilla" + +#~ msgid "Teddies" +#~ msgstr "Zbavitje" + +#~ msgid "Apps" +#~ msgstr "Programe" + +#~ msgid "Hamradio" +#~ msgstr "Hamradio" + +#~ msgid "Math" +#~ msgstr "Matematikë" + +#~ msgid "Technical" +#~ msgstr "Teknike" + +#~ msgid "Tetris-like" +#~ msgstr "Si-Tetris" + +#~ msgid "Root-window" +#~ msgstr "Dritarja-root" + +#~ msgid "XShells" +#~ msgstr "XShells" + +#~ msgid "Admin" +#~ msgstr "Administrues" --- gnome-menus-2.28.0.1.orig/debian/po-up/eu.po +++ gnome-menus-2.28.0.1/debian/po-up/eu.po @@ -0,0 +1,309 @@ +# translation of eu.po to Euskara +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# Piarres Beobide , 2005, 2007. +msgid "" +msgstr "" +"Project-Id-Version: eu\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-18 09:51+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Pootle 1.0.1\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Ekintza" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Ekintza jokoak" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Abentura" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Abentura moduko jokoak" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Arkade moduko jokoak" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Erortzen diren blokeak" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Blokeak erortzen diren jokoak" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Mahaigainekoak" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Mahaigaineko jokoak" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Karta jokoak" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Kartak" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Debian menua" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Haur jokoak" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Haurrak" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Logika" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Logika eta puzzle jokoak" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Rola" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Rol jokoak" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Zientzia" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +#, fuzzy +msgid "Scientific applications" +msgstr "Aplikazioak" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulazioa" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Simulazio jokoak" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Kirolak" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Kirol jokoak" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Estrategia" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Estrategia jokoak" + +#~ msgid "Accessibility" +#~ msgstr "Erabilerraztasuna" + +#~ msgid "Amateur Radio" +#~ msgstr "Irrati-amateurra" + +#~ msgid "Data Management" +#~ msgstr "Datu Kudeaketa" + +#~ msgid "Editors" +#~ msgstr "Editoreak" + +#~ msgid "Education" +#~ msgstr "Heziketa" + +#~ msgid "Emulators" +#~ msgstr "Emuladoreak" + +#~ msgid "File Management" +#~ msgstr "Fitxategi Kudeaketa" + +#~ msgid "Graphics" +#~ msgstr "Grafikoak" + +#~ msgid "Mobile Devices" +#~ msgstr "Gailu Mugikorrak" + +#~ msgid "Network" +#~ msgstr "Sarea" + +#~ msgid "Communication" +#~ msgstr "Komunikazioak" + +#~ msgid "File Transfer" +#~ msgstr "Fitxategi Transferentzia" + +#~ msgid "Monitoring" +#~ msgstr "Monitorizazioa" + +#~ msgid "Web Browsing" +#~ msgstr "Web Nabigatzea" + +#~ msgid "Web News" +#~ msgstr "Web Berriak" + +#~ msgid "Office" +#~ msgstr "Bulegoa" + +#~ msgid "Programming" +#~ msgstr "Programatzea" + +#~ msgid "Project Management" +#~ msgstr "Proiektu Kudeaketa" + +#~ msgid "Astronomy" +#~ msgstr "Astronomia" + +#~ msgid "Biology" +#~ msgstr "Biologia" + +#~ msgid "Chemistry" +#~ msgstr "Kimika" + +#~ msgid "Data Analysis" +#~ msgstr "Datu Analisia" + +#~ msgid "Electronics" +#~ msgstr "Elektronika" + +#~ msgid "Engineering" +#~ msgstr "Ingeniaritza" + +#~ msgid "Geoscience" +#~ msgstr "Geozientzia" + +#~ msgid "Mathematics" +#~ msgstr "Matematika" + +#~ msgid "Medicine" +#~ msgstr "Medizina" + +#~ msgid "Physics" +#~ msgstr "Fisika" + +#~ msgid "Social" +#~ msgstr "Soziala" + +#~ msgid "Shells" +#~ msgstr "Shell-ak" + +#~ msgid "Sound" +#~ msgstr "Soinua" + +#~ msgid "System" +#~ msgstr "Sistema" + +#~ msgid "Administration" +#~ msgstr "Administrazioa" + +#~ msgid "Hardware" +#~ msgstr "Hardwarea" + +#~ msgid "Language Environment" +#~ msgstr "Hizkuntz Ingurunea" + +#~ msgid "Package Management" +#~ msgstr "Pakete kudeaketa" + +#~ msgid "Security" +#~ msgstr "Segurtasuna" + +#~ msgid "Terminal Emulators" +#~ msgstr "Terminal Emulatzaileak" + +#~ msgid "Text" +#~ msgstr "Testua" + +#~ msgid "TV and Radio" +#~ msgstr "TV eta Irratia" + +#~ msgid "Viewers" +#~ msgstr "Ikustatzaileak" + +#~ msgid "Video" +#~ msgstr "Bideoa" + +#~ msgid "Web Development" +#~ msgstr "Web Garapena" + +#~ msgid "Games" +#~ msgstr "Jokoak" + +#~ msgid "Blocks" +#~ msgstr "Blokeak" + +#~ msgid "Puzzles" +#~ msgstr "Puzleak" + +#~ msgid "Tools" +#~ msgstr "Lanabesak" + +#~ msgid "Toys" +#~ msgstr "Jostailuak" + +#~ msgid "Help" +#~ msgstr "Laguntza" + +#~ msgid "Screen" +#~ msgstr "Pantaila" + +#~ msgid "Saving" +#~ msgstr "Gorde" + +#~ msgid "Locking" +#~ msgstr "Blokeatu" + +#~ msgid "Window Managers" +#~ msgstr "Leiho kudeatzaileak" + +#~ msgid "FVWM Modules" +#~ msgstr "FVWM Moduluak" + +#~ msgid "Window Maker" +#~ msgstr "Leiho Sortzailea" + +#~ msgid "Appearance" +#~ msgstr "Itxura" + +#~ msgid "WorkSpace" +#~ msgstr "LanekoArea" + +#~ msgid "Iceape Components" +#~ msgstr "Iceape Osagaiak" + +#~ msgid "Teddies" +#~ msgstr "Pelutxeak" --- gnome-menus-2.28.0.1.orig/debian/po-up/vi.po +++ gnome-menus-2.28.0.1/debian/po-up/vi.po @@ -0,0 +1,332 @@ +# Vietnamese Translation for GNOME Menus. +# Copyright © 2007 Free Software Foundation, Inc. +# Clytie Siddall , 2005-2007. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-menus 2.18.3-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-19 22:41+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \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-Generator: LocFactoryEditor 1.7b1\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Hành động" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Trò chơi hành động" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Phiêu lưu" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Trò chơi kiểu phiêu lưu" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Nhà điện tử" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Trò chơi kiểu nhà điện tử" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Khối rơi" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Trò chơi khối rơi" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Bảng" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Trò chơi bảng" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Trò chơi đánh bài" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Đánh bài" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Trình đơn Debian" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Trò chơi cho đứa trẻ" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Trẻ" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Lôgic" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Trò chơi lôgic và câu đố" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Chơi theo lượt" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Trò chơi theo lượt" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Khoa học" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +#, fuzzy +msgid "Scientific applications" +msgstr "Ứng dụng" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Mô phỏng" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Trò chơi mô phỏng" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Thể thao" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Trò chơi thể thao" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Chiến lược" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Trò chơi chiến lược" + +#~ msgid "Accessibility" +#~ msgstr "Truy cập" + +#~ msgid "Amateur Radio" +#~ msgstr "Rađiô nghiệp dư" + +#~ msgid "Data Management" +#~ msgstr "Quản lý dữ liệu" + +#~ msgid "Editors" +#~ msgstr "Biên soạn" + +#~ msgid "Education" +#~ msgstr "Giáo dục" + +#~ msgid "Emulators" +#~ msgstr "Mô phỏng" + +#~ msgid "File Management" +#~ msgstr "Quản lý tập tin" + +#~ msgid "Graphics" +#~ msgstr "Đồ hoạ" + +#~ msgid "Mobile Devices" +#~ msgstr "Thiết bị di động" + +#~ msgid "Network" +#~ msgstr "Mạng" + +#~ msgid "Communication" +#~ msgstr "Giao thông" + +#~ msgid "File Transfer" +#~ msgstr "Truyền tập tin" + +#~ msgid "Monitoring" +#~ msgstr "Theo dõi" + +#~ msgid "Web Browsing" +#~ msgstr "Duyệt Mạng" + +#~ msgid "Web News" +#~ msgstr "Tin tức Mạng" + +#~ msgid "Office" +#~ msgstr "Văn phòng" + +#~ msgid "Programming" +#~ msgstr "Lập trình" + +#~ msgid "Project Management" +#~ msgstr "Quản lý dự án" + +#~ msgid "Astronomy" +#~ msgstr "Thiên văn học" + +#~ msgid "Biology" +#~ msgstr "Sinh học" + +#~ msgid "Chemistry" +#~ msgstr "Hoá học" + +#~ msgid "Data Analysis" +#~ msgstr "Phân tích dữ liệu" + +#~ msgid "Electronics" +#~ msgstr "Điện tử học" + +#~ msgid "Engineering" +#~ msgstr "Kỹ thuật kỹ sư" + +#~ msgid "Geoscience" +#~ msgstr "Khoa địa học" + +#~ msgid "Mathematics" +#~ msgstr "Toán học" + +#~ msgid "Medicine" +#~ msgstr "Y khoa" + +#~ msgid "Physics" +#~ msgstr "Vật lý" + +#~ msgid "Social" +#~ msgstr "Xã hội" + +#~ msgid "Shells" +#~ msgstr "Trình bao" + +#~ msgid "Sound" +#~ msgstr "Âm thanh" + +#~ msgid "System" +#~ msgstr "Hệ thống" + +#~ msgid "Administration" +#~ msgstr "Quản trị" + +#~ msgid "Hardware" +#~ msgstr "Phần cứng" + +#~ msgid "Language Environment" +#~ msgstr "Môi trường ngôn ngữ" + +#~ msgid "Package Management" +#~ msgstr "Quản lý gói" + +#~ msgid "Security" +#~ msgstr "Bảo mật" + +#~ msgid "Terminal Emulators" +#~ msgstr "Mô phỏng thiết bị cuối" + +#~ msgid "Text" +#~ msgstr "Văn bản" + +#~ msgid "TV and Radio" +#~ msgstr "TV và Rađiô" + +#~ msgid "Viewers" +#~ msgstr "Bộ xem" + +#~ msgid "Video" +#~ msgstr "Ảnh động" + +#~ msgid "Web Development" +#~ msgstr "Phát triển WWW" + +#~ msgid "Games" +#~ msgstr "Trò chơi" + +#~ msgid "Blocks" +#~ msgstr "Khối" + +#~ msgid "Puzzles" +#~ msgstr "Câu đố" + +#~ msgid "Tools" +#~ msgstr "Công cụ" + +#~ msgid "Toys" +#~ msgstr "Đồ chơi" + +#~ msgid "Help" +#~ msgstr "Trợ giúp" + +#~ msgid "Screen" +#~ msgstr "Màn hình" + +#~ msgid "Saving" +#~ msgstr "Lưu" + +#~ msgid "Locking" +#~ msgstr "Khóa" + +#~ msgid "Window Managers" +#~ msgstr "Quản lý cửa sổ" + +#~ msgid "FVWM Modules" +#~ msgstr "Mô-đun FVWM" + +#~ msgid "Window Maker" +#~ msgstr "Tạo cửa sổ" + +#~ msgid "Appearance" +#~ msgstr "Diện mạo" + +#~ msgid "WorkSpace" +#~ msgstr "Vùng làm việc" + +#~ msgid "Iceape Components" +#~ msgstr "Thành phần Iceape" + +#~ msgid "Teddies" +#~ msgstr "Con gấu bông" + +#~ msgid "Apps" +#~ msgstr "Ứng dụng" + +#~ msgid "Hamradio" +#~ msgstr "Truyền thành tài tử" + +#~ msgid "Math" +#~ msgstr "Toán học" + +#~ msgid "Technical" +#~ msgstr "Kỹ thuật" + +#~ msgid "Tetris-like" +#~ msgstr "Khối thả" + +#~ msgid "Root-window" +#~ msgstr "Cửa sổ chủ" + +#~ msgid "XShells" +#~ msgstr "Ứng dụng X" + +#~ msgid "Admin" +#~ msgstr "Quản lý" --- gnome-menus-2.28.0.1.orig/debian/po-up/id.po +++ gnome-menus-2.28.0.1/debian/po-up/id.po @@ -0,0 +1,259 @@ +# Menu section translation to Bahasa Indonesia +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-19 17:19+0700\n" +"Last-Translator: Arief S Fitrianto \n" +"Language-Team: Debian Indonesian Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Aksi" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Permainan aksi" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Petualangan" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Permainan bertema petualangan" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Pertempuran" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Permainan bertema pertempuran" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Tetris" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Permainan tetris" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Di Atas Papan" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Permainan di atas papan" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Permainan kartu" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Kartu" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Menu Debian" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Permainan anak-anak" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Anak-anak" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Logika" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Permainan Logika dan teka-teki" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Bermain kekuasaan" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Permainan tentang kekuasaan" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "IPTEK" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulasi" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Permainan simulasi" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Olahraga" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Permainan olahraga" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Taktik dan Strategi" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Permainan taktik dan strategi" + +#~ msgid "Editors" +#~ msgstr "Editor" + +#~ msgid "Education" +#~ msgstr "Pendidikan" + +#~ msgid "Emulators" +#~ msgstr "Emulator" + +#~ msgid "Graphics" +#~ msgstr "Pengolah Gambar" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Jaringan" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Pendidikan" + +#~ msgid "Programming" +#~ msgstr "Pemrograman" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Basis Data" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "IPTEK" + +#~ msgid "Shells" +#~ msgstr "Shell" + +#~ msgid "Sound" +#~ msgstr "Suara" + +#~ msgid "System" +#~ msgstr "Sistem" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulator" + +#~ msgid "Text" +#~ msgstr "Teks" + +#~ msgid "Viewers" +#~ msgstr "Penampil Dokumen" + +#~ msgid "Games" +#~ msgstr "Permainan" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Kunci Layar" + +#~ msgid "Puzzles" +#~ msgstr "Teka-teki" + +#~ msgid "Tools" +#~ msgstr "Peralatan" + +#~ msgid "Toys" +#~ msgstr "Mainan" + +#~ msgid "Help" +#~ msgstr "Panduan" + +#~ msgid "Screen" +#~ msgstr "Pengunci Layar" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Simpan Keadaan Layar" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Kunci Layar" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Pengolah Window" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Modul" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Pengolah Window" + +#~ msgid "Appearance" +#~ msgstr "Bentuk Tampilan" + +#~ msgid "WorkSpace" +#~ msgstr "Ruang Kerja" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Komponen Mozilla" + +#~ msgid "Teddies" +#~ msgstr "Boneka" + +#~ msgid "Apps" +#~ msgstr "Aplikasi" + +#~ msgid "Hamradio" +#~ msgstr "Radio Amatir" + +#~ msgid "Math" +#~ msgstr "Matematika" + +#~ msgid "Technical" +#~ msgstr "Hal Teknis" + +#~ msgid "Tetris-like" +#~ msgstr "Aneka Tetris" + +#~ msgid "Root-window" +#~ msgstr "Window Utama" + +#~ msgid "XShells" +#~ msgstr "Shell X Window" + +#~ msgid "Admin" +#~ msgstr "Administrasi Sistem" --- gnome-menus-2.28.0.1.orig/debian/po-up/da.po +++ gnome-menus-2.28.0.1/debian/po-up/da.po @@ -0,0 +1,276 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +# Translators: +# April 2003 - Morten Brix Pedersen +# +# Note: Please send any inquiries on this file to the Debian Danish +# translation team (debian-l10n-danish@lists.debian.org) +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-01-12 22:24+0100\n" +"Last-Translator: Morten Brix Pedersen \n" +"Language-Team: debian-l10n-danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Uddannelse" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Uddannelse" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Eventyr" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Eventyr" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Brætspil" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Brætspil" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Kortspil" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Videnskab" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulering" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulering" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sport" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sport" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategi" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategi" + +#~ msgid "Editors" +#~ msgstr "Tekstredigering" + +#~ msgid "Education" +#~ msgstr "Uddannelse" + +#~ msgid "Emulators" +#~ msgstr "Emulatorer" + +#~ msgid "Graphics" +#~ msgstr "Grafik" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Netværk" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Uddannelse" + +#~ msgid "Programming" +#~ msgstr "Programmering" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Databaser" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Videnskab" + +#~ msgid "Shells" +#~ msgstr "Kommandoskaller" + +#~ msgid "Sound" +#~ msgstr "Lyd" + +#~ msgid "System" +#~ msgstr "System" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulatorer" + +#~ msgid "Text" +#~ msgstr "Tekst" + +#~ msgid "Viewers" +#~ msgstr "Fremvisere" + +#~ msgid "Games" +#~ msgstr "Spil" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Lås" + +#~ msgid "Puzzles" +#~ msgstr "Puslespil" + +#~ msgid "Tools" +#~ msgstr "Værktøjer" + +#~ msgid "Toys" +#~ msgstr "Legetøj" + +#~ msgid "Help" +#~ msgstr "Hjælp" + +#~ msgid "Screen" +#~ msgstr "Skærm" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Pauseskærm" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Lås" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Vindueshåndteringer" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Moduler" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Vindueshåndteringer" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Udseende" + +#~ msgid "WorkSpace" +#~ msgstr "Skrivebord" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla-dele" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Bamser" + +#~ msgid "Apps" +#~ msgstr "Programmer" + +#~ msgid "Hamradio" +#~ msgstr "Amatørradio" + +#~ msgid "Math" +#~ msgstr "Matematik" + +#~ msgid "Technical" +#~ msgstr "Teknisk" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris-lignende" + +#~ msgid "Root-window" +#~ msgstr "Rodvindue" + +#~ msgid "XShells" +#~ msgstr "X-terminaler" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Administration" --- gnome-menus-2.28.0.1.orig/debian/po-up/fr.po +++ gnome-menus-2.28.0.1/debian/po-up/fr.po @@ -0,0 +1,314 @@ +# This file is distributed under the same license as the gnome-menus package. +# +# Translations taken from the menu package +# (Bill Allombert , 2003.) +# +# French translation : +# Josselin Mouette , 2007 +# Jean-Philippe Guerard , 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.7-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2003-12-31 18:40:41+0100\n" +"Last-Translator: Jean-Philippe Guerard \n" +"Language-Team: Debian-l10n-French \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" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Action" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Jeux d'action" + +# +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Aventure" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Jeux d'aventure" + +# +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Jeux d'arcade" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Chute de blocs" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Jeux de blocs qui chutent" + +# +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Plateau" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Jeux de plateau" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Jeux de cartes" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Cartes" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Le menu Debian" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Jeux pour les enfants" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Enfants" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Réflexion" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Jeux de réflexion et de logique" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Jeux de rôle" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Jeux de rôle" + +# +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Sciences" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +# +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulation" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Jeux de simulation" + +# +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sports" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Simulations sportives" + +# +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Stratégie" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Jeux de stratégie" + +# +#~ msgid "Editors" +#~ msgstr "Éditeurs" + +# +#~ msgid "Education" +#~ msgstr "Apprentissage" + +# +#~ msgid "Emulators" +#~ msgstr "Émulateurs" + +# +#~ msgid "Graphics" +#~ msgstr "Image" + +# +#, fuzzy +#~ msgid "Network" +#~ msgstr "Réseau" + +# +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Apprentissage" + +# +#~ msgid "Programming" +#~ msgstr "Programmation" + +# +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Bases de données" + +# +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Sciences" + +# +#~ msgid "Shells" +#~ msgstr "Interpréteurs de commandes" + +# +#~ msgid "Sound" +#~ msgstr "Son" + +# +#~ msgid "System" +#~ msgstr "Outils système" + +# +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Émulateurs" + +# +#~ msgid "Text" +#~ msgstr "Outils texte" + +# +#~ msgid "Viewers" +#~ msgstr "Visionneurs" + +# +#~ msgid "Games" +#~ msgstr "Jeux" + +# +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Verrouillage" + +# +#~ msgid "Puzzles" +#~ msgstr "Réflexion" + +# +#~ msgid "Tools" +#~ msgstr "Petits outils" + +# +#~ msgid "Toys" +#~ msgstr "Jouets" + +# +#~ msgid "Help" +#~ msgstr "Documentation" + +# +#~ msgid "Screen" +#~ msgstr "Écran" + +# +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Veille" + +# +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Verrouillage" + +# +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Gestionnaires de fenêtres" + +# +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Modules" + +# +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Gestionnaires de fenêtres" + +# +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Apparence" + +# +#~ msgid "WorkSpace" +#~ msgstr "Espace de travail" + +# +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Composants Mozilla" + +# +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Peluches" + +# +#~ msgid "Apps" +#~ msgstr "Applications" + +# +# cf. http://www.ref-union.org/promotion/19.php +#~ msgid "Hamradio" +#~ msgstr "Radio amateur" + +# +#~ msgid "Math" +#~ msgstr "Mathématiques" + +# +#~ msgid "Technical" +#~ msgstr "Techniques" + +# +#~ msgid "Tetris-like" +#~ msgstr "Clones de Tetris" + +# +#~ msgid "Root-window" +#~ msgstr "Fonds d'écran" + +# +#~ msgid "XShells" +#~ msgstr "Terminaux graphiques" + +# +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Administration" --- gnome-menus-2.28.0.1.orig/debian/po-up/ro.po +++ gnome-menus-2.28.0.1/debian/po-up/ro.po @@ -0,0 +1,263 @@ +# translation of ro.po to Romanian +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# Sorin Batariuc , 2005. +# Eddy Petrișor , 2008. +msgid "" +msgstr "" +"Project-Id-Version: ro\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2008-07-09 23:51+0300\n" +"Last-Translator: Eddy Petrișor \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Acțiune" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Jocuri de acțiune" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Aventură" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Jocuri de aventură" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Jocuri de tip arcade" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Blocuri căzătoare" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Jocuri cu blocuri căzătoare" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Table" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Jocuri pe tablă" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Jocuri de cărți" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Cărți" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Meniul Debian" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Jocuri pentru copii" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Copii" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Logică" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Jocuri de logică și puzzle" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Roluri" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Jocuri de rol" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Știință" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulare" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Jocuri de tip simulator" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sporturi" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Jocuri sportive" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategie" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Jocuri de strategie" + +#~ msgid "Editors" +#~ msgstr "Editoare" + +#~ msgid "Education" +#~ msgstr "Educație" + +#~ msgid "Emulators" +#~ msgstr "Emulatoare" + +#~ msgid "Graphics" +#~ msgstr "Grafică" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Rețele" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Educație" + +#~ msgid "Programming" +#~ msgstr "Programare" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Baze de date" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Știință" + +#~ msgid "Shells" +#~ msgstr "Console" + +#~ msgid "Sound" +#~ msgstr "Sunet" + +#~ msgid "System" +#~ msgstr "Sistem" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulatoare" + +#~ msgid "Text" +#~ msgstr "Text" + +#~ msgid "Viewers" +#~ msgstr "Vizualizatoare" + +#~ msgid "Games" +#~ msgstr "Jocuri" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Blocare ecran" + +#~ msgid "Puzzles" +#~ msgstr "Perspicacitate" + +#~ msgid "Tools" +#~ msgstr "Unelte" + +#~ msgid "Toys" +#~ msgstr "Jucării" + +#~ msgid "Help" +#~ msgstr "Ajutor" + +#~ msgid "Screen" +#~ msgstr "Imagine ecran" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Protecție ecran" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Blocare ecran" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Administratori de ferestre" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Module" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Administratori de ferestre" + +#~ msgid "Appearance" +#~ msgstr "Aspect" + +#~ msgid "WorkSpace" +#~ msgstr "Spațiu de lucru" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Componente Mozilla" + +#~ msgid "Teddies" +#~ msgstr "Ursuleți" + +#~ msgid "Apps" +#~ msgstr "Aplicații" + +#~ msgid "Hamradio" +#~ msgstr "Radioamatori" + +#~ msgid "Math" +#~ msgstr "Matematică" + +#~ msgid "Technical" +#~ msgstr "Tehnică" + +#~ msgid "Tetris-like" +#~ msgstr "Gen tetris" + +#~ msgid "Root-window" +#~ msgstr "Fereastra de bază" + +#~ msgid "XShells" +#~ msgstr "Console din X" + +#~ msgid "Admin" +#~ msgstr "Administrare" --- gnome-menus-2.28.0.1.orig/debian/po-up/fi.po +++ gnome-menus-2.28.0.1/debian/po-up/fi.po @@ -0,0 +1,271 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Tommi Vainikainen, 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-10-12 09:01+0300\n" +"Last-Translator: Tommi Vainikainen \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Koulutus" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Koulutus" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Seikkailu" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Seikkailu" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Lauta" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Lauta" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Kortti" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Tiede" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulaatio" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulaatio" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Urheilu" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Urheilu" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategia" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategia" + +#~ msgid "Editors" +#~ msgstr "Editorit" + +#~ msgid "Education" +#~ msgstr "Koulutus" + +#~ msgid "Emulators" +#~ msgstr "Emulaattorit" + +#~ msgid "Graphics" +#~ msgstr "Grafiikka" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Verkko" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Koulutus" + +#~ msgid "Programming" +#~ msgstr "Ohjelmointi" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Tietokannat" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Tiede" + +#~ msgid "Shells" +#~ msgstr "Kuoret" + +#~ msgid "Sound" +#~ msgstr "Ääni" + +#~ msgid "System" +#~ msgstr "Järjestelmä" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulaattorit" + +#~ msgid "Text" +#~ msgstr "Teksti" + +#~ msgid "Viewers" +#~ msgstr "Katselimet" + +#~ msgid "Games" +#~ msgstr "Pelit" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Lukitse" + +#~ msgid "Puzzles" +#~ msgstr "Ongelma" + +#~ msgid "Tools" +#~ msgstr "Työkalut" + +#~ msgid "Toys" +#~ msgstr "Lelut" + +#~ msgid "Help" +#~ msgstr "Ohje" + +#~ msgid "Screen" +#~ msgstr "Näyttö" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Säästö" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Lukitse" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Ikkunointiohjelmat" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Moduulit" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Ikkunointiohjelmat" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Ulkoasu" + +#~ msgid "WorkSpace" +#~ msgstr "Työtila" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla-komponentit" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Nallekarhut" + +#~ msgid "Apps" +#~ msgstr "Sovellukset" + +#~ msgid "Hamradio" +#~ msgstr "Amatööriradio" + +#~ msgid "Math" +#~ msgstr "Matematiikka" + +#~ msgid "Technical" +#~ msgstr "Tekninen" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris-tyyliset" + +#~ msgid "Root-window" +#~ msgstr "Juuri-ikkuna" + +#~ msgid "XShells" +#~ msgstr "XKuoret" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Järjhal" --- gnome-menus-2.28.0.1.orig/debian/po-up/hu.po +++ gnome-menus-2.28.0.1/debian/po-up/hu.po @@ -0,0 +1,235 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-18 09:17+0100\n" +"Last-Translator: SZERVÁC Attila \n" +"Language-Team: Magyar Debian Nyelvi Csoport \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: HUNGARY\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Akció" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Akciójátékok" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Kaland" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Kaland stílusú játékok" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Akció" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Árkád stílusú játékok" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Kieső elem" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Kieső elem játékok" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Tábla" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Táblás játékok" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Kártyajátékok" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Kártya" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "A Debian menü" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Játékok kölköknek" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Kölök" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Logika" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Logikai és kirakós játékok" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Szerepjátszás" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Szerepjátszó játékok" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Tudomány" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Szimulátorok" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Szimulációs játékok" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sportok" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Sportjátékok" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Stratégia" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Stratégiai játékok" + +#~ msgid "Editors" +#~ msgstr "Szerkesztők" + +#~ msgid "Education" +#~ msgstr "Oktatás" + +#~ msgid "Emulators" +#~ msgstr "Emulátorok" + +#~ msgid "Graphics" +#~ msgstr "Grafika" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Hálózat" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Oktatás" + +#~ msgid "Programming" +#~ msgstr "Programozás" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Adatbázisok" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Tudomány" + +#~ msgid "Shells" +#~ msgstr "Héjak" + +#~ msgid "Sound" +#~ msgstr "Hang" + +#~ msgid "System" +#~ msgstr "Rendszer" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulátorok" + +#~ msgid "Text" +#~ msgstr "Szövegkezelők" + +#~ msgid "Viewers" +#~ msgstr "Nézegetők" + +#~ msgid "Games" +#~ msgstr "Játékok" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Zárol" + +#~ msgid "Puzzles" +#~ msgstr "Fejtörők" + +#~ msgid "Tools" +#~ msgstr "Eszközök" + +#~ msgid "Toys" +#~ msgstr "Apróságok" + +#~ msgid "Help" +#~ msgstr "Súgó" + +#~ msgid "Screen" +#~ msgstr "Képernyő" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Véd" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Zárol" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Ablakkezelők" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Modulok" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Ablakkezelők" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Megjelenés" + +#~ msgid "WorkSpace" +#~ msgstr "Munkaterület" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla összetevők" --- gnome-menus-2.28.0.1.orig/debian/po-up/zh_CN.po +++ gnome-menus-2.28.0.1/debian/po-up/zh_CN.po @@ -0,0 +1,128 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) Year Free Software Foundation, Inc. +# Yongtao Yang , 2004. +# LI Daobing , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-menus 2.18.3-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-24 00:50+0800\n" +"Last-Translator: LI Daobing \n" +"Language-Team: Debian Chinese [GB] \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "动作类" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "动作类游戏" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "冒险类" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "冒险类游戏" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "街机类" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "街机类游戏" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "方块类" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "方块类游戏" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "棋类" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "棋类游戏" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "牌类游戏" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "牌类" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Debian 菜单" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "儿童类游戏" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "儿童" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "逻辑" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "逻辑和智力类游戏" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "角色扮演" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "角色扮演类游戏" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "模拟类" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "模拟类游戏" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "体育类" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "体育类游戏" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "策略类" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "策略类游戏" --- gnome-menus-2.28.0.1.orig/debian/po-up/eo.po +++ gnome-menus-2.28.0.1/debian/po-up/eo.po @@ -0,0 +1,269 @@ +# Menu section translation +# Copyright (C) 2000-2003 +# Joost Witteveen +# Copyright 2005 MJ Ray +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2005-05-16 15:11 +0100\n" +"Last-Translator: MJ Ray \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Edukiloj" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Edukiloj" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Aventuro" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Aventuro" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkadaro" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Tabulo" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Tabulo" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Kartoj" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Scienco" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simuliloj" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simuliloj" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sporto" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sporto" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategio" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategio" + +#~ msgid "Editors" +#~ msgstr "Redaktiloj" + +#~ msgid "Education" +#~ msgstr "Edukiloj" + +#~ msgid "Emulators" +#~ msgstr "Ŝajnigiloj" + +#~ msgid "Graphics" +#~ msgstr "Grafikoj" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Reto" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Edukiloj" + +#~ msgid "Programming" +#~ msgstr "Programado" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Datumbazoj" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Scienco" + +#~ msgid "Shells" +#~ msgstr "Ŝeloj" + +#~ msgid "Sound" +#~ msgstr "Soniloj" + +#~ msgid "System" +#~ msgstr "Sistemo" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Ŝajnigiloj" + +#~ msgid "Text" +#~ msgstr "Teksto" + +#~ msgid "Viewers" +#~ msgstr "Montriloj" + +#~ msgid "Games" +#~ msgstr "Ludoj" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Ŝlosu" + +#~ msgid "Puzzles" +#~ msgstr "Enigmoj" + +#~ msgid "Tools" +#~ msgstr "Iloj" + +#~ msgid "Toys" +#~ msgstr "Ludetoj" + +#~ msgid "Help" +#~ msgstr "Helpo" + +#~ msgid "Screen" +#~ msgstr "Ekrano" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Ŝparu" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Ŝlosu" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Fenstroregiloj" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Moduloj" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Fenstroregiloj" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Aspekto" + +#~ msgid "WorkSpace" +#~ msgstr "Laborspaco" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozila Pecoj" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Ursetoj" + +# Automatically generated file. Do not edit (see /usr/share/doc/menu/html/index.html) +#~ msgid "Apps" +#~ msgstr "Aplikoj" + +#~ msgid "Hamradio" +#~ msgstr "Radiosendoj" + +#~ msgid "Math" +#~ msgstr "Matematiko" + +#~ msgid "Technical" +#~ msgstr "Teknikaĵo" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris-eca" + +#~ msgid "Root-window" +#~ msgstr "Radika Fenstro" + +#~ msgid "XShells" +#~ msgstr "Ŝelfenstroj" + +#~ msgid "Admin" +#~ msgstr "Administracio" --- gnome-menus-2.28.0.1.orig/debian/po-up/pl.po +++ gnome-menus-2.28.0.1/debian/po-up/pl.po @@ -0,0 +1,130 @@ +# Menu section translation +# Copyright (C) 2003, 2007 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Polish translation: +# Marcin Owsiany , 2003, 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-18 09:16+0100\n" +"Last-Translator: Marcin Owsiany \n" +"Language-Team: Polish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Akcji" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Gry akcji" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Przygodowe" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Gry przygodowe" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Zrcznociowe" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Gry zrcznociowe" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Spadajce klocki" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Gry ze spadajcymi klockami" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Planszowe" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Gry planszowe" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Gry karciane" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Karciane" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Menu Debiana" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Gry dla dzieci" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Dla dzieci" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Logiczne" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Gry logiczne i amigwki" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "RPG" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Gry RPG (fabularne)" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Symulatory" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Gry symulacyjne" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sportowe" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Gry sportowe" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategiczne" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Gry strategiczne" --- gnome-menus-2.28.0.1.orig/debian/po-up/tl.po +++ gnome-menus-2.28.0.1/debian/po-up/tl.po @@ -0,0 +1,266 @@ +# Menu section translation to Tagalog +# Copyright (C) 2005 Eric Pareja +# This file is distributed under the same license as the menu package. +# Original file, Bill Allombert , 2003. +# Translation by Eric Pareja , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-08-10 20:11+0800\n" +"Last-Translator: Eric Pareja \n" +"Language-Team: Tagalog \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Edukasyon" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Edukasyon" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Abentura" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Abentura" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Board" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Board" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Baraha" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Agham" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulasiyon" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulasiyon" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Palakasan" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Palakasan" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Stratehiya" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Stratehiya" + +#~ msgid "Editors" +#~ msgstr "Panulat" + +#~ msgid "Education" +#~ msgstr "Edukasyon" + +#~ msgid "Emulators" +#~ msgstr "Mga Emulator" + +#~ msgid "Graphics" +#~ msgstr "Grapiks" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Net" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Edukasyon" + +#~ msgid "Programming" +#~ msgstr "Pagprograma" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Database" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Agham" + +#~ msgid "Shells" +#~ msgstr "Mga Shell" + +#~ msgid "Sound" +#~ msgstr "Tunog" + +#~ msgid "System" +#~ msgstr "Sistema" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Mga Emulator" + +#~ msgid "Text" +#~ msgstr "Teksto" + +#~ msgid "Viewers" +#~ msgstr "Mga viewer" + +#~ msgid "Games" +#~ msgstr "Palaro" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Lock" + +#~ msgid "Puzzles" +#~ msgstr "Palaisipan" + +#~ msgid "Tools" +#~ msgstr "Kasangkapan" + +#~ msgid "Toys" +#~ msgstr "Mga Laruan" + +#~ msgid "Help" +#~ msgstr "Tulong" + +#~ msgid "Screen" +#~ msgstr "Tabing/Telon" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Magtipid" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Lock" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Tagapangasiwa ng Tanaw" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Mga module" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Tagapangasiwa ng Tanaw" + +#~ msgid "Appearance" +#~ msgstr "Hitsura" + +#~ msgid "WorkSpace" +#~ msgstr "WorkSpace" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Bahagi ng Mozilla" + +#~ msgid "Teddies" +#~ msgstr "Mga Teddy" + +#~ msgid "Apps" +#~ msgstr "Aplikasyon" + +#~ msgid "Hamradio" +#~ msgstr "Radyo" + +#~ msgid "Math" +#~ msgstr "Matematika" + +#~ msgid "Technical" +#~ msgstr "Teknikal" + +#~ msgid "Tetris-like" +#~ msgstr "Parang Tetris" + +#~ msgid "Root-window" +#~ msgstr "Pangunahing Tanaw" + +#~ msgid "XShells" +#~ msgstr "Mga XShell" + +#~ msgid "Admin" +#~ msgstr "Pangangasiwa" --- gnome-menus-2.28.0.1.orig/debian/po-up/nl.po +++ gnome-menus-2.28.0.1/debian/po-up/nl.po @@ -0,0 +1,270 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2003-12-17 17:43+0100\n" +"Last-Translator: Tim Dijkstra \n" +"Language-Team: Debian Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Onderwijs" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Onderwijs" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Avontuur" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Avontuur" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Speelhal" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Bord" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Bord" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Kaart" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Wetenschap" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulatie" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulatie" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sport" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sport" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategie" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategie" + +#~ msgid "Editors" +#~ msgstr "Tekstbewerkers" + +#~ msgid "Education" +#~ msgstr "Onderwijs" + +#~ msgid "Emulators" +#~ msgstr "Emulatoren" + +#~ msgid "Graphics" +#~ msgstr "Beeldbewerkers" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Netwerk" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Onderwijs" + +#~ msgid "Programming" +#~ msgstr "Programmeren" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Gegevensbanken" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Wetenschap" + +#~ msgid "Shells" +#~ msgstr "Shells" + +#~ msgid "Sound" +#~ msgstr "Geluid" + +#~ msgid "System" +#~ msgstr "Systeem" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulatoren" + +#~ msgid "Text" +#~ msgstr "Tekst" + +#~ msgid "Viewers" +#~ msgstr "Weergevers" + +#~ msgid "Games" +#~ msgstr "Spellen" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Vergrendelen" + +#~ msgid "Puzzles" +#~ msgstr "Puzzels" + +#~ msgid "Tools" +#~ msgstr "Hulpprogramma's" + +#~ msgid "Toys" +#~ msgstr "Speeltjes" + +#~ msgid "Help" +#~ msgstr "Help" + +#~ msgid "Screen" +#~ msgstr "Scherm" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Opslaan" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Vergrendelen" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Vensterbeheerders" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Modules" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Vensterbeheerders" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Uiterlijk" + +#~ msgid "WorkSpace" +#~ msgstr "Werkblad" + +# Fresuently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla-onderdelen" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Knuffels" + +#~ msgid "Apps" +#~ msgstr "Toepassingen" + +#~ msgid "Hamradio" +#~ msgstr "Amateurradio" + +#~ msgid "Math" +#~ msgstr "Wiskunde" + +#~ msgid "Technical" +#~ msgstr "Technisch" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris-achtig" + +#~ msgid "Root-window" +#~ msgstr "Hoofdvenster" + +#~ msgid "XShells" +#~ msgstr "X-Shells" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Beheer" --- gnome-menus-2.28.0.1.orig/debian/po-up/ne.po +++ gnome-menus-2.28.0.1/debian/po-up/ne.po @@ -0,0 +1,265 @@ +# translation of menu_po-sections.po to Nepali +# Shyam Krishna Bal , 2006. +# Shiva Pokharel , 2006. +msgid "" +msgstr "" +"Project-Id-Version: menu_po-sections\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2006-06-16 16:41+0545\n" +"Last-Translator: Shiva Pokharel \n" +"Language-Team: Nepali \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.10.2\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "शिक्षा" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "शिक्षा" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "साहस" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "साहस" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "मार्ग" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "पाटी" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "पाटी" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "कार्ड" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "विज्ञान" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "नक्कल" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "नक्कल" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "खेलहरू" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "खेलहरू" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "रणनीती" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "रणनीती" + +#~ msgid "Editors" +#~ msgstr "सम्पादकहरू" + +#~ msgid "Education" +#~ msgstr "शिक्षा" + +#~ msgid "Emulators" +#~ msgstr "इमुलेटरहरू" + +#~ msgid "Graphics" +#~ msgstr "ग्राफिक्स्" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "सञ्जाल" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "शिक्षा" + +#~ msgid "Programming" +#~ msgstr "प्रोग्रामिङ्" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "डेटाबेसहरू" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "विज्ञान" + +#~ msgid "Shells" +#~ msgstr "शेलहरू" + +#~ msgid "Sound" +#~ msgstr "ध्वनि" + +#~ msgid "System" +#~ msgstr "प्रणाली" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "इमुलेटरहरू" + +#~ msgid "Text" +#~ msgstr "पाठ" + +#~ msgid "Viewers" +#~ msgstr "दृश्यकर्ता" + +#~ msgid "Games" +#~ msgstr "खेलहरू" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "ताल्चा मार्नुहोस्" + +#~ msgid "Puzzles" +#~ msgstr "अल्मल्याउनु" + +#~ msgid "Tools" +#~ msgstr "उपकरणहरू" + +#~ msgid "Toys" +#~ msgstr "खेलौनाहरू" + +#~ msgid "Help" +#~ msgstr "मद्दत गर्नुहोस्" + +#~ msgid "Screen" +#~ msgstr "पर्दा" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "बचत गर्नुहोस्" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "ताल्चा मार्नुहोस्" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "सञ्झ्याल प्रबन्धकहरू" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "मोड्युलस" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "सञ्झ्याल प्रबन्धकहरू" + +#~ msgid "Appearance" +#~ msgstr "देखावट" + +#~ msgid "WorkSpace" +#~ msgstr "वर्क खाली ठाऊँ" + +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "मोजिल्ला अभयवहरू" + +#~ msgid "Teddies" +#~ msgstr "टेड्डिज" + +#~ msgid "Apps" +#~ msgstr "अनुप्रयोगहरू" + +#~ msgid "Hamradio" +#~ msgstr "हमरेडियो" + +#~ msgid "Math" +#~ msgstr "गणित" + +#~ msgid "Technical" +#~ msgstr "प्राविधिक" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris-जस्तो" + +#~ msgid "Root-window" +#~ msgstr "मूल सञ्झ्याल" + +#~ msgid "XShells" +#~ msgstr "X शेलहरू" + +#~ msgid "Admin" +#~ msgstr "प्रशासन" --- gnome-menus-2.28.0.1.orig/debian/po-up/sv.po +++ gnome-menus-2.28.0.1/debian/po-up/sv.po @@ -0,0 +1,128 @@ +# Swedish translation for gnome-menus. +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-menus package. +# Daniel Nylander , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-menus\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-20 13:50+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Action" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Actionspel" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Äventyr" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Äventyrsspel" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkad" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Arkadliknande spel" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Fallande block" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Fallande blockspel" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Brädspel" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Brädspel" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Kortspel" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Kort" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Debian-menyn" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Spel för barn" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Barn" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Logik" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Logik- och pusselspel" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Rollspel" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Rollspel" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulering" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Simuleringsspel" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sport" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Sportspel" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategi" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Strategispel" --- gnome-menus-2.28.0.1.orig/debian/po-up/ta.po +++ gnome-menus-2.28.0.1/debian/po-up/ta.po @@ -0,0 +1,132 @@ +# translation of gnome-menu.po to TAMIL +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# drtvasudevan , 2006. +# Dr.T.Vasudevan , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-menu\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-18 10:32+0530\n" +"Last-Translator: Dr.T.Vasudevan \n" +"Language-Team: TAMIL \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "செயல்" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "விளையாட்டு செயல்கள்" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "துணிகரப் பயணம்" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "துணிகரப் பயண விளையாட்டுக்கள்" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "வில் வளைவு சாலை" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "வில் வளைவு சாலை பாணி விளையாடுக்கள்" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "விழும் துண்டுகள்" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "விழும் துண்டுகள் விளையாட்டு" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "பலகை" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "பலகை விளையாட்டுக்கள்" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "சீட்டு விளையாட்டுக்கள்" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "சீட்டுகள்" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "டெபியன்" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "டெபியன் பட்டி" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "சிறுவர்களுக்கான விளையாட்டுக்கள்" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "சிறுவர்கள்" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "தருக்கம்" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "தருக்க புதிர் விளையாட்டுக்கள்" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "வேடம் தரித்தல்" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "வேடம் தரிக்கும் விளையாட்டுக்கள்" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "பாவனை" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "பாவனை விளையாட்டுக்கள்" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "கேளிக்கை" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "கேளிக்கை விளையாட்டுக்கள்" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "போர் தந்திரம்" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "போர் தந்திர விளையாட்டுக்கள்" --- gnome-menus-2.28.0.1.orig/debian/po-up/pt.po +++ gnome-menus-2.28.0.1/debian/po-up/pt.po @@ -0,0 +1,263 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Miguel Figueiredo , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-25 22:06+0100\n" +"Last-Translator: Miguel Figueiredo \n" +"Language-Team: portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Acção" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Jogos de acção" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Aventura" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Jogos do estilo aventura" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Jogos do estilo arcade" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Blocos" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Jogos com blocos" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Tabuleiro" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Jogos de tabuleiro" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Jogos de cartas" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Cartas" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "O Menu Debian" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Jogos para crianças" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Crianças" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Lógica" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Jogos de lógica e puzzles" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "RPG" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Jogos RPG" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Ciência" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulação" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Jogos de simulação" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Desporto" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Jogos de desporto" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Estratégia" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Jogos de estratégia" + +#~ msgid "Editors" +#~ msgstr "Editores" + +#~ msgid "Education" +#~ msgstr "Educacional" + +#~ msgid "Emulators" +#~ msgstr "Emuladores" + +#~ msgid "Graphics" +#~ msgstr "Gráficos" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Rede" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Educacional" + +#~ msgid "Programming" +#~ msgstr "Programação" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Bases de Dados" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Ciência" + +#~ msgid "Shells" +#~ msgstr "Shells" + +#~ msgid "Sound" +#~ msgstr "Som" + +#~ msgid "System" +#~ msgstr "Sistema" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emuladores" + +#~ msgid "Text" +#~ msgstr "Texto" + +#~ msgid "Viewers" +#~ msgstr "Visualizadores" + +#~ msgid "Games" +#~ msgstr "Jogos" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Bloquear" + +#~ msgid "Puzzles" +#~ msgstr "Quebra Cabeças" + +#~ msgid "Tools" +#~ msgstr "Ferramentas" + +#~ msgid "Toys" +#~ msgstr "Brinquedos" + +#~ msgid "Help" +#~ msgstr "Ajuda" + +#~ msgid "Screen" +#~ msgstr "Tela" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Proteger" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Bloquear" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Gestores de Janelas" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Módulos" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Gestores de Janelas" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Aspecto" + +#~ msgid "WorkSpace" +#~ msgstr "Espaço de Trabalho" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Componentes Mozilla" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Ursinhos de Peluche" + +#~ msgid "Apps" +#~ msgstr "Aplicações" + +#~ msgid "Hamradio" +#~ msgstr "Rádio Amador" + +#~ msgid "Math" +#~ msgstr "Matemática" + +#~ msgid "Technical" +#~ msgstr "Técnico" + +#~ msgid "Tetris-like" +#~ msgstr "Estilo Tetris" + +#~ msgid "Root-window" +#~ msgstr "Janela Raiz" + +#~ msgid "XShells" +#~ msgstr "Shells Gráficos" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Administração" --- gnome-menus-2.28.0.1.orig/debian/po-up/nb.po +++ gnome-menus-2.28.0.1/debian/po-up/nb.po @@ -0,0 +1,272 @@ +# translation of menu-sections.po to Norwegian Bokmål +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Hans Fredrik Nordhaug , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-sections\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2005-03-04 15:04+0100\n" +"Last-Translator: Hans Fredrik Nordhaug \n" +"Language-Team: Norwegian Bokmål \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" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Læring" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Læring" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Eventyr" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Eventyr" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Brett" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Brett" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Kort" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Vitenskap" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulering" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulering" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sport" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sport" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategi" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategi" + +#~ msgid "Editors" +#~ msgstr "Skriveprogram" + +#~ msgid "Education" +#~ msgstr "Læring" + +#~ msgid "Emulators" +#~ msgstr "Emulatorer" + +#~ msgid "Graphics" +#~ msgstr "Grafikk" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Nett" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Læring" + +#~ msgid "Programming" +#~ msgstr "Programmering" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Databaser" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Vitenskap" + +#~ msgid "Shells" +#~ msgstr "Skall" + +#~ msgid "Sound" +#~ msgstr "Lyd" + +#~ msgid "System" +#~ msgstr "System" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulatorer" + +#~ msgid "Text" +#~ msgstr "Tekst" + +#~ msgid "Viewers" +#~ msgstr "Framvisere" + +#~ msgid "Games" +#~ msgstr "Spill" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Lås" + +#~ msgid "Puzzles" +#~ msgstr "Puslespill" + +#~ msgid "Tools" +#~ msgstr "Verktøy" + +#~ msgid "Toys" +#~ msgstr "Leker" + +#~ msgid "Help" +#~ msgstr "Hjelp" + +#~ msgid "Screen" +#~ msgstr "Skjerm" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Spar" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Lås" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Vindusbehandlere" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Moduler" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Vindusbehandlere" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Utseende" + +#~ msgid "WorkSpace" +#~ msgstr "Arbeidsområde" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla-komponenter" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Teddybjørner" + +#~ msgid "Apps" +#~ msgstr "Program" + +#~ msgid "Hamradio" +#~ msgstr "Hamradio" + +#~ msgid "Math" +#~ msgstr "Matte" + +#~ msgid "Technical" +#~ msgstr "Teknisk" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris-lignende" + +#~ msgid "Root-window" +#~ msgstr "Rot-vindu" + +#~ msgid "XShells" +#~ msgstr "XSkall" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Admin" --- gnome-menus-2.28.0.1.orig/debian/po-up/wo.po +++ gnome-menus-2.28.0.1/debian/po-up/wo.po @@ -0,0 +1,131 @@ +# translation of wo.po to Wolof +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# Bill Allombert , 2003. +# Mouhamadou Mamoune Mbacke , 2006, 2007. +msgid "" +msgstr "" +"Project-Id-Version: wo\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-19 00:09+0200\n" +"Last-Translator: Mouhamadou Mamoune Mbacke \n" +"Language-Team: Wolof\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Aksioŋ" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Fo yu aksioŋ" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Awantiir" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Fo yu ame esli u Awantiir" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkaad" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Fo yu ame estil u arkaad" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Blok yuy daanu" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Fo yu blok yuy daanu" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Taabal" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Fo yu taabal" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Fo yu kaart" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Ay kaart" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Menu bu Debian" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Fo yuy gone" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Gone" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Logik" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Fo yu logik ak yu puzzle" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Def ay rol" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Fo yu def ay rol" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulaasioŋ" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Fo yu simulaasioŋ" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Espoor" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Fo yu espoor" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Estraateji" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Fo yu estraateji" --- gnome-menus-2.28.0.1.orig/debian/po-up/lt.po +++ gnome-menus-2.28.0.1/debian/po-up/lt.po @@ -0,0 +1,129 @@ +# Lithuanian translation of gnome-menus. +# Copyright (C) 2007 Linas Žvirblis +# This file is distributed under the same license as the gnome-menus package. +# Linas Žvirblis <0x0007@gmail.com>, 2007. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-menus VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-26 23:52+0300\n" +"Last-Translator: Linas Žvirblis <0x0007@gmail.com>\n" +"Language-Team: Lithuanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Veiksmo" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Veiksmo žaidimai" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Nuotykių" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Nuotykių žaidimai" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkadiniai" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Arkadiniai žaidimai" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Krentančių blokų" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Krentančių blokų žaidimai" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Stalo" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Stalo žaidimai" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Kortų žaidimai" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Kortų" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Debian meniu" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Žaidimai vaikams" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Vaikams" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Loginiai" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Loginiai ir galvosūkių žaidimai" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Vaidmenų" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Vaidmenų žaidimai" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simuliatoriai" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Simuliatoriai" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sporto" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Sporto žaidimai" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strateginiai" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Strateginiai žaidimai" --- gnome-menus-2.28.0.1.orig/debian/po-up/mr.po +++ gnome-menus-2.28.0.1/debian/po-up/mr.po @@ -0,0 +1,247 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-20 09:02+0530\n" +"Last-Translator: Priti Patil \n" +"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"First-Translator: Sampada Nakhare \n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "कृती" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "कृतीशील खेळ" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "साहस" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "साहसी पद्धतीचे खेळ" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "आर्केड" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "आर्केड पद्धतीचे खेळ" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "पडणारे ठोकळे" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "पडणारे ठोकळे असलेले खेळ" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "पट" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "पटावरील खेळ" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "पत्त्यांचे खेळ" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "पत्ते" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "डेबियन" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "डेबियन मेनू" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "मुलांकरिता खेळ" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "मुले" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "तार्किक" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "तार्किक व कोड्यांचे खेळ" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "भुमिका वठवणे" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "भुमिका वठवण्याचे खेळ" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "विज्ञान" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "आभास" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "आभासी खेळ" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "क्रीडा" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "क्रीडांगण खेळ" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "धोरण" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "धोरणात्मक खेळ" + +#~ msgid "Editors" +#~ msgstr "संपादक" + +#~ msgid "Education" +#~ msgstr "शिक्षण" + +#~ msgid "Emulators" +#~ msgstr "अनुकरणक" + +#~ msgid "Graphics" +#~ msgstr "चित्रणे" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "जाल" + +#~ msgid "Communication" +#~ msgstr "संदेशवहन" + +#~ msgid "Programming" +#~ msgstr "आज्ञावल्या" + +#~ msgid "Data Analysis" +#~ msgstr "डेटा पृथक्करण" + +#~ msgid "Geoscience" +#~ msgstr "भूविज्ञान" + +#~ msgid "Shells" +#~ msgstr "शेलस्" + +#~ msgid "Sound" +#~ msgstr "ध्वनि" + +#~ msgid "System" +#~ msgstr "प्रणाली" + +#~ msgid "Terminal Emulators" +#~ msgstr "टर्मिनल अनुकरणक" + +#~ msgid "Text" +#~ msgstr "मजकूर" + +#~ msgid "Viewers" +#~ msgstr "दर्शक" + +#~ msgid "Games" +#~ msgstr "खेळ" + +#~ msgid "Blocks" +#~ msgstr "ठोकळे" + +#~ msgid "Puzzles" +#~ msgstr "कोडी" + +#~ msgid "Tools" +#~ msgstr "टूलस्" + +#~ msgid "Toys" +#~ msgstr "खेळणी" + +#~ msgid "Help" +#~ msgstr "मदत" + +#~ msgid "Screen" +#~ msgstr "स्क्रीन" + +#~ msgid "Saving" +#~ msgstr "संचयित" + +#~ msgid "Locking" +#~ msgstr "टाळेबंद" + +#~ msgid "Window Managers" +#~ msgstr "दृश्यचौकट व्यवस्थापक" + +#~ msgid "FVWM Modules" +#~ msgstr "एफव्हीडब्ल्यूएम माॅड्युलस्" + +#~ msgid "Window Maker" +#~ msgstr "दृश्यचौकट निर्माता" + +#~ msgid "Appearance" +#~ msgstr "दॄष्यरूप" + +#~ msgid "WorkSpace" +#~ msgstr "कार्यजागा" + +#~ msgid "Iceape Components" +#~ msgstr "आइसएप भाग " + +#~ msgid "Teddies" +#~ msgstr "टेडीज्" + +#~ msgid "Apps" +#~ msgstr "अॅपस्" + +#~ msgid "Hamradio" +#~ msgstr "हॅमरेडिओ" + +#~ msgid "Math" +#~ msgstr "गणित" + +#~ msgid "Technical" +#~ msgstr "तांत्रिक" + +#~ msgid "Tetris-like" +#~ msgstr "टेट्रिस-सारखे" + +#~ msgid "Root-window" +#~ msgstr "मूल-दृश्यचौकट" + +#~ msgid "XShells" +#~ msgstr "एक्सशेलस्" + +#~ msgid "Admin" +#~ msgstr "व्यवस्था" --- gnome-menus-2.28.0.1.orig/debian/po-up/de.po +++ gnome-menus-2.28.0.1/debian/po-up/de.po @@ -0,0 +1,253 @@ +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the gnome-menus package. +# Bill Allombert , 2003. +# German translation: +# Sebastian Rittau , 2003, 2004. +# Helge Kreutzmann , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section 2.18.3-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2007-07-24 21:26+0200\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "Action" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "Action-Spiele" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Abenteuer" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "Abenteuer-artige Spiele" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arcade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "Arcade-artige Spiele" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "Fallende Blcke" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "Spiele mit fallenden Blcken" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Brett" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "Brettspiele" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "Kartenspiele" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "Karten" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "Debian" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "Das Debian-Men" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "Spiele fr Kinder" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "Kinder" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "Logik" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "Logik- und Puzzle-Spiele" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "Rollenspiele" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "Rollenspiele" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Wissenschaft" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulation" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "Simulationsspiele" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sport" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "Sportspiele" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategie" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "Strategiespiele" + +#~ msgid "Editors" +#~ msgstr "Editoren" + +#~ msgid "Education" +#~ msgstr "Bildung" + +#~ msgid "Emulators" +#~ msgstr "Emulatoren" + +#~ msgid "Graphics" +#~ msgstr "Grafik" + +#~ msgid "Network" +#~ msgstr "Netz" + +#~ msgid "Communication" +#~ msgstr "Kommunikation" + +#~ msgid "Programming" +#~ msgstr "Programmierung" + +#~ msgid "Data Analysis" +#~ msgstr "Datenanalyse" + +#~ msgid "Geoscience" +#~ msgstr "Geowissenschaft" + +#~ msgid "Shells" +#~ msgstr "Shells" + +#~ msgid "Sound" +#~ msgstr "Musik" + +#~ msgid "System" +#~ msgstr "System" + +#~ msgid "Terminal Emulators" +#~ msgstr "Terminal-Emulatoren" + +#~ msgid "Text" +#~ msgstr "Text" + +#~ msgid "Viewers" +#~ msgstr "Betrachter" + +#~ msgid "Games" +#~ msgstr "Spiele" + +#~ msgid "Blocks" +#~ msgstr "Blcke" + +#~ msgid "Puzzles" +#~ msgstr "Rtsel" + +#~ msgid "Tools" +#~ msgstr "Werkzeuge" + +#~ msgid "Toys" +#~ msgstr "Spielzeuge" + +#~ msgid "Help" +#~ msgstr "Hilfe" + +#~ msgid "Screen" +#~ msgstr "Bildschirm" + +#~ msgid "Saving" +#~ msgstr "Schonen" + +#~ msgid "Locking" +#~ msgstr "Sperren" + +#~ msgid "Window Managers" +#~ msgstr "Fenstermanager" + +#~ msgid "FVWM Modules" +#~ msgstr "FVWM-Module" + +#~ msgid "Window Maker" +#~ msgstr "Window Maker" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Erscheinungsbild" + +#~ msgid "WorkSpace" +#~ msgstr "Arbeitsplatz" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#~ msgid "Iceape Components" +#~ msgstr "Iceape-Komponenten" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Teddys" + +#~ msgid "Apps" +#~ msgstr "Anwendungen" + +#~ msgid "Hamradio" +#~ msgstr "Amateurfunk" + +#~ msgid "Math" +#~ msgstr "Mathematik" + +#~ msgid "Technical" +#~ msgstr "Technik" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris-artig" + +#~ msgid "Root-window" +#~ msgstr "Root-Fenster" + +#~ msgid "XShells" +#~ msgstr "X-Shells" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Administration" --- gnome-menus-2.28.0.1.orig/debian/po-up/hr.po +++ gnome-menus-2.28.0.1/debian/po-up/hr.po @@ -0,0 +1,267 @@ +# Prijevod Debian izabirnika na hrvatski jezik +# +msgid "" +msgstr "" +"Project-Id-Version: menu-section HR 2.1.9-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-08-21 16:01+0200\n" +"Last-Translator: Krunoslav Gernhard \n" +"Language-Team: Croatian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Obrazovanje" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Obrazovanje" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Avanture" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Avanture" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Na ploi" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Na ploi" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Karte" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Znanost" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulacije" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulacije" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sportske" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sportske" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategije" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategije" + +#~ msgid "Editors" +#~ msgstr "Ureivai" + +#~ msgid "Education" +#~ msgstr "Obrazovanje" + +#~ msgid "Emulators" +#~ msgstr "Oponaatelji" + +#~ msgid "Graphics" +#~ msgstr "Grafika" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Mrea" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Obrazovanje" + +#~ msgid "Programming" +#~ msgstr "Programiranje" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Baze podataka" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Znanost" + +#~ msgid "Shells" +#~ msgstr "koljke" + +#~ msgid "Sound" +#~ msgstr "Zvuk" + +#~ msgid "System" +#~ msgstr "Sustav" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Oponaatelji" + +#~ msgid "Text" +#~ msgstr "Tekst" + +#~ msgid "Viewers" +#~ msgstr "Poglednici" + +#~ msgid "Games" +#~ msgstr "Igre" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Zakljuaj" + +#~ msgid "Puzzles" +#~ msgstr "Zagonetke" + +#~ msgid "Tools" +#~ msgstr "Alati" + +#~ msgid "Toys" +#~ msgstr "Igrake" + +#~ msgid "Help" +#~ msgstr "Pomo" + +#~ msgid "Screen" +#~ msgstr "Zaslon" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Spremi" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Zakljuaj" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Upravljai prozorima" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Moduli" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Upravljai prozorima" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Izgled" + +#~ msgid "WorkSpace" +#~ msgstr "Radni prostor" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Dijelovi Mozille" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Medvjedii" + +#~ msgid "Apps" +#~ msgstr "Programi" + +#~ msgid "Hamradio" +#~ msgstr "Hamradio" + +#~ msgid "Math" +#~ msgstr "Matematika" + +#~ msgid "Technical" +#~ msgstr "Tehniki" + +#~ msgid "Tetris-like" +#~ msgstr "Kao Tetris" + +#~ msgid "Root-window" +#~ msgstr "Korijenski prozor" + +#~ msgid "XShells" +#~ msgstr "X-koljke" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Upravljanje" --- gnome-menus-2.28.0.1.orig/debian/po-up/nn.po +++ gnome-menus-2.28.0.1/debian/po-up/nn.po @@ -0,0 +1,274 @@ +# translation of menu-sections.po to Norwegian Nynorsk +# Menu section translation +# Copyright (C) 2003 +# This file is distributed under the same license as the menu package. +# Bill Allombert , 2003. +# Håvard Korsvoll , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: menu-sections\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: 2004-03-17 18:35+0100\n" +"Last-Translator: Håvard Korsvoll \n" +"Language-Team: Norwegian Nynorsk \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +#, fuzzy +msgid "Action" +msgstr "Læring" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +#, fuzzy +msgid "Action games" +msgstr "Læring" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "Eventyr" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +#, fuzzy +msgid "Adventure style games" +msgstr "Eventyr" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "Arkade" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "Brett" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +#, fuzzy +msgid "Board games" +msgstr "Brett" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +#, fuzzy +msgid "Cards" +msgstr "Kort" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "Vitskap" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "Simulering" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +#, fuzzy +msgid "Simulation games" +msgstr "Simulering" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "Sport" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +#, fuzzy +msgid "Sports games" +msgstr "Sport" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "Strategi" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +#, fuzzy +msgid "Strategy games" +msgstr "Strategi" + +#~ msgid "Editors" +#~ msgstr "Skriveprogram" + +#~ msgid "Education" +#~ msgstr "Læring" + +#~ msgid "Emulators" +#~ msgstr "Emulatorar" + +#~ msgid "Graphics" +#~ msgstr "Grafikk" + +#, fuzzy +#~ msgid "Network" +#~ msgstr "Nett" + +#, fuzzy +#~ msgid "Communication" +#~ msgstr "Læring" + +#~ msgid "Programming" +#~ msgstr "Programmering" + +#, fuzzy +#~ msgid "Data Analysis" +#~ msgstr "Databasar" + +#, fuzzy +#~ msgid "Geoscience" +#~ msgstr "Vitskap" + +#~ msgid "Shells" +#~ msgstr "Skal" + +#~ msgid "Sound" +#~ msgstr "Lyd" + +#~ msgid "System" +#~ msgstr "System" + +#, fuzzy +#~ msgid "Terminal Emulators" +#~ msgstr "Emulatorar" + +#~ msgid "Text" +#~ msgstr "Tekst" + +#~ msgid "Viewers" +#~ msgstr "Framvisarar" + +#~ msgid "Games" +#~ msgstr "Spel" + +#, fuzzy +#~ msgid "Blocks" +#~ msgstr "Lås" + +#~ msgid "Puzzles" +#~ msgstr "Puslespel" + +#~ msgid "Tools" +#~ msgstr "Verktøy" + +#~ msgid "Toys" +#~ msgstr "Leikar" + +#~ msgid "Help" +#~ msgstr "Hjelp" + +#~ msgid "Screen" +#~ msgstr "Skjerm" + +#, fuzzy +#~ msgid "Saving" +#~ msgstr "Lagra" + +#, fuzzy +#~ msgid "Locking" +#~ msgstr "Lås" + +#, fuzzy +#~ msgid "Window Managers" +#~ msgstr "Vindaugshandterarar" + +#, fuzzy +#~ msgid "FVWM Modules" +#~ msgstr "Modular" + +#, fuzzy +#~ msgid "Window Maker" +#~ msgstr "Vindaugshandterarar" + +# Non official sections from WindowMaker +#~ msgid "Appearance" +#~ msgstr "Utsjånad" + +#~ msgid "WorkSpace" +#~ msgstr "Arbeidsområde" + +# Frequently used unofficial sections. +# From Apps/Net/Mozilla Components +#, fuzzy +#~ msgid "Iceape Components" +#~ msgstr "Mozilla-komponentar" + +# From Games/Toys/Teddies +#~ msgid "Teddies" +#~ msgstr "Teddybjørnar" + +#~ msgid "Apps" +#~ msgstr "Program" + +#~ msgid "Hamradio" +#~ msgstr "Hamradio" + +#~ msgid "Math" +#~ msgstr "Matte" + +#~ msgid "Technical" +#~ msgstr "Teknisk" + +#~ msgid "Tetris-like" +#~ msgstr "Tetris-liknande" + +#~ msgid "Root-window" +#~ msgstr "Rot-vindauge" + +#~ msgid "XShells" +#~ msgstr "XSkal" + +# From Apps/System/Admin +#~ msgid "Admin" +#~ msgstr "Admin" --- gnome-menus-2.28.0.1.orig/debian/po-up/debian.pot +++ gnome-menus-2.28.0.1/debian/po-up/debian.pot @@ -0,0 +1,129 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-15 12:15+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:1 +msgid "Action" +msgstr "" + +#: ../../debian/desktop-files/ActionGames.directory.in.h:2 +msgid "Action games" +msgstr "" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:1 +msgid "Adventure" +msgstr "" + +#: ../../debian/desktop-files/AdventureGames.directory.in.h:2 +msgid "Adventure style games" +msgstr "" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1 +msgid "Arcade" +msgstr "" + +#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2 +msgid "Arcade style games" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:1 +msgid "Falling blocks" +msgstr "" + +#: ../../debian/desktop-files/BlocksGames.directory.in.h:2 +msgid "Falling blocks games" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:1 +msgid "Board" +msgstr "" + +#: ../../debian/desktop-files/BoardGames.directory.in.h:2 +msgid "Board games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:1 +msgid "Card games" +msgstr "" + +#: ../../debian/desktop-files/CardGames.directory.in.h:2 +msgid "Cards" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:1 +msgid "Debian" +msgstr "" + +#: ../../debian/desktop-files/Debian.directory.in.h:2 +msgid "The Debian menu" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:1 +msgid "Games for kids" +msgstr "" + +#: ../../debian/desktop-files/KidsGames.directory.in.h:2 +msgid "Kids" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:1 +msgid "Logic" +msgstr "" + +#: ../../debian/desktop-files/LogicGames.directory.in.h:2 +msgid "Logic and puzzle games" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1 +msgid "Role playing" +msgstr "" + +#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2 +msgid "Role playing games" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:1 +msgid "Science" +msgstr "" + +#: ../../debian/desktop-files/GnomeScience.directory.in.h:2 +msgid "Scientific applications" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:1 +msgid "Simulation" +msgstr "" + +#: ../../debian/desktop-files/SimulationGames.directory.in.h:2 +msgid "Simulation games" +msgstr "" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:1 +msgid "Sports" +msgstr "" + +#: ../../debian/desktop-files/SportsGames.directory.in.h:2 +msgid "Sports games" +msgstr "" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:1 +msgid "Strategy" +msgstr "" + +#: ../../debian/desktop-files/StrategyGames.directory.in.h:2 +msgid "Strategy games" +msgstr "" --- gnome-menus-2.28.0.1.orig/debian/desktop-files/GnomeScience.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/GnomeScience.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Science +_Comment=Scientific applications +Icon=applications-science +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/AdventureGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/AdventureGames.directory.in @@ -0,0 +1,4 @@ +[Desktop Entry] +_Name=Adventure +_Comment=Adventure style games +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/BlocksGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/BlocksGames.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Falling blocks +_Comment=Falling blocks games +Icon=gnome-gnometris +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/SimulationGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/SimulationGames.directory.in @@ -0,0 +1,4 @@ +[Desktop Entry] +_Name=Simulation +_Comment=Simulation games +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/CardGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/CardGames.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Cards +_Comment=Card games +Icon=gnome-aisleriot +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/SportsGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/SportsGames.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Sports +_Comment=Sports games +Icon=stock_scores +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/Debian.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/Debian.directory.in @@ -0,0 +1,6 @@ +[Desktop Entry] +_Name=Debian +_Comment=The Debian menu +Icon=debian-logo +Type=Directory +NoDisplay=true --- gnome-menus-2.28.0.1.orig/debian/desktop-files/KidsGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/KidsGames.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Kids +_Comment=Games for kids +Icon=gnome-amusements +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/BoardGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/BoardGames.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Board +_Comment=Board games +Icon=desktop +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/ArcadeGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/ArcadeGames.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Arcade +_Comment=Arcade style games +Icon=gnome-joystick +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/RolePlayingGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/RolePlayingGames.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Role playing +_Comment=Role playing games +Icon=stock_person +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/LogicGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/LogicGames.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Logic +_Comment=Logic and puzzle games +Icon=system-run +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/StrategyGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/StrategyGames.directory.in @@ -0,0 +1,4 @@ +[Desktop Entry] +_Name=Strategy +_Comment=Strategy games +Type=Directory --- gnome-menus-2.28.0.1.orig/debian/desktop-files/ActionGames.directory.in +++ gnome-menus-2.28.0.1/debian/desktop-files/ActionGames.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Action +_Comment=Action games +Icon=weather-storm +Type=Directory