--- gnome-menus-2.21.92.orig/debian/rules +++ gnome-menus-2.21.92/debian/rules @@ -0,0 +1,87 @@ +#!/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-% + +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/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_pycentral + +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-* --- gnome-menus-2.21.92.orig/debian/gnome-menus.install +++ gnome-menus-2.21.92/debian/gnome-menus.install @@ -0,0 +1,4 @@ +debian/tmp/etc +debian/tmp/usr/bin +debian/tmp/usr/share +layout/settings.menu /etc/xdg/menus --- gnome-menus-2.21.92.orig/debian/README.Debian +++ gnome-menus-2.21.92/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.21.92.orig/debian/python-gmenu.install +++ gnome-menus-2.21.92/debian/python-gmenu.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/python*/site-packages/gmenu.so +debian/tmp/usr/lib/python*/site-packages/GMenuSimpleEditor --- gnome-menus-2.21.92.orig/debian/changelog +++ gnome-menus-2.21.92/debian/changelog @@ -0,0 +1,592 @@ +gnome-menus (2.21.92-0ubuntu1) hardy; urgency=low + + * New upstream release (lp: #195921) + - Code cleaning + - Updated translations + * debian/patches/70_reautogen.patch: updated + + -- Pedro Fragoso Tue, 26 Feb 2008 20:44:24 +0000 + +gnome-menus (2.21.91-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #191249) + - Remove the various monitor backends, and unconditionnaly use gio + - Do not install gnome-menu-spec-test, it's useless for the user + - Add a hard dependency on gio (Vincent) + * debian/control{.in}: + - Source-Version -> binary:Version + * debian/patches/70_reautogen.patch: Updated + + -- Pedro Fragoso Tue, 12 Feb 2008 13:06:08 +0000 + +gnome-menus (2.21.90-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #186480) + * Bump to Standards-Version 3.7.3 (no changes) + + -- Pedro Fragoso Mon, 28 Jan 2008 00:08:19 +0000 + +gnome-menus (2.21.5-0ubuntu1) hardy; urgency=low + + * New upstream version: + Fixes + - Fix for API changes in gio + * debian/control.in: + - updated glib requirement + * debian/patches/80_gio_changes_update.patch: + - dropped, the new version fixes the issue + + -- Sebastien Bacher Tue, 15 Jan 2008 01:08:31 +0100 + +gnome-menus (2.21.3-0ubuntu3) hardy; urgency=low + + * debian/patches/80_gio_changes_update.patch: + - updated patch version from upstream + + -- Sebastien Bacher Tue, 08 Jan 2008 13:58:37 +0100 + +gnome-menus (2.21.3-0ubuntu2) hardy; urgency=low + + * debian/control.in: + - updated libglib requirement + * debian/patches/80_gio_changes_update.patch: + - update to the new gio changes + + -- Sebastien Bacher Mon, 07 Jan 2008 22:49:02 +0100 + +gnome-menus (2.21.3-0ubuntu1) hardy; urgency=low + + * New upstream version: + - Fix for api change in gio + - Prevent a major memory leak + * debian/control.in: + - don't Build-Depends on libgnomevfs2-dev + - updated libglib requirement + * debian/patches/07_gnomevfs.patch: + - dropped, not required since the new version use gio + * debian/patches/20_show-admin-tools-for-admin-group.patch: + - new version update + * debian/patches/70_reautogen.patch: + - new version update + + -- Sebastien Bacher Mon, 07 Jan 2008 11:57:06 +0100 + +gnome-menus (2.20.1-1ubuntu1) hardy; urgency=low + + * Sync with Debian + * debian/desktop-files, debian/po-up, debian/patches/09_games-menu.patch: + - dropped Debian change + * 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 Tue, 20 Nov 2007 01:21:36 +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.21.92.orig/debian/control +++ gnome-menus-2.21.92/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 , Sebastian Dröge +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-central (>= 0.5), + quilt, + intltool +Standards-Version: 3.7.3 +XS-Python-Version: >= 2.3 + +Package: gnome-menus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python-gmenu (= ${binary:Version}), + python-glade2 +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 +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} +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.21.92.orig/debian/libgnome-menu-dev.install +++ gnome-menus-2.21.92/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.21.92.orig/debian/compat +++ gnome-menus-2.21.92/debian/compat @@ -0,0 +1 @@ +5 --- gnome-menus-2.21.92.orig/debian/copyright +++ gnome-menus-2.21.92/debian/copyright @@ -0,0 +1,29 @@ +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'. + --- gnome-menus-2.21.92.orig/debian/libgnome-menu2.install +++ gnome-menus-2.21.92/debian/libgnome-menu2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*.so.* --- gnome-menus-2.21.92.orig/debian/watch +++ gnome-menus-2.21.92/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/([\d\.]+)[02468]/ \ + gnome-menus-(.*)\.tar\.gz \ + debian uupdate --- gnome-menus-2.21.92.orig/debian/libgnome-menu2.shlibs +++ gnome-menus-2.21.92/debian/libgnome-menu2.shlibs @@ -0,0 +1 @@ +libgnome-menu 2 libgnome-menu2 (>= 2.15.4) --- gnome-menus-2.21.92.orig/debian/control.in +++ gnome-menus-2.21.92/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@ +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-central (>= 0.5), + quilt, + intltool +Standards-Version: 3.7.3 +XS-Python-Version: >= 2.3 + +Package: gnome-menus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python-gmenu (= ${binary:Version}), + python-glade2 +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 +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} +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.21.92.orig/debian/patches/05_debian_menu.patch +++ gnome-menus-2.21.92/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.21.92.orig/debian/patches/09_app_install_entry.patch +++ gnome-menus-2.21.92/debian/patches/09_app_install_entry.patch @@ -0,0 +1,20 @@ +diff -Nur gnome-menus-2.13.5/layout/applications.menu gnome-menus-2.13.5.new/layout/applications.menu +--- gnome-menus-2.13.5/layout/applications.menu 2006-03-01 19:14:33.000000000 +0100 ++++ gnome-menus-2.13.5.new/layout/applications.menu 2006-03-01 19:14:48.000000000 +0100 +@@ -157,4 +157,16 @@ + Debian.directory + + ++ ++ gnome-app-install.desktop ++ ++ ++ ++ ++ ++ ++ ++ gnome-app-install.desktop ++ ++ + --- gnome-menus-2.21.92.orig/debian/patches/20_show-admin-tools-for-admin-group.patch +++ gnome-menus-2.21.92/debian/patches/20_show-admin-tools-for-admin-group.patch @@ -0,0 +1,226 @@ +Index: gnome-menus-2.21.3/libmenu/desktop-entries.c +=================================================================== +--- gnome-menus-2.21.3.orig/libmenu/desktop-entries.c 2007-12-22 22:25:18.000000000 +0100 ++++ gnome-menus-2.21.3/libmenu/desktop-entries.c 2008-01-07 12:02:00.000000000 +0100 +@@ -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 +@@ -50,7 +52,7 @@ + gboolean terminal; + + guint type : 2; +- guint flags : 4; ++ guint flags : 5; + guint refcount : 24; + }; + +@@ -75,9 +77,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, +@@ -157,6 +170,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; +@@ -166,6 +220,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; + } +@@ -297,13 +353,14 @@ + + #undef GET_LOCALE_STRING + +- menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, ShowInGNOME=%s, TryExecFailed=%s\n", ++ menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, RootRequired: %s, ShowInGNOME=%s, TryExecFailed=%s\n", + retval->basename, + retval->name, + retval->comment ? retval->comment : "(null)", + 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.21.3/libmenu/Makefile.am +=================================================================== +--- gnome-menus-2.21.3.orig/libmenu/Makefile.am 2007-12-22 22:25:18.000000000 +0100 ++++ gnome-menus-2.21.3/libmenu/Makefile.am 2008-01-07 12:02:22.000000000 +0100 +@@ -52,6 +52,8 @@ + menu-monitor-backend.h \ + menu-util.c \ + menu-util.h \ ++ user-is-sudoer.c \ ++ user-is-sudoer.h \ + $(MONITOR_SOURCES) \ + $(NULL) + +Index: gnome-menus-2.21.3/libmenu/user-is-sudoer.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-menus-2.21.3/libmenu/user-is-sudoer.c 2008-01-07 12:02:00.000000000 +0100 +@@ -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.21.3/libmenu/user-is-sudoer.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-menus-2.21.3/libmenu/user-is-sudoer.h 2008-01-07 12:02:00.000000000 +0100 +@@ -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.21.92.orig/debian/patches/03_kde-legacydirs.patch +++ gnome-menus-2.21.92/debian/patches/03_kde-legacydirs.patch @@ -0,0 +1,12 @@ +Index: gnome-menus-2.18.3/layout/applications.menu +=================================================================== +--- gnome-menus-2.18.3.orig/layout/applications.menu 2007-07-17 18:45:15.977163070 +0200 ++++ gnome-menus-2.18.3/layout/applications.menu 2007-07-17 18:45:19.033337231 +0200 +@@ -7,7 +7,6 @@ + Applications.directory + + +- + /etc/X11/applnk + /usr/share/gnome/apps + /usr/share/control-center-2.0/capplets --- gnome-menus-2.21.92.orig/debian/patches/10_use-default-python-path.patch +++ gnome-menus-2.21.92/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.21.92.orig/debian/patches/01_preferences-legacydir.patch +++ gnome-menus-2.21.92/debian/patches/01_preferences-legacydir.patch @@ -0,0 +1,14 @@ +Index: gnome-menus-2.18.3/layout/preferences.menu +=================================================================== +--- gnome-menus-2.18.3.orig/layout/preferences.menu 2007-07-02 19:15:26.000000000 +0200 ++++ gnome-menus-2.18.3/layout/preferences.menu 2007-07-17 18:45:03.832470983 +0200 +@@ -9,6 +9,9 @@ + + + ++ ++ /usr/share/control-center-2.0/capplets ++ + + + --- gnome-menus-2.21.92.orig/debian/patches/series +++ gnome-menus-2.21.92/debian/patches/series @@ -0,0 +1,10 @@ +01_preferences-legacydir.patch +02_applications-legacydir.patch +03_kde-legacydirs.patch +04_settings-legacydir.patch +05_debian_menu.patch +09_app_install_entry.patch +10_use-default-python-path.patch +20_show-admin-tools-for-admin-group.patch +21_default-python-in-shebang.patch +70_reautogen.patch --- gnome-menus-2.21.92.orig/debian/patches/04_settings-legacydir.patch +++ gnome-menus-2.21.92/debian/patches/04_settings-legacydir.patch @@ -0,0 +1,14 @@ +Index: gnome-menus-2.18.3/layout/settings.menu +=================================================================== +--- gnome-menus-2.18.3.orig/layout/settings.menu 2007-07-02 19:15:26.000000000 +0200 ++++ gnome-menus-2.18.3/layout/settings.menu 2007-07-17 18:45:21.573481986 +0200 +@@ -6,6 +6,9 @@ + Desktop + Desktop.directory + ++ ++ /usr/share/control-center-2.0/capplets ++ + + + --- gnome-menus-2.21.92.orig/debian/patches/02_applications-legacydir.patch +++ gnome-menus-2.21.92/debian/patches/02_applications-legacydir.patch @@ -0,0 +1,12 @@ +Index: gnome-menus-2.18.3/layout/applications.menu +=================================================================== +--- gnome-menus-2.18.3.orig/layout/applications.menu 2007-07-02 19:15:26.000000000 +0200 ++++ gnome-menus-2.18.3/layout/applications.menu 2007-07-17 18:45:15.977163070 +0200 +@@ -10,6 +10,7 @@ + + /etc/X11/applnk + /usr/share/gnome/apps ++ /usr/share/control-center-2.0/capplets + + + --- gnome-menus-2.21.92.orig/debian/patches/70_reautogen.patch +++ gnome-menus-2.21.92/debian/patches/70_reautogen.patch @@ -0,0 +1,3180 @@ +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/aclocal.m4 gnome-menus-2.21.92.new/aclocal.m4 +--- gnome-menus-2.21.92/aclocal.m4 2008-02-26 14:21:01.000000000 +0000 ++++ gnome-menus-2.21.92.new/aclocal.m4 2008-02-26 21:51:30.000000000 +0000 +@@ -808,7 +808,7 @@ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 51 AC_PROG_LIBTOOL ++# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -896,7 +896,6 @@ + AC_REQUIRE([AC_OBJEXT])dnl + AC_REQUIRE([AC_EXEEXT])dnl + dnl +- + AC_LIBTOOL_SYS_MAX_CMD_LEN + AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + AC_LIBTOOL_OBJDIR +@@ -998,6 +997,8 @@ + ;; + esac + ++_LT_REQUIRED_DARWIN_CHECKS ++ + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + enable_win32_dll=yes, enable_win32_dll=no) +@@ -1077,9 +1078,80 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + ])# _LT_LINKER_BOILERPLATE + ++# _LT_REQUIRED_DARWIN_CHECKS ++# -------------------------- ++# Check for some things on darwin ++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[0123]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++]) + + # _LT_AC_SYS_LIBPATH_AIX + # ---------------------- +@@ -1404,7 +1476,11 @@ + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; + esac + ;; + esac +@@ -1497,7 +1573,7 @@ + $2=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + ]) + +@@ -1768,7 +1844,7 @@ + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], +@@ -1776,7 +1852,7 @@ + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) +@@ -2093,7 +2169,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -2419,27 +2495,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -2451,6 +2510,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -2631,6 +2702,13 @@ + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no + ++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], ++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], ++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -3130,7 +3208,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[[4-9]]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -3225,7 +3303,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -3566,7 +3644,7 @@ + fi + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -3623,6 +3701,7 @@ + _LT_AC_TAGVAR(predeps, $1)= + _LT_AC_TAGVAR(postdeps, $1)= + _LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= + + # Source file extension for C++ test sources. + ac_ext=cpp +@@ -3732,7 +3811,7 @@ + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -3745,7 +3824,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -3891,51 +3970,23 @@ + fi + ;; + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ if test "$GXX" = yes ; then + output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -4186,7 +4237,7 @@ + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +@@ -4259,7 +4310,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -4621,7 +4672,8 @@ + # compiler output when linking a shared library. + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl + dnl we can't use the lt_simple_compile_test_code here, + dnl because it contains code intended for an executable, + dnl not a library. It's possible we should let each +@@ -4746,6 +4798,11 @@ + + $rm -f confest.$objext + ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++ + # PORTME: override above test on systems where it is broken + ifelse([$1],[CXX], + [case $host_os in +@@ -4802,7 +4859,6 @@ + ;; + esac + ]) +- + case " $_LT_AC_TAGVAR(postdeps, $1) " in + *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; + esac +@@ -4887,7 +4943,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4* | aix5*) ++aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -4952,7 +5008,6 @@ + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +-_LT_AC_TAGVAR(LD, $1)="$LD" + + # GCJ did not exist at the time GCC didn't implicitly link libc in. + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +@@ -5065,6 +5120,7 @@ + _LT_AC_TAGVAR(predeps, $1) \ + _LT_AC_TAGVAR(postdeps, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ + _LT_AC_TAGVAR(archive_cmds, $1) \ + _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ + _LT_AC_TAGVAR(postinstall_cmds, $1) \ +@@ -5127,7 +5183,7 @@ + # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + # Free Software Foundation, Inc. + # + # This file is part of GNU Libtool: +@@ -5217,9 +5273,6 @@ + # Is the compiler the GNU C compiler? + with_gcc=$_LT_AC_TAGVAR(GCC, $1) + +-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +-gcc_ver=\`gcc -dumpversion\` +- + # An ERE matcher. + EGREP=$lt_EGREP + +@@ -5353,11 +5406,11 @@ + + # Dependencies to place before the objects being linked to create a + # shared library. +-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) + + # Dependencies to place after the objects being linked to create a + # shared library. +-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) + + # Dependencies to place before the objects being linked to create a + # shared library. +@@ -5367,9 +5420,13 @@ + # shared library. + postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) ++ + # The library search path used internally by the compiler when linking + # a shared library. +-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method +@@ -5449,7 +5506,7 @@ + link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) + + # Compile-time system search path for libraries +-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + + # Run-time system search path for libraries + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +@@ -5716,7 +5773,7 @@ + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -5773,7 +5830,8 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform +@@ -5810,7 +5868,7 @@ + esac + else + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +@@ -5906,7 +5964,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +@@ -5944,7 +6002,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -6057,7 +6115,8 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) +@@ -6127,7 +6186,8 @@ + mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) +@@ -6264,7 +6324,7 @@ + # + if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then + AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), + [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; +@@ -6288,7 +6348,7 @@ + # + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" + AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +@@ -6304,7 +6364,7 @@ + ifelse([$1],[CXX],[ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -6319,10 +6379,14 @@ + cygwin* | mingw*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ],[ + runpath_var= + _LT_AC_TAGVAR(allow_undefined_flag, $1)= +@@ -6353,12 +6417,14 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + _LT_CC_BASENAME([$compiler]) +@@ -6408,7 +6474,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -6524,12 +6590,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -6627,7 +6694,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -6647,7 +6714,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -6807,11 +6874,10 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -6961,7 +7027,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -7460,14 +7526,16 @@ + # _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 ++[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 + +@@ -7511,9 +7579,9 @@ + 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` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ $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 +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/configure gnome-menus-2.21.92.new/configure +--- gnome-menus-2.21.92/configure 2008-02-26 14:21:02.000000000 +0000 ++++ gnome-menus-2.21.92.new/configure 2008-02-26 21:51:33.000000000 +0000 +@@ -906,6 +906,8 @@ + ECHO + AR + RANLIB ++DSYMUTIL ++NMEDIT + DLLTOOL + AS + OBJDUMP +@@ -7697,7 +7699,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -7792,7 +7794,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -7912,7 +7914,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7915 "configure"' > conftest.$ac_ext ++ echo '#line 7917 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8084,7 +8086,11 @@ + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; + esac + ;; + esac +@@ -9502,7 +9508,6 @@ + + + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +- + # find the maximum length of command line arguments + { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 + echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } +@@ -9817,7 +9822,7 @@ + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -10377,6 +10382,318 @@ + ;; + esac + ++ ++ case $host_os in ++ rhapsody* | darwin*) ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++echo "${ECHO_T}$DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi ++else ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++fi ++ ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++echo "${ECHO_T}$NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_NMEDIT"; then ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_NMEDIT="nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ ++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } ++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&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 ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ 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 "echo \"\$as_me:$LINENO: $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 ++ 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 && ++ $as_test_x conftest$ac_exeext; then ++ lt_cv_ld_exported_symbols_list=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ lt_cv_ld_exported_symbols_list=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[0123]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ ++ + enable_dlopen=no + enable_win32_dll=yes + +@@ -10442,7 +10759,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + +@@ -10470,11 +10787,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:10473: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10790: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10477: \$? = $ac_status" >&5 ++ echo "$as_me:10794: \$? = $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. +@@ -10744,10 +11061,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works=no ++ lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" +@@ -10760,27 +11077,27 @@ + -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:10763: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11080: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10767: \$? = $ac_status" >&5 ++ echo "$as_me:11084: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works=yes ++ lt_cv_prog_compiler_pic_works=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } + +-if test x"$lt_prog_compiler_pic_works" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; +@@ -10807,10 +11124,10 @@ + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works=no ++ lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -10823,20 +11140,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works=yes ++ lt_cv_prog_compiler_static_works=yes + fi + else +- lt_prog_compiler_static_works=yes ++ lt_cv_prog_compiler_static_works=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } + +-if test x"$lt_prog_compiler_static_works" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : + else + lt_prog_compiler_static= +@@ -10864,11 +11181,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:10867: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11184: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10871: \$? = $ac_status" >&5 ++ echo "$as_me:11188: \$? = $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 +@@ -10948,12 +11265,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -11012,7 +11330,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no +@@ -11128,12 +11446,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs=no + else + ld_shlibs=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -11231,7 +11550,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -11251,7 +11570,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -11523,11 +11842,10 @@ + link_all_deplibs=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -11677,7 +11995,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -12047,7 +12365,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -12373,31 +12691,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 12380 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -12409,6 +12706,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -12590,6 +12899,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -12909,7 +13233,7 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } + if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else + { echo "$as_me:$LINENO: checking for dlopen" >&5 + echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } +@@ -13185,7 +13509,7 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } + if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + + +@@ -13234,7 +13558,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -14308,7 +14635,7 @@ + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -14321,7 +14648,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -14579,51 +14906,23 @@ + fi + ;; + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes +- +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no ++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" ++ if test "$GXX" = yes ; then + output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -14874,7 +15173,7 @@ + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +@@ -14947,7 +15246,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -15281,7 +15580,6 @@ + GCC_CXX="$GXX" + LD_CXX="$LD" + +- + cat > conftest.$ac_ext <&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works_CXX=no ++ lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" +@@ -15757,27 +16059,27 @@ + -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:15760: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16062: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15764: \$? = $ac_status" >&5 ++ echo "$as_me:16066: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_CXX=yes ++ lt_cv_prog_compiler_pic_works_CXX=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } + +-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; +@@ -15804,10 +16106,10 @@ + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works_CXX=no ++ lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -15820,20 +16122,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works_CXX=yes ++ lt_cv_prog_compiler_static_works_CXX=yes + fi + else +- lt_prog_compiler_static_works_CXX=yes ++ lt_cv_prog_compiler_static_works_CXX=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } + +-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : + else + lt_prog_compiler_static_CXX= +@@ -15861,11 +16163,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:15864: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16166: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15868: \$? = $ac_status" >&5 ++ echo "$as_me:16170: \$? = $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 +@@ -15918,7 +16220,7 @@ + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -15933,10 +16235,14 @@ + cygwin* | mingw*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac ++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + + { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 + echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +@@ -16038,7 +16344,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -16363,31 +16669,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 16370 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -16399,6 +16684,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -16580,6 +16877,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -16663,6 +16975,7 @@ + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX \ ++ compiler_lib_search_dirs_CXX \ + archive_cmds_CXX \ + archive_expsym_cmds_CXX \ + postinstall_cmds_CXX \ +@@ -16764,9 +17077,6 @@ + # Is the compiler the GNU C compiler? + with_gcc=$GCC_CXX + +-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +-gcc_ver=\`gcc -dumpversion\` +- + # An ERE matcher. + EGREP=$lt_EGREP + +@@ -16900,11 +17210,11 @@ + + # Dependencies to place before the objects being linked to create a + # shared library. +-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++predep_objects=$lt_predep_objects_CXX + + # Dependencies to place after the objects being linked to create a + # shared library. +-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++postdep_objects=$lt_postdep_objects_CXX + + # Dependencies to place before the objects being linked to create a + # shared library. +@@ -16914,9 +17224,13 @@ + # shared library. + postdeps=$lt_postdeps_CXX + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX ++ + # The library search path used internally by the compiler when linking + # a shared library. +-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method +@@ -16996,7 +17310,7 @@ + link_all_deplibs=$link_all_deplibs_CXX + + # Compile-time system search path for libraries +-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + + # Run-time system search path for libraries + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +@@ -17128,7 +17442,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -17166,7 +17480,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4* | aix5*) ++aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -17431,10 +17745,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works_F77=no ++ lt_cv_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_F77" +@@ -17447,27 +17761,27 @@ + -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:17450: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17764: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17454: \$? = $ac_status" >&5 ++ echo "$as_me:17768: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_F77=yes ++ lt_cv_prog_compiler_pic_works_F77=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } + +-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in + "" | " "*) ;; + *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; +@@ -17494,10 +17808,10 @@ + wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works_F77+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works_F77=no ++ lt_cv_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -17510,20 +17824,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works_F77=yes ++ lt_cv_prog_compiler_static_works_F77=yes + fi + else +- lt_prog_compiler_static_works_F77=yes ++ lt_cv_prog_compiler_static_works_F77=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } + +-if test x"$lt_prog_compiler_static_works_F77" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then + : + else + lt_prog_compiler_static_F77= +@@ -17551,11 +17865,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:17554: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17868: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17558: \$? = $ac_status" >&5 ++ echo "$as_me:17872: \$? = $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 +@@ -17635,12 +17949,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -17699,7 +18014,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_F77=no +@@ -17815,12 +18130,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -17918,7 +18234,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -17938,7 +18254,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -18190,11 +18506,10 @@ + link_all_deplibs_F77=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -18344,7 +18659,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -18663,7 +18978,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -18988,31 +19303,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 18995 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -19024,6 +19318,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -19205,6 +19511,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -19288,6 +19609,7 @@ + predeps_F77 \ + postdeps_F77 \ + compiler_lib_search_path_F77 \ ++ compiler_lib_search_dirs_F77 \ + archive_cmds_F77 \ + archive_expsym_cmds_F77 \ + postinstall_cmds_F77 \ +@@ -19389,9 +19711,6 @@ + # Is the compiler the GNU C compiler? + with_gcc=$GCC_F77 + +-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +-gcc_ver=\`gcc -dumpversion\` +- + # An ERE matcher. + EGREP=$lt_EGREP + +@@ -19525,11 +19844,11 @@ + + # Dependencies to place before the objects being linked to create a + # shared library. +-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++predep_objects=$lt_predep_objects_F77 + + # Dependencies to place after the objects being linked to create a + # shared library. +-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++postdep_objects=$lt_postdep_objects_F77 + + # Dependencies to place before the objects being linked to create a + # shared library. +@@ -19539,9 +19858,13 @@ + # shared library. + postdeps=$lt_postdeps_F77 + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 ++ + # The library search path used internally by the compiler when linking + # a shared library. +-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++compiler_lib_search_path=$lt_compiler_lib_search_path_F77 + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method +@@ -19621,7 +19944,7 @@ + link_all_deplibs=$link_all_deplibs_F77 + + # Compile-time system search path for libraries +-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + + # Run-time system search path for libraries + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +@@ -19713,7 +20036,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -19731,7 +20054,6 @@ + done + cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + +-LD_GCJ="$LD" + + # GCJ did not exist at the time GCC didn't implicitly link libc in. + archive_cmds_need_lc_GCJ=no +@@ -19763,11 +20085,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:19766: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:20088: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:19770: \$? = $ac_status" >&5 ++ echo "$as_me:20092: \$? = $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. +@@ -19827,7 +20149,7 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ++ + ;; + + darwin* | rhapsody*) +@@ -19897,7 +20219,7 @@ + mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ++ + ;; + + hpux9* | hpux10* | hpux11*) +@@ -20037,10 +20359,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works_GCJ=no ++ lt_cv_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_GCJ" +@@ -20053,27 +20375,27 @@ + -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:20056: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:20378: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:20060: \$? = $ac_status" >&5 ++ echo "$as_me:20382: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_GCJ=yes ++ lt_cv_prog_compiler_pic_works_GCJ=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } + +-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in + "" | " "*) ;; + *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; +@@ -20100,10 +20422,10 @@ + wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works_GCJ=no ++ lt_cv_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -20116,20 +20438,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works_GCJ=yes ++ lt_cv_prog_compiler_static_works_GCJ=yes + fi + else +- lt_prog_compiler_static_works_GCJ=yes ++ lt_cv_prog_compiler_static_works_GCJ=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } + +-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then + : + else + lt_prog_compiler_static_GCJ= +@@ -20157,11 +20479,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:20160: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:20482: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:20164: \$? = $ac_status" >&5 ++ echo "$as_me:20486: \$? = $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 +@@ -20241,12 +20563,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -20305,7 +20628,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_GCJ=no +@@ -20421,12 +20744,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -20524,7 +20848,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -20544,7 +20868,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -20816,11 +21140,10 @@ + link_all_deplibs_GCJ=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -20970,7 +21293,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -21289,7 +21612,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -21614,31 +21937,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 21621 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -21650,6 +21952,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -21831,6 +22145,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -21914,6 +22243,7 @@ + predeps_GCJ \ + postdeps_GCJ \ + compiler_lib_search_path_GCJ \ ++ compiler_lib_search_dirs_GCJ \ + archive_cmds_GCJ \ + archive_expsym_cmds_GCJ \ + postinstall_cmds_GCJ \ +@@ -22015,9 +22345,6 @@ + # Is the compiler the GNU C compiler? + with_gcc=$GCC_GCJ + +-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +-gcc_ver=\`gcc -dumpversion\` +- + # An ERE matcher. + EGREP=$lt_EGREP + +@@ -22151,11 +22478,11 @@ + + # Dependencies to place before the objects being linked to create a + # shared library. +-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++predep_objects=$lt_predep_objects_GCJ + + # Dependencies to place after the objects being linked to create a + # shared library. +-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++postdep_objects=$lt_postdep_objects_GCJ + + # Dependencies to place before the objects being linked to create a + # shared library. +@@ -22165,9 +22492,13 @@ + # shared library. + postdeps=$lt_postdeps_GCJ + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ ++ + # The library search path used internally by the compiler when linking + # a shared library. +-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method +@@ -22247,7 +22578,7 @@ + link_all_deplibs=$link_all_deplibs_GCJ + + # Compile-time system search path for libraries +-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + + # Run-time system search path for libraries + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +@@ -22338,7 +22669,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -22398,6 +22729,7 @@ + predeps_RC \ + postdeps_RC \ + compiler_lib_search_path_RC \ ++ compiler_lib_search_dirs_RC \ + archive_cmds_RC \ + archive_expsym_cmds_RC \ + postinstall_cmds_RC \ +@@ -22499,9 +22831,6 @@ + # Is the compiler the GNU C compiler? + with_gcc=$GCC_RC + +-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +-gcc_ver=\`gcc -dumpversion\` +- + # An ERE matcher. + EGREP=$lt_EGREP + +@@ -22635,11 +22964,11 @@ + + # Dependencies to place before the objects being linked to create a + # shared library. +-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++predep_objects=$lt_predep_objects_RC + + # Dependencies to place after the objects being linked to create a + # shared library. +-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++postdep_objects=$lt_postdep_objects_RC + + # Dependencies to place before the objects being linked to create a + # shared library. +@@ -22649,9 +22978,13 @@ + # shared library. + postdeps=$lt_postdeps_RC + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC ++ + # The library search path used internally by the compiler when linking + # a shared library. +-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++compiler_lib_search_path=$lt_compiler_lib_search_path_RC + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method +@@ -22731,7 +23064,7 @@ + link_all_deplibs=$link_all_deplibs_RC + + # Compile-time system search path for libraries +-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + + # Run-time system search path for libraries + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +@@ -22965,10 +23298,11 @@ + { echo "$as_me:$LINENO: checking for GLIB" >&5 + echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } + +-if test -n "$GLIB_CFLAGS"; then +- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_CFLAGS"; then ++ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$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=$? +@@ -22978,13 +23312,15 @@ + 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" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_LIBS"; then ++ pkg_cv_GLIB_LIBS="$GLIB_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$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=$? +@@ -22994,8 +23330,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -23008,9 +23345,9 @@ + _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 +@@ -24455,6 +24792,8 @@ + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim + RANLIB!$RANLIB$ac_delim ++DSYMUTIL!$DSYMUTIL$ac_delim ++NMEDIT!$NMEDIT$ac_delim + DLLTOOL!$DLLTOOL$ac_delim + AS!$AS$ac_delim + OBJDUMP!$OBJDUMP$ac_delim +@@ -24493,7 +24832,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/desktop-directories/Makefile.in gnome-menus-2.21.92.new/desktop-directories/Makefile.in +--- gnome-menus-2.21.92/desktop-directories/Makefile.in 2008-02-26 14:21:03.000000000 +0000 ++++ gnome-menus-2.21.92.new/desktop-directories/Makefile.in 2008-02-26 21:51:34.000000000 +0000 +@@ -82,6 +82,7 @@ + DEPDIR = @DEPDIR@ + DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -140,6 +141,7 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/layout/Makefile.in gnome-menus-2.21.92.new/layout/Makefile.in +--- gnome-menus-2.21.92/layout/Makefile.in 2008-02-26 14:21:03.000000000 +0000 ++++ gnome-menus-2.21.92.new/layout/Makefile.in 2008-02-26 21:51:34.000000000 +0000 +@@ -82,6 +82,7 @@ + DEPDIR = @DEPDIR@ + DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -140,6 +141,7 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/libmenu/Makefile.in gnome-menus-2.21.92.new/libmenu/Makefile.in +--- gnome-menus-2.21.92/libmenu/Makefile.in 2008-02-26 14:21:03.000000000 +0000 ++++ gnome-menus-2.21.92.new/libmenu/Makefile.in 2008-02-26 21:51:35.000000000 +0000 +@@ -63,7 +63,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) + libgnome_menu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +@@ -117,6 +118,7 @@ + DEPDIR = @DEPDIR@ + DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -175,6 +177,7 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -286,6 +289,8 @@ + menu-monitor.h \ + menu-util.c \ + menu-util.h \ ++ user-is-sudoer.c \ ++ user-is-sudoer.h \ + $(MONITOR_SOURCES) \ + $(NULL) + +@@ -392,6 +397,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@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/ltmain.sh gnome-menus-2.21.92.new/ltmain.sh +--- gnome-menus-2.21.92/ltmain.sh 2007-10-14 01:34:09.000000000 +0100 ++++ gnome-menus-2.21.92.new/ltmain.sh 2008-02-08 00:54:46.000000000 +0000 +@@ -2,7 +2,7 @@ + # NOTE: Changing this file will not affect anything until you rerun configure. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007 Free Software Foundation, Inc. ++# 2007, 2008 Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit , 1996 + # + # This program is free software; you can redistribute it and/or modify +@@ -33,9 +33,6 @@ + # function. + progpath="$0" + +-# define SED for historic ltconfig's generated by Libtool 1.3 +-test -z "$SED" && SED=sed +- + # The name of this program: + progname=`echo "$progpath" | $SED $basename` + modename="$progname" +@@ -46,8 +43,8 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=1.5.24 +-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" ++VERSION="1.5.26 Debian 1.5.26-1ubuntu1" ++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -116,15 +113,21 @@ + # These must not be set unconditionally because not all systems understand + # e.g. LANG=C (notably SCO). + # We save the old values to restore during execute mode. +-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++lt_env= ++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var ++ lt_env=\"$lt_var=\$$lt_var \$lt_env\" + $lt_var=C + export $lt_var + fi" + done + ++if test -n "$lt_env"; then ++ lt_env="env $lt_env" ++fi ++ + # Make sure IFS has a sensible default + lt_nl=' + ' +@@ -488,7 +491,7 @@ + echo "\ + $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +-Copyright (C) 2007 Free Software Foundation, Inc. ++Copyright (C) 2008 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + exit $? +@@ -791,6 +794,7 @@ + *.for) xform=for ;; + *.java) xform=java ;; + *.obj) xform=obj ;; ++ *.sx) xform=sx ;; + esac + + libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` +@@ -959,7 +963,7 @@ + $run $rm "$lobj" "$output_obj" + + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist + exit $EXIT_FAILURE +@@ -1031,7 +1035,7 @@ + command="$command$suppress_output" + $run $rm "$obj" "$output_obj" + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + $run $rm $removelist + exit $EXIT_FAILURE +@@ -1164,6 +1168,7 @@ + thread_safe=no + vinfo= + vinfo_number=no ++ single_module="${wl}-single_module" + + func_infer_tag $base_compile + +@@ -1649,6 +1654,11 @@ + continue + ;; + ++ -multi_module) ++ single_module="${wl}-multi_module" ++ continue ++ ;; ++ + -module) + module=yes + continue +@@ -2125,7 +2135,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$pass" = dlopen; then +@@ -2152,7 +2165,12 @@ + continue + fi + name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` +- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ fi ++ for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" +@@ -2948,12 +2966,18 @@ + # we do not want to link against static libs, + # but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done +- if test -f "$path/$depdepl" ; then ++ if test -f "$deplibdir/$depdepl" ; then ++ depdepl="$deplibdir/$depdepl" ++ elif test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" ++ else ++ # Can't find it, oh well... ++ depdepl= + fi + # do not add paths which are already there + case " $newlib_search_path " in +@@ -3101,9 +3125,10 @@ + + case $linkmode in + oldlib) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 +@@ -3247,6 +3272,11 @@ + revision="$number_minor" + lt_irix_increment=no + ;; ++ *) ++ $echo "$modename: unknown library version type \`$version_type'" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE ++ ;; + esac + ;; + no) +@@ -4018,23 +4048,15 @@ + fi + + tmp_deplibs= +- inst_prefix_arg= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) +- if test -n "$inst_prefix_dir" && (echo "$test_deplib" | grep -- "$inst_prefix_dir" >/dev/null); then +- inst_prefix_arg="$inst_prefix_arg $test_deplib" +- else +- tmp_deplibs="$tmp_deplibs $test_deplib" +- fi ++ tmp_deplibs="$tmp_deplibs $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" +- if test -n "$inst_prefix_arg"; then +- deplibs="$inst_prefix_arg $deplibs" +- fi + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +@@ -4248,9 +4270,10 @@ + ;; + + obj) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 +@@ -6489,7 +6512,7 @@ + fi + + # Restore saved environment variables +- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/Makefile.in gnome-menus-2.21.92.new/Makefile.in +--- gnome-menus-2.21.92/Makefile.in 2008-02-26 14:21:03.000000000 +0000 ++++ gnome-menus-2.21.92.new/Makefile.in 2008-02-26 21:51:35.000000000 +0000 +@@ -99,6 +99,7 @@ + DEPDIR = @DEPDIR@ + DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -157,6 +158,7 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/python/Makefile.in gnome-menus-2.21.92.new/python/Makefile.in +--- gnome-menus-2.21.92/python/Makefile.in 2008-02-26 14:21:03.000000000 +0000 ++++ gnome-menus-2.21.92.new/python/Makefile.in 2008-02-26 21:51:35.000000000 +0000 +@@ -104,6 +104,7 @@ + DEPDIR = @DEPDIR@ + DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -162,6 +163,7 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.21.92.new/simple-editor/GMenuSimpleEditor/Makefile.in +--- gnome-menus-2.21.92/simple-editor/GMenuSimpleEditor/Makefile.in 2008-02-26 14:21:03.000000000 +0000 ++++ gnome-menus-2.21.92.new/simple-editor/GMenuSimpleEditor/Makefile.in 2008-02-26 21:51:35.000000000 +0000 +@@ -83,6 +83,7 @@ + DEPDIR = @DEPDIR@ + DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -141,6 +142,7 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/simple-editor/Makefile.in gnome-menus-2.21.92.new/simple-editor/Makefile.in +--- gnome-menus-2.21.92/simple-editor/Makefile.in 2008-02-26 14:21:03.000000000 +0000 ++++ gnome-menus-2.21.92.new/simple-editor/Makefile.in 2008-02-26 21:51:35.000000000 +0000 +@@ -99,6 +99,7 @@ + DEPDIR = @DEPDIR@ + DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -157,6 +158,7 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +diff -Nur -x '*.orig' -x '*~' gnome-menus-2.21.92/util/Makefile.in gnome-menus-2.21.92.new/util/Makefile.in +--- gnome-menus-2.21.92/util/Makefile.in 2008-02-26 14:21:03.000000000 +0000 ++++ gnome-menus-2.21.92.new/util/Makefile.in 2008-02-26 21:51:35.000000000 +0000 +@@ -97,6 +97,7 @@ + DEPDIR = @DEPDIR@ + DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -155,6 +156,7 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ --- gnome-menus-2.21.92.orig/debian/patches/21_default-python-in-shebang.patch +++ gnome-menus-2.21.92/debian/patches/21_default-python-in-shebang.patch @@ -0,0 +1,9 @@ +diff -Nur gnome-menus-2.19.4/simple-editor/gmenu-simple-editor.in gnome-menus-2.19.4.new/simple-editor/gmenu-simple-editor.in +--- gnome-menus-2.19.4/simple-editor/gmenu-simple-editor.in 2007-06-17 20:52:12.000000000 +0200 ++++ gnome-menus-2.19.4.new/simple-editor/gmenu-simple-editor.in 2007-06-18 12:12:33.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/python + + # + # Copyright (C) 2005 Red Hat, Inc.