--- gnome-system-tools-2.18.1.orig/intltool-extract.in +++ gnome-system-tools-2.18.1/intltool-extract.in @@ -32,7 +32,7 @@ ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; -my $VERSION = "0.35.5"; +my $VERSION = "0.35.4"; ## Loaded modules use strict; --- gnome-system-tools-2.18.1.orig/aclocal.m4 +++ gnome-system-tools-2.18.1/aclocal.m4 @@ -7918,8 +7918,7 @@ _PKG_TEXT ])], - [AC_MSG_RESULT([no]) - $4]) + [$4]) elif test $pkg_failed = untried; then ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it --- gnome-system-tools-2.18.1.orig/intltool-update.in +++ gnome-system-tools-2.18.1/intltool-update.in @@ -30,7 +30,7 @@ ## Release information my $PROGRAM = "intltool-update"; -my $VERSION = "0.35.5"; +my $VERSION = "0.35.4"; my $PACKAGE = "intltool"; ## Loaded modules --- gnome-system-tools-2.18.1.orig/debian/dirs +++ gnome-system-tools-2.18.1/debian/dirs @@ -0,0 +1 @@ +var/cache/gnome-system-tools/backup --- gnome-system-tools-2.18.1.orig/debian/menu +++ gnome-system-tools-2.18.1/debian/menu @@ -0,0 +1,25 @@ +?package(gnome-system-tools):needs="X11" section="Apps/System"\ + hints="Time"\ + title="Time Admin" command="/usr/bin/time-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/time.xpm" + +?package(gnome-system-tools):needs="X11" section="Apps/System"\ + hints="Network"\ + title="Network Admin" command="/usr/bin/network-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/network.xpm" + +?package(gnome-system-tools):needs="X11" section="Apps/System"\ + hints="Boot"\ + title="Boot Admin" command="/usr/bin/boot-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/boot.xpm" + +?package(gnome-system-tools):needs="X11" section="Apps/System"\ + hints="Runlevel"\ + title="Disks Admin" command="/usr/bin/disks-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/disks.xpm" + +?package(gnome-system-tools):needs="X11" section="Apps/System"\ + hints="Users"\ + title="User accounts Admin" command="/usr/bin/users-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/users.xpm" + --- gnome-system-tools-2.18.1.orig/debian/control +++ gnome-system-tools-2.18.1/debian/control @@ -0,0 +1,33 @@ +Source: gnome-system-tools +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Kilian Krause , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, dpatch, patchutils, debhelper (>= 4.2.21), libglade2-dev (>= 1:2.5.1-1), libgnome2-dev (>= 2.10.0-1), zlib1g-dev, libpopt-dev, gettext, libgnomeui-dev (>= 2.10.0-1), python, libxml2-dev, libgconf2-dev (>= 2.10.0-1), libxml-parser-perl, gnome-pkg-tools, scrollkeeper (>= 0.3.14-9.1), libnautilus-extension-dev (>= 2.10.0-1), gnome-doc-utils, libgtk2.0-dev (>= 2.9), liboobs-1-dev (>= 2.17.5), libart-2.0-dev, libiw-dev +Standards-Version: 3.6.2 + +Package: gnome-system-tools +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, perl +Recommends: gnome-control-center (>= 1:2.10.1-1), gksu +Suggests: ntp, samba-common, wvdial +Provides: ximian-setup-tools +Replaces: ximian-setup-tools +Description: Cross-platform configuration utilities for GNOME + The GNOME System Tools are a fully integrated set of tools aimed to make easy + the job that means the computer administration on an UNIX or Linux system. + They're thought to help from the new Linux or UNIX user to the system + administrators. + . + Its main advantages are: + * Full integration with the new GNOME Control Center. + * An user-friendly interface to carry out the main administration tasks. + * The use of a common user interface in every system. + * A common structure that makes easy the development of new system tools. + Nowadays there are tools for managing: + - Users and groups + - Date and time + - Network configuration + - Bootloaders + --- gnome-system-tools-2.18.1.orig/debian/rules +++ gnome-system-tools-2.18.1/debian/rules @@ -0,0 +1,46 @@ +#!/usr/bin/make -f + +# Gnome Team +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk + +include /usr/share/cdbs/1/rules/debhelper.mk +# Including this gives us a number of rules typical to a GNOME +# program, including setting GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1. +# Note that this class inherits from autotools.mk and docbookxml.mk, +# so you don't need to include those too. +include /usr/share/cdbs/1/class/gnome.mk + +# must be included after "autotools" (which is included in "gnome") +include /usr/share/cdbs/1/rules/dpatch.mk +# it seems one needs to setup dpatch manually despite the CDBS support +include /usr/share/dpatch/dpatch.make + +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1" +DEB_CONFIGURE_EXTRA_FLAGS += --disable-schemas-install --enable-disks --disable-scrollkeeper + +DEB_DH_MAKESHLIBS_ARGS_gnome-system-tools = -n + +unpatch/gnome-system-tools:: + dpatch deapply-all + +clean:: + #-rm -f intltool-extract + #-rm -f intltool-merge + #-rm -f intltool-update + #-rm -f src/common/System.directory.in + #-rm -f src/location-manager/Makefile + #-rm -f gnome-system-tools.schemas + # -- deactivated -- + # GNOME Team 'uploaders.mk' should not override this behavior, here is a workarround : + #sed -i "s/@cdbs@/$(CDBS_BUILD_DEPENDS)/g" debian/control + + + +build/gnome-system-tools:: + cd doc/network; make pot + cd doc/services; make pot + cd doc/time; make pot + cd doc/users; make pot + +binary-install/gnome-system-tools:: + rm -rf debian/gnome-system-tools/var/scrollkeeper --- gnome-system-tools-2.18.1.orig/debian/watch +++ gnome-system-tools-2.18.1/debian/watch @@ -0,0 +1,4 @@ +version=2 +ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/2.17/ \ + gnome-system-tools-(.*)\.tar\.gz \ + debian uupdate --- gnome-system-tools-2.18.1.orig/debian/gnome-system-tools.install +++ gnome-system-tools-2.18.1/debian/gnome-system-tools.install @@ -0,0 +1 @@ +debian/profiles etc/gnome-system-tools/users/ --- gnome-system-tools-2.18.1.orig/debian/changelog +++ gnome-system-tools-2.18.1/debian/changelog @@ -0,0 +1,1802 @@ +gnome-system-tools (2.18.1-0ubuntu2) feisty-proposed; urgency=low + + * Add debian/patches/23_users_update_model.patch: + - Update the internal model of users and groups with each operation, so + that it does not become inconsistent with the real world in /etc/passwd + and /etc/group. + - This fixes random errors like "unrelated user was dropped from group + admin", "deleted a different user than the one selected in users-admin", + etc. + - Patch backported from SVN head: + http://svn.gnome.org/viewvc/gnome-system-tools?view=revision&revision=4017 + - LP: #26338 + + -- Martin Pitt Tue, 13 Nov 2007 13:40:29 +0100 + +gnome-system-tools (2.18.1-0ubuntu1) feisty; urgency=low + + * New upstream version: + Common: + - Remove nonexistent .desktop files categories + Network: + - Do a sanity check when migrating old locations (Ubuntu: #86357) + Time: + - Mark previously not translated string as translatable + - Build fixes + - Fix possible crash when selecting timezone (Ubuntu: #91568) + - allow building out of tree + Users: + - show users with no full name when editing a group users (Ubuntu: #90320) + * debian/patches/98_automake.dpatch: + - updated + + -- Sebastien Bacher Tue, 10 Apr 2007 11:34:05 +0200 + +gnome-system-tools (2.18.0-0ubuntu1) feisty; urgency=low + + * New upstream version: + Services + - Show correctly all postgresql* services + * debian/patches/10_add_missing_services.dpatch: + - updated, postgresql-8.2 is listed with the new version + * debian/patches/98_automake.dpatch: + - updated + + -- Sebastien Bacher Mon, 12 Mar 2007 11:17:42 +0100 + +gnome-system-tools (2.17.92-0ubuntu3) feisty; urgency=low + + * debian/patches/10_add_missing_services.dpatch: + - extended postgresql-8.2 patch to also include lighttpd and + vmware-player. + + -- Daniel Holbach Thu, 1 Mar 2007 16:40:56 +0100 + +gnome-system-tools (2.17.92-0ubuntu2) feisty; urgency=low + + * debian/patches/10_add_postgres82.dpatch: + - added postgresql-8.2 to the list (LP: #88836) + + -- Daniel Holbach Thu, 1 Mar 2007 11:52:50 +0100 + +gnome-system-tools (2.17.92-0ubuntu1) feisty; urgency=low + + * New upstream version: + Shares: + - Add --disable-nautilus configure option + to disable shares nautilus extension + Common: + - Remove gnome-doc-utils.make, it's generated + - Also spawn help if compiled with --disable-gnome + - Avoid early dialog closing/destruction + * debian/control.in: + - package maintained by the Ubuntu Desktop Team + * debian/patches/98_automake.dpatch: + - updated + + -- Sebastien Bacher Tue, 27 Feb 2007 12:51:43 +0100 + +gnome-system-tools (2.17.91-0ubuntu1) feisty; urgency=low + + * New upstream version: + Network: + - Avoid a critical warning + - Fix invalid memory free() which was causing lots of grief + (Ubuntu: #67936, #70756) + - call g_thread_init() to avoid GSlice warning + - Improve migration of older parameters in location files to newer format + Shares: + - Check whether there's connection to the bus before requesting data + in the nautilus extension + - call g_thread_init() to avoid GSlice warning + Time: + - updated screenshots for the documentation (Ubuntu: #83006) + Users: + - Mark a few dialogs as transient for another ones + * debian/patches/98_automake.dpatch: + - updated + + -- Sebastien Bacher Mon, 12 Feb 2007 17:47:11 +0100 + +gnome-system-tools (2.17.90-0ubuntu1) feisty; urgency=low + + * New upstream version: + Services: + - add "ntp" as a recognized NTP server + Network: + - Make network-admin appear in the "Internet & Networking" control center + category + - Do not return trash when the wireless interface doesn't support scanning + (Ubuntu: #76174) + Shares: + - Make shares-admin appear in the "Internet & Networking" control center + category + * debian/patches/21_new_ntp_server_name.dpatch: + - dropped, fixed with the new version + * debian/patches/98_automake.dpatch: + - updated + + -- Sebastien Bacher Mon, 12 Feb 2007 15:30:12 +0100 + +gnome-system-tools (2.17.5-0ubuntu1) feisty; urgency=low + + * New upstream version: + Network: + - Update minimum liboobs to 2.17.5 + - add support for extensible list of configuration methods and key types + * New upstream version: + Network: + - Added NM integration bits + - work nicely with older libiw + Time: + - Redesign GUI + * debian/control.in: + - updated liboobs requirement according to configure + * debian/patches/04_activate_avahi_option.dpatch: + - updated + * debian/patches/05_no_ntp.dpatch: + - dropped, ubiquity stopped using time-admin, the patch is not required + * debian/patches/21_network_support_ipv4ll.dpatch: + - dropped, the new upstream version has that feature + * debian/patches/21_new_ntp_server_name.dpatch: + - list "ntp" server (Ubuntu: #75849) + * debian/patches/82_gst-packages-time-admin.dpatch: + - make time-admin install the "ntp" package rather than "ntp-server" + * debian/patches/83_network-locations-apply-button.dpatch: + - updated + * debian/patches/98_automake.dpatch: + - updated + + -- Sebastien Bacher Tue, 9 Jan 2007 14:16:55 +0100 + +gnome-system-tools (2.17.3-0ubuntu3) feisty; urgency=low + + * debian/patches/22_root_only.dpatch: + - src/shares/nautilus/nautilus-shares.c: Call shares-admin with gksu in + the nautilus extension. Closes: LP#76055 + - src/shares/shares-tool.c: Temporarily drop to sudo user uid in + gst_shares_tool_init(), since the various oobs_*_config_get() functions + access the user's session bus (which hangs when being called as + root). This is the same patch as previously applied to time-tool.c. + + -- Martin Pitt Wed, 3 Jan 2007 19:35:49 +0100 + +gnome-system-tools (2.17.3-0ubuntu2) feisty; urgency=low + + * Add debian/patches/21_network_support_ipv4ll.dpatch: + - Support IPv4LL (Zeroconf) ethernet interfaces. + - See https://wiki.ubuntu.com/ZeroConfNetworking spec for details. + * debian/control.in: Bump liboobs-1-dev build dependency, we need + OOBS_METHOD_IPV4LL. + * Add debian/patches/22_root_only.dpatch: + - *.desktop files: Execute programs through gksu. + - src/time/time-tool.c: If executing through sudo as root, temporarily + switch real user id to SUDO_UID, so that we can connect to the actual + user's session dbus for disabling the screensaver. Attempting to connect + to root's nonexisting session dbus just hangs. + - Closes: LP#59946 + + -- Martin Pitt Tue, 5 Dec 2006 11:09:47 +0100 + +gnome-system-tools (2.17.3-0ubuntu1) feisty; urgency=low + + * New upstream version: + Common: + - Fix a bunch of compiler warnings everywhere + - build with latest gnome-doc-utils + - UI improvements to the "unsupported distribution" dialog + - install icons in hicolor + Network: + - add back wireless detection (included signal strength), + use libiw for this (Ubuntu: #59159) + - use theme icons where available + - fix bug when closing the interfaces configuration dialog + Services: + - recognize properly apache2/ssh/sshd/ntpd (Ubuntu: #63596, #69424) + Time: + - apply configuration before closing the tool if there are changes pending + Users: + - do not fail setting a random password (Ubuntu: #59486) + - show help and do not close the groups dialog when clicking on 'Help' + (Ubuntu: #71551) + * debian/control.in: + - Build-Depends on libiw-dev + * debian/patches/04_activate_avahi_option.dpatch: + - updated + * debian/patches/19_drop_extra_g_print.dpatch: + - cleanup extra g_print, it's not useful + * debian/patches/90_from_cvs_fix_incorrect_loop.dpatch: + - fixed with the new version + * debian/patches/98_automake.dpatch: + - updated + * debian/rules: + - the boot tool has been dropped, don't generate a documentation template + for it + * debian/watch: + - updated + + -- Sebastien Bacher Fri, 1 Dec 2006 13:08:24 +0100 + +gnome-system-tools (2.15.5-0ubuntu3) edgy-proposed; urgency=low + + * debian/patches/90_from_cvs_fix_incorrect_loop.dpatch: + - patch from CVS, fix a crasher due to an incorrect loop (Ubuntu: #69566) + + -- Sebastien Bacher Fri, 3 Nov 2006 12:22:37 +0100 + +gnome-system-tools (2.15.5-0ubuntu2) edgy; urgency=low + + * debian/patches/04_activate_avahi_option.dpatch: + - fixed code broken by one of the previous updates of the package + + -- Sebastien Bacher Wed, 11 Oct 2006 13:54:37 +0200 + +gnome-system-tools (2.15.5-0ubuntu1) edgy; urgency=low + + * New upstream version: + Common: + - add a --disable-gnome option to disable GNOME dependencies + - Show an "Access denied" dialog if g-s-t can't access s-t-b + Shares: + - remove unneeded GNOME-VFS dependency + - fix a crasher + Time: + - optimize the map dot blink timeout to be only executed when the map + is shown + - Fix a crasher when there is no timezone (Ubuntu: #58629) + Translations: + - fi + * debian/control.in: + - Build-Depends on libart-2.0-dev and new liboobs-1-dev (>= 0.5.0) + * debian/patches/90_from_cvs_fix_shares_admin_crasher.dpatch: + - fixed with the new version + * debian/patches/98_automake.dpatch: + - updated + + -- Sebastien Bacher Sat, 30 Sep 2006 23:07:12 +0200 + +gnome-system-tools (2.15.4-0ubuntu3) edgy; urgency=low + + * debian/patches/05_no_ntp.dpatch: + - if GST_NO_NTP is set, hide the ntp releated button/checkbox + (lp: #52718) + + -- Michael Vogt Mon, 18 Sep 2006 17:44:45 +0200 + +gnome-system-tools (2.15.4-0ubuntu2) edgy; urgency=low + + * debian/patches/90_from_cvs_fix_shares_admin_crasher.dpatch + - patch from cvs, fix shares-admin crashing when trying to add a share from + the user interface + + -- Sebastien Bacher Fri, 8 Sep 2006 21:19:41 +0200 + +gnome-system-tools (2.15.4-0ubuntu1) edgy; urgency=low + + * New upstream version: + Network: + - Set the last selected profile as the default name in the "save location" + dialog. Other wording and GUI improvements + - Show the interface name in the UI if there's more than one interface of + the same type. (Ubuntu: #56888) + * debian/patches/83_network-locations-apply-button.dpatch: + - updated + + -- Sebastien Bacher Fri, 8 Sep 2006 12:57:14 +0200 + +gnome-system-tools (2.15.3-0ubuntu1) edgy; urgency=low + + * New upstream version: + Common: + - Code cleanups and improvements + - Fix configuration reloading when the user has to select a platform + Users: + - Add back user profiles + Time: + - Add "synchronize now" button + - Fix crasher when time-admin can't communicate with gnome-screensaver + Network: + - Fix several potential crashers + - Fix --configure and --configure-type parameters + Shares: + - Do not crash in --add-share + Services: + - Add heaps of services descriptions + * debian/control.in: + - updated the liboobs-1-dev requirement according to configure + * debian/gnome-system-tools.install: + - updated profiles file to install + * debian/patches/03_install_packages.dpatch: + - replaced by a set of new patches + * debian/patches/18_disable_uid.dpatch: + - fixed + * debian/patches/20_fuse_as_default_group.dpatch: + - updated + * debian/patches/98_automake.dpatch: + - updated + * debian/profiles, debian/profiles.xml: + - user profiles updated to the new format, + by Carlos Garnacho + * debian/watch: + - updated + * Patches by Carlos Garnacho : + * debian/patches/80_gst-packages-common.dpatch, + debian/patches/81_gst-packages-shares-admin.dpatch, + debian/patches/82_gst-packages-time-admin.dpatch: + - based on the previous patches by Vincent Untz, allow to install required + packages from the corresponding tool (Ubuntu: #55988) + * debian/patches/83_network-locations-apply-button.dpatch: + - make network-admin use an apply button instead of applying changes when + selecting a profile + + -- Sebastien Bacher Tue, 5 Sep 2006 22:55:34 +0200 + +gnome-system-tools (2.15.2-0ubuntu5) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Thu, 24 Aug 2006 17:44:14 +0200 + +gnome-system-tools (2.15.2-0ubuntu4) edgy; urgency=low + + * add fuse to the default groups to enable local blockdevice access + for ltspfs users + + -- Oliver Grawert Wed, 23 Aug 2006 12:18:52 +0200 + +gnome-system-tools (2.15.2-0ubuntu3) edgy; urgency=low + + * debian/patches/08_desktops_changes.dpatch: + - droped, the new g-s-t run as user now, only the backend runs + as root + + -- Michael Vogt Mon, 14 Aug 2006 13:08:24 +0200 + +gnome-system-tools (2.15.2-0ubuntu2) edgy; urgency=low + + * small fix in the packaging + + -- Michael Vogt Mon, 14 Aug 2006 10:04:59 +0200 + +gnome-system-tools (2.15.2-0ubuntu1) edgy; urgency=low + + * New upstream release: + - General: + - updated user docs (garnacho) + - doc fixes (Claude Paroz) + - Network: + - Avoid a crash (garnacho) + - Time: + - Avoid a critical warning if no NTP service is available (garnacho) + - Inhibit/UnInhibit gnome-screensaver when changing time (garnacho) + - Translations: + - dz (Dzongkhalinux team) + - es (Francisco Javier F. Serrador) + - et (Ivar Smolin) + - eu (Inaki Larranaga) + - fi (Ilkka Tuohela) + - gu (Ankit Patel) + - ml (Ani Peter) + - mk (Jovan Naumovski) + - nb (Kjartan Maraas) + - nl (Tino Meinen) + + -- Michael Vogt Fri, 11 Aug 2006 15:14:42 +0200 + +gnome-system-tools (2.15.1-0ubuntu1) edgy; urgency=low + + * New upstream release: + - Shares: + - Show emblem on shared folders + - Network: + - Reimplement network locations + - Common: + - Code cleanups + - Remove unused glade dialogs + * debian/control.in: + - bumped liboobs requirement. + * debian/patches/04_activate_avahi_option.patch: + - updated. + * debian/patches/05_fix_signals_enumeration.dpatch: + - dropped, used upstream. + + -- Daniel Holbach Wed, 2 Aug 2006 21:28:45 +0200 + +gnome-system-tools (2.15.0-0ubuntu3) edgy; urgency=low + + * debian/patches/04_activate_avahi_option.dpatch: + - add an option to activate the automatic service discovery + * debian/patches/05_fix_signals_enumeration.dpatch: + - make the last element of a signals list being NULL, fix a crasher + + -- Sebastien Bacher Wed, 26 Jul 2006 17:14:00 +0200 + +gnome-system-tools (2.15.0-0ubuntu2) edgy; urgency=low + + * rebuild with newest liboobs. + + -- Daniel Holbach Thu, 13 Jul 2006 21:15:54 +0200 + +gnome-system-tools (2.15.0-0ubuntu1) edgy; urgency=low + + * New upstream release: + - Common: + - use intltool 0.35, move ALL_LINGUAS to po/LINGUAS + - Make g-s-t work fine with --as-needed + - All tools: + - Use liboobs. The XML interface is deprecated + - Adopt a more instant apply policy + - UI Changes + - Use named icons in menus and window icon for themeability + - Set translation domain for popups + - Users: + - Use adduser/addgroup if it's present + - Network: + - Use DHCP as the default + - Services: + - Add advanced runlevels/priorities editor + - Shares: + - Rework defaults for new shared folders + - Time: + - Update some NTP servers + - Translations: dz, es, et, fi, gl, gu, it, ka, nb, ru, th, tr. + * debian/control.in: + - added Build-Deps on libgtk2.0-dev (>= 2.9.0), liboobs-1-dev (>= 0.1.0), + - removed {Build-,}Dep on system-tools-backends* + * debian/patches/03_install_packages.patch, + debian/patches/04_install_ntp.patch, + debian/patches/08_desktops_changes.dpatch, + debian/patches/18_disable_uid.dpatch: + - updated. + * debian/patches/05_diskstranslations.dpatch, + debian/patches/20_use_sudo_user.dpatch, + debian/patches/23_i18n.dpatch: + - dropped, disks-admin is dead. + * debian/patches/06_install_smbnfs.dpatch, + debian/patches/17_ntpdate.dpatch, + debian/patches/24_nautilus_share_gksudo.dpatch: + - dropped, needs to be rewritten and new features in + system-tools-backends. + * debian/patches/07_fix_share_incorrect_free.dpatch, + debian/patches/16_use_sudo.dpatch, + debian/patches/27_amd64_fix_service_crash.dpatch, + debian/patches/28_break_long_lines.dpatch: + - dropped, not necessary any more. + * debian/patches/15_set_action_groups_translation_domain.dpatch: + debian/patches/19_fix_ntp_server.dpatch: + - dropped, fixed upstream. + * debian/patches/21_disable_login_edit.dpatch: + - coupled with debian/patches/18_disable_uid.dpatch. + * debian/patches/22_use_default_serial_speed.dpatch: + - dropped, fixed in system-tools-backends. + * debian/patches/26_use_gnu_crypt.dpatch: + - patch moved to liboobs. + * debian/patches/99_autoreconf.dpatch: + - dropped, replaced by debian/patches/98_automake.dpatch. + * Resynchronized with Debian. + + -- Daniel Holbach Tue, 13 Jun 2006 07:53:44 +0200 + +gnome-system-tools (2.14.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Don't enable building boot-admin as it is still experimental (Closes: #309932). + + -- Luk Claes Sat, 29 Apr 2006 19:19:53 +0200 + +gnome-system-tools (2.14.0-1) unstable; urgency=low + + * New upstream version. + * Add build-dep on gnome-doc-tools. + * Disable scrollkeeper at build time. + * Remove /var/scrollkeeper stuff installed by translations not converted to + gnome-doc-utils. + * Drop relibtoolisation patch. + + -- Dafydd Harries Wed, 29 Mar 2006 18:43:45 +0100 + +gnome-system-tools (2.14.0-0ubuntu11) dapper; urgency=low + + * debian/patches/07_fix_share_incorrect_free.dpatch: + - fix incorrect g_free call and a crasher due to it (Ubuntu: #26117) + + -- Sebastien Bacher Mon, 29 May 2006 12:12:34 +0200 + +gnome-system-tools (2.14.0-0ubuntu10) dapper; urgency=low + + * debian/patches/04_install_ntp.dpatch: + - don't show the button is GST_NO_INSTALL_NTP is set (for the + installer) Ubuntu: #46743 + + -- Michael Vogt Fri, 26 May 2006 17:40:37 +0200 + +gnome-system-tools (2.14.0-0ubuntu9) dapper; urgency=low + + * debian/patches/15_set_action_groups_translation_domain.dpatch + - define the action groups translation domain so the context menu of the + different applications is translated (Ubuntu: #44895) + + -- Sebastien Bacher Sun, 21 May 2006 17:22:19 +0200 + +gnome-system-tools (2.14.0-0ubuntu8) dapper; urgency=low + + * debian/patches/08_desktops_changes.dpatch: + - use gksu for the menu items again so the UI is consistent with the other + applications of the desktop (Ubuntu: #40680) + - make package installation working again (Ubuntu: #40563) + * debian/patches/20_use_sudo_user.dpatch: + - patch by Dennis Kaarsemaker + - Use su -c $SUDO_USER for launching nautilus/totem/gnome-cd if that + variable is set (Ubuntu: #23230) + * debian/rules: + - run "make pot" for the different doc directories of the package + + -- Sebastien Bacher Thu, 4 May 2006 16:19:14 +0200 + +gnome-system-tools (2.14.0-0ubuntu7) dapper; urgency=low + + * debian/patches/07_menu_tooltip.dpatch, + debian/patches/08_desktop-changes.dpatch, + debian/patches/64_gksu-in-desktop-files.dpatch: + - use only one patch for desktop changes to the package + - use themed icons suggested by Michael Monreal + (Closes: #41009) + + -- Sebastien Bacher Sun, 30 Apr 2006 17:24:08 +0200 + +gnome-system-tools (2.14.0-0ubuntu6) dapper; urgency=low + + * debian/patches/17_ntpdate.dpatch: + - fix the ntpdate command to use "/etc/network/if-up.d/ntpdate", + change pointed by Gary Coady (Ubuntu: #37230) + * debian/patches/19_fix_ntp_server.dpatch: + - use the correct Ireland ntp server, patch by + Gary Coady (Ubuntu: #38633) + * debian/patches/64_gksu-in-desktop-files.dpatch: + - don't run the programs with gksu but use the sudo mode instead, + fix the issue with the UI running with sudo too (Ubuntu: #23230) + - use startup notification again since it's required without gksu + + -- Sebastien Bacher Thu, 20 Apr 2006 18:19:55 +0200 + +gnome-system-tools (2.14.0-0ubuntu5) dapper; urgency=low + + * patches/64_gksu-in-desktop-files.dpatch: + - remove StartupNotification from the desktop files, gksu does this + now (ubuntu: #19494) + + -- Michael Vogt Tue, 11 Apr 2006 23:05:02 +0200 + +gnome-system-tools (2.14.0-0ubuntu4) dapper; urgency=low + + * patches/66_startup_notification.patch: + - remove StartupNotification from the desktop files, gksu does this + now (ubuntu: #19494) + + -- Michael Vogt Tue, 11 Apr 2006 22:35:53 +0200 + +gnome-system-tools (2.14.0-0ubuntu3) dapper; urgency=low + + * debian/patches/28_break_long_lines: + - add patch from Gary Coady to fix Malone: #31675 + ("Problem when making many users with "users admin. tool" at one time") + + -- Daniel Holbach Tue, 4 Apr 2006 12:33:14 +0200 + +gnome-system-tools (2.14.0-0ubuntu2) dapper; urgency=low + + * debian/patches/07_menu_tooltip.dpatch: + - change share folders tooltip from "Configure which folders are available + for your network neighborhood" to "Configure which folders will be shared + with others" + + -- Sebastien Bacher Thu, 16 Mar 2006 14:27:52 +0100 + +gnome-system-tools (2.14.0-0ubuntu1) dapper; urgency=low + + * New upstream release: + - Translations: bg, bn, ca, cs, cy, da, de, el, en_CA, es, et, eu, fi, fr, + gl, gu, hu, ja, lt, nb, nl, no, pt, pt_BR, ro, ru, sq, sv, zk, vi, + zh_HK, zh_TW. + * debian/patches/98_intltool.dpatch, + debian/patches/99_autoreconf.dpatch: + - updated. + + -- Daniel Holbach Mon, 13 Mar 2006 19:31:18 +0100 + +gnome-system-tools (2.13.2-0ubuntu5) dapper; urgency=low + + * debian/disks.desktop, debian/rules: + - don't overwrite the upstream disks.desktop, that was a hack to get + translations for the previous cycle (Ubuntu: #33893) + + -- Sebastien Bacher Sun, 12 Mar 2006 15:32:12 +0100 + +gnome-system-tools (2.13.2-0ubuntu4) dapper; urgency=low + + * debian/patches/02_use-gksudo.dpatch: + - removed, we use gksu instead now (with the sudo-mode switch) + * debian/patches/64__gksu-in-desktop-files.dpatch: + - enabled, added X-KDE-SubstituteUID=true, removed the TryExec + + -- Michael Vogt Wed, 1 Mar 2006 14:55:14 +0100 + +gnome-system-tools (2.13.2-0ubuntu3) dapper; urgency=low + + * Yet another rebuild with fixed cdbs; this will catch the late replacement + of disks.desktop in debian/rules. + + -- Martin Pitt Fri, 24 Feb 2006 08:48:27 +0100 + +gnome-system-tools (2.13.2-0ubuntu2) dapper; urgency=low + + * Rebuild to get gettext translation domain into .desktop file. + + -- Martin Pitt Thu, 23 Feb 2006 14:16:46 +0100 + +gnome-system-tools (2.13.2-0ubuntu1) dapper; urgency=low + + * New upstream release: 2.13.2 "Wrong way": + - Common: + - Add GTK and GNOME to .desktop Categories, make them validate against + desktop-file-validate. + - Some string improvements + - Translations: ca (Josep Puigdemont i Casamajó), en_CA (Adam + Weinberger), es (Francisco Javier F. Serrador), fi (Ilkka Tuohela), + fr (Benoît Dejean), gl (Ignacio Casal Quinteiro), gu (Ankit Patel), nb + (Kjartan Maraas), nl (Tino Meinen), no (Kjartan Maraas), pt_BR (Evandro + Fernandes Giovanini), sr, sr@Latn (Slobodan D. Sredojevic), th + (Theppitak Karoonboonyanan), vi (Clytie Siddall), zn_CH (Funda Wang) + + -- Daniel Holbach Tue, 31 Jan 2006 17:58:34 +0100 + +gnome-system-tools (2.13.1-0ubuntu1) dapper; urgency=low + + [Daniel Holbach] + * New upstream release: 2.13.0 "Circles": + - Common: + - Fix usage of gnome-doc-utils (Brent Smith) + - Users: + - Improve user privileges UI (Guillaume Desmottes) + - Use ngettext for a couple of strings (Slobodan D. Sredojevic, + garnacho) + - Translations: bg (Alexander Shopov), ca (Josep Puigdemont i Casamajó), + en_CA (Adam Weinberger), es (Francisco Javier F. Serrador), fi (Ilkka + Tuohela), gl (Ignacio Casal Quinteiro), gu (Ankit Patel), ja (Takeshi + AIHANA), nb, no (Kjartan Maraas), sr, sr@Latn (Slobodan D. Sredojevic), + th (Theppitak Karoonboonyanan), vi (Clytie Siddall) + * Resynchronized with Debian. + - debian/control.in: + - removed xlibs-dev dependency. (Malone: #28234) + * debian/patches/01_relibtoolise.dpatch: + - removed. + [Michael Vogt] + * debian/patches/99_autoreconf.dpatch: + - updated, gave it some extra aclocal -I m4;automake;autoconf love + + -- Michael Vogt Mon, 16 Jan 2006 22:46:53 +0100 + +gnome-system-tools (2.13.0-0ubuntu2) dapper; urgency=low + + * debian/rules: + - added --disable-scrollkeeper. + + -- Daniel Holbach Mon, 16 Jan 2006 10:21:49 +0100 + +gnome-system-tools (1.4.1-2) unstable; urgency=low + + [ J.H.M. Dassen (Ray) ] + * [debian/patches/01_relibtoolise.dpatch] Added; does away with unused + direct dependencies. + + [ Loic Minier ] + * Doesn't seem to need a xlibs-dev dep. (Closes: #346720) + [debian/control, debian/control.in] + + -- Loic Minier Mon, 9 Jan 2006 22:25:07 +0100 + +gnome-system-tools (2.13.0-0ubuntu1) dapper; urgency=low + + [Daniel Holbach] + * New upstream release: "Sick": + - Common: + - Use gnome-doc-utils (garnacho) + - Disks: + - Use yes-no stock icons instead of checkboxes for cd-rom + capabilities (Felix Riemann) + - Services: + - Strings improvements (Adam Weinberger) + - Time: + - Strings improvements (Adam Weinberger) + * debian/control.in: + - added gnome-doc-utils to Build-Depends. + * Resynchronized with Debian. (Ubuntu: #21809) + * debian/patches/04_install_ntp.dpatch, + - updated + [Michael Vogt] + * debian/patches/10_relibtoolize.dpatch: + - removed. + * debian/patches/98_intltool.dpatch: + debian/patches/99_autoreconf.dpatch: + - added + + -- Michael Vogt Fri, 6 Jan 2006 12:53:24 +0100 + +gnome-system-tools (1.4.1-1) unstable; urgency=low + + * New upstream release. + * Remove patch 32_missing-gst-platform-include.dpatch, it was included + by upstream. + + -- Ondřej Surý Fri, 30 Dec 2005 15:18:57 +0100 + +gnome-system-tools (1.4.1-0ubuntu2) dapper; urgency=low + + * debian/patches/24_nautilus_share_gksudo.dpatch: + - fix a typo (Ubuntu: #17937) + + -- Sebastien Bacher Mon, 2 Jan 2006 13:10:12 +0100 + +gnome-system-tools (1.4.1-0ubuntu1) dapper; urgency=low + + * New upstream release: + - Build fixes (Dann Frazier, garnacho) + - Network: Fixed crash reported in bug #317650 (garnacho) + - Translations: bg (Yavor Doganov, Vladimir Petkov), cs (Stanislav + Brabec), es (Francisco Javier F. Serrador), et (Ivar Smolin), eu + (Inaki Larranaga), fa (Meelad Zakaria, Elnaz Sarbar), fi (Ilkka + Tuohela), fr (Christophe Merlet), gl (Ignacio Casal Quinteiro), + it (Francesco Marletta), ku (Erdal Ronahi), pt_BR (Guilherme de S. + Pastore), sk (Ivan Noris), sv (Christian Rose), th (Theppitak + Karoonboonyanan), vi (Clytie Siddall), zh_CN (Funda Wang) + * debian/patches/10_relibtoolize.dpatch: + - updated. + * debian/patches/25_fix_locations_from_cvs.dpatch, + debian/patches/32_missing-gst-platform-include.dpatch: + - dropped, done upstream. + * debian/patches/04_install_ntp.dpatch, + debian/patches/06_install_smbnfs.dpatch: + - updated. + + -- Daniel Holbach Thu, 8 Dec 2005 22:37:00 +0100 + +gnome-system-tools (1.4.0-4) unstable; urgency=high + + * Urgency high for RC bug fix. + * Add misc:Depends to pull a gconf dependency. (Closes: #333116) + [debian/control, debian/control.in] + + -- Loic Minier Tue, 11 Oct 2005 21:52:46 +0200 + +gnome-system-tools (1.4.0-3) unstable; urgency=low + + * List debian/patches/32_missing-gst-platform-include.dpatch in + debian/patches/00list, really closes: #330104. [debian/patches/00list] + + -- Loic Minier Mon, 3 Oct 2005 21:26:46 +0200 + +gnome-system-tools (1.4.0-4ubuntu2) dapper; urgency=low + + * debian/patches/02_use-gksudo.depatch: + - updated to use "X-KDE-SubstituteUID=true". + + -- Sebastien Bacher Wed, 7 Dec 2005 21:52:35 +0100 + +gnome-system-tools (1.4.0-4ubuntu1) dapper; urgency=low + + * Resynchronize with Debian: + - AMD64 crashers: + - added debian/patches/27_amd64_fix_service_crash.dpatch + - added debian/patches/26_use_gnu_crypt.dpatch + - Translations: + - added debian/patches/05_diskstranslations.dpatch, + - added debian/patches/23_i18n.dpatch, + - Package installation: + - added debian/patches/03_install_packages.dpatch, + - added debian/patches/04_install_ntp.dpatch, + - added debian/patches/06_install_smbnfs.dpatch, + - Ubuntu specific (gksudo): + - added debian/patches/16_use_sudo.dpatch, + - added debian/patches/02_use-gksudo.dpatch, + - added debian/patches/24_nautilus_share_gksudo.dpatch, + - disabled debian/patches/64_gksu-in-desktop-files.dpatch, + - User handling: + - added debian/profiles.xml, gnome-system-tools.install to install it + - added debian/patches/21_disable_login_edit.dpatch, + - added debian/patches/18_disable_uid.dpatch, + - added debian/disks.desktop, modified debian/rules to install it + - added debian/patches/25_fix_locations_from_cvs.dpatch, + - added debian/patches/17_ntpdate.dpatch, + - added debian/patches/22_use_default_serial_speed.dpatch + - udpated debian/patches/10_relibtoolize.dpatch. + - debian/control.in: + - bumped Build-Dep of system-tools-backends-dev to (>= 1.3.0) + - remove Runlevels from description + - debian/rules: + - don't --enable-boot + - debian/copyright: + - add Carlos Garnacho + + -- Daniel Holbach Wed, 16 Nov 2005 12:00:44 +0100 + +gnome-system-tools (1.4.0-4) unstable; urgency=high + + * Urgency high for RC bug fix. + * Add misc:Depends to pull a gconf dependency. (Closes: #333116) + [debian/control, debian/control.in] + + -- Loic Minier Tue, 11 Oct 2005 21:52:46 +0200 + +gnome-system-tools (1.4.0-3) unstable; urgency=low + + * List debian/patches/32_missing-gst-platform-include.dpatch in + debian/patches/00list, really closes: #330104. [debian/patches/00list] + + -- Loic Minier Mon, 3 Oct 2005 21:26:46 +0200 + +gnome-system-tools (1.4.0-2) unstable; urgency=low + + * Section is optional not extra. [debian/control, debian/control.in] + * Add patch to fix missing include; patch by Dann Frazier AT hp.com. + (Closes: #330104) [debian/patches/32_missing-gst-platform-include.dpatch] + + -- Loic Minier Sun, 2 Oct 2005 19:41:58 +0200 + +gnome-system-tools (1.4.0-1) unstable; urgency=low + + [ Josselin Mouette ] + * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. + + [ Loic Minier ] + * New upstream releases. + * Fix usage of Copyright and License [debian/copyright] + * Update FSF address. [debian/copyright] + * Bump up Standards-Version to 3.6.2. [debian/control, debian/control.in] + * Bump system-tool-backends dep to >= 1.3.0. + [debian/control, debian/control.in] + * Update watch file for 1.4 series. [debian/watch] + * Suggest ntp instead of ntp-simple. [debian/control, debian/control.in] + * Change := to += for configure flags. [debian/rules] + * Fix dpatch and add a new patch inspired by Ubuntu to use gksu in desktop + files. [debian/rules, debian/patches/00list, + debian/patches/64_gksu-in-desktop-files.dpatch] + * Recommend gksu. [debian/control, debian/control.in] + + -- Loic Minier Fri, 16 Sep 2005 22:18:44 +0200 + +gnome-system-tools (1.4.0-0ubuntu10) breezy; urgency=low + + * debian/patches/27_amd64_fix_service_crash.dpatch: + - Fix incorrect type in tree-model (G_TYPE_INT -> G_TYPE_POINTER) + This fixes a crash on amd64 (Ubuntu #16834) + + -- Michael Vogt Thu, 6 Oct 2005 20:07:55 +0200 + +gnome-system-tools (1.4.0-0ubuntu9) breezy; urgency=low + + * debian/patches/26_use_gnu_crypt.dpatch: + - Use crypt(3) in md5 mode to generate the crypted password on amd64. + This fixes a crash on amd64 (Ubuntu #15428) + + -- Michael Vogt Thu, 6 Oct 2005 13:39:48 +0200 + +gnome-system-tools (1.4.0-0ubuntu8) breezy; urgency=low + + * debian/disks.desktop: + - updated (Ubuntu: #17020). + + -- Sebastien Bacher Tue, 4 Oct 2005 22:29:51 +0200 + +gnome-system-tools (1.4.0-0ubuntu7) breezy; urgency=low + + * debian/disks.desktop, debian/rules: + - use this version of the desktop file with translations + * debian/patches/05_translations.dpatch: + - not required, rosetta has these changes. + * debian/patches/05_diskstranslations.dpatch: + - fix some translations issue with the disks utility, + patch by Zygmunt Krynicki . + * debian/patches/07_missing-gst-platform-include.dpatch: + - patch from Debian. + + -- Sebastien Bacher Mon, 3 Oct 2005 16:54:57 +0200 + +gnome-system-tools (1.4.0-0ubuntu6) breezy; urgency=low + + * debian/profiles.xml: + - the default profiles is "Desktop" (Ubuntu: #10403). + + -- Sebastien Bacher Wed, 28 Sep 2005 22:22:49 +0200 + +gnome-system-tools (1.4.0-0ubuntu5) breezy; urgency=low + + * debian/rules: + - don't build boot-admin, it has issues with the Debian/Ubuntu grub files. + + -- Sebastien Bacher Wed, 28 Sep 2005 12:55:57 +0200 + +gnome-system-tools (1.4.0-0ubuntu4) breezy; urgency=low + + * debian/patches/25_fix_locations_from_cvs.dpatch: + - fix the locations save/restore feature (ubuntu #15597) + + -- Michael Vogt Mon, 19 Sep 2005 11:48:50 +0200 + +gnome-system-tools (1.4.0-0ubuntu3) breezy; urgency=low + + * debian/patches/24_nautilus_share_gksudo.dpatch: + - use gksudo in the nautilus extension to get root (ubuntu #15247) + + -- Michael Vogt Fri, 16 Sep 2005 16:25:36 +0200 + +gnome-system-tools (1.4.0-0ubuntu2) breezy; urgency=low + + * debian/patches/23_i18n.dpatch: + - add missing disk/* to POTFILES.in and regenerate + gnome-system-tools.pot + + -- Michael Vogt Thu, 15 Sep 2005 13:12:07 +0200 + +gnome-system-tools (1.4.0-0ubuntu1) breezy; urgency=low + + * New upstream version. + * debian/patches/05_translations.dpatch: + - updated. + * debian/patches/10_relibtoolize.dpatch: + - updated. + * debian/watch: + - updated. + + -- Sebastien Bacher Mon, 5 Sep 2005 08:35:07 +0200 + +gnome-system-tools (1.3.92-0ubuntu1) breezy; urgency=low + + * New upstream version. + * debian/patches/05_translations.dpatch: + - updated. + * debian/patches/10_relibtoolize.dpatch: + - updated. + + -- Sebastien Bacher Wed, 24 Aug 2005 19:15:59 +0200 + +gnome-system-tools (1.3.2-0ubuntu2) breezy; urgency=low + + * Rebuild with the new cairo version + + -- Sebastien Bacher Thu, 18 Aug 2005 17:19:22 +0000 + +gnome-system-tools (1.3.2-0ubuntu1) breezy; urgency=low + + * New upstream version. + * debian/patches/03_install_packages.dpatch: + - updated. + * debian/patches/06_install_smbnfs.dpatch: + - updated. + * debian/patches/10_relibtoolize.dpatch: + - updated. + + -- Sebastien Bacher Wed, 10 Aug 2005 00:28:05 +0200 + +gnome-system-tools (1.3.1-0ubuntu1) breezy; urgency=low + + * New upstream version: + Network: + - small UI fixes (garnacho) + - Add ordering to interfaces, + so most used or most important are shown first. + - Improve DNS and search domains input cancelation. + Time: + - Fix compilation issues with gcc 4.0. + - Really close the time zone and time servers dialogs + when pressing on the X (Ubuntu: #12691). + Users: + - String improvements. + - Really close the profiles dialog when pressing the X. + * debian/patches/05_translations.dpatch: + - updated. + * debian/patches/10_relibtoolize.dpatch: + - updated. + * debian/rules: + - don't install scrollkeeper files. + + -- Sebastien Bacher Sat, 30 Jul 2005 21:36:45 +0200 + +gnome-system-tools (1.3.0.1-0ubuntu2) breezy; urgency=low + + * debian/patches/02_use-gksudo.dpatch: + - fixed the list of desktop files using gksudo. + + -- Sebastien Bacher Thu, 7 Jul 2005 01:43:08 +0200 + +gnome-system-tools (1.3.0.1-0ubuntu1) breezy; urgency=low + + * New upstream version: + General + - Fixed some typos. + - Center password dialog on main dialog. + Services + - Brand new UI, with lots of goodies. + Network + - Fix behavior of ESC key in combination of cellrenderer + editing + dialog cancelling. + - Improved IP filtering. + - Added option for using the peer DNS in dialup connection. + - Removed duplicated accelerators. + - Added option for WEP key type. + - Allow IPv6 DNS. + - Improved some strings. + Time + - Improved focus chain. + - Improved some strings and typos. + Boot + - Improved some strings and typos. + Disks + - Improved some strings. + Shares + - Improved some strings. + - Really check that all necessary fields are filled before adding a share. + Users + - Plugged some leaks. + - Remove unnecessary commas when showing users' data. + - Improved some strings and typos. + * debian/control.in: + - updated the Build-Depends. + * 03_install_smb.dpatch: + - renamed to 03_install_packages, updated to install different packages, + thanks to Guillaume Desmottes for the patch. + * debian/patches/04_install_ntp.dpatch: + - updated. + * debian/patches/05_translations.dpatch: + - updated. + * debian/patches/06_install_smbnfs.dpatch: + - dialog to install smb or nfs when using shares-admin, + - patch from Guillaume Desmottes (Ubuntu: #6743). + * debian/patches/10_relibtoolize.dpatch: + - updated. + * debian/patches/19_fix_initial_ppp.dpatch: + - fixed with the new version. + * debian/patches/20_add_peerdns.dpatch: + - fixed with the new version. + * debian/watch: + - updated. + + -- Sebastien Bacher Wed, 6 Jul 2005 16:34:26 +0200 + +gnome-system-tools (1.2.0-2ubuntu3) breezy; urgency=low + + * debian/postinst: + - dh_gconf does this job. + + -- Sebastien Bacher Tue, 5 Jul 2005 15:31:44 +0200 + +gnome-system-tools (1.2.0-2ubuntu2) breezy; urgency=low + + * fixed a FTBFS + + -- Michael Vogt Thu, 23 Jun 2005 19:24:05 +0200 + +gnome-system-tools (1.2.0-2ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Michael Vogt Thu, 23 Jun 2005 16:12:38 +0200 + +gnome-system-tools (1.2.0-2) unstable; urgency=low + + * Upload to unstable (GNOME Team upload). + * Deactivated services support which is too buggy and not adequate + with Debian systems (thanks to Clement `nodens' Hermann for his nice + testing report). + * Removed clean rule hack to work around #299010. + * Minor description update. + * Removed services menu entry and added disks menu entry with + corresponding xpm image. + + -- Marc Dequènes (Duck) Sun, 12 Jun 2005 20:14:08 +0200 + +gnome-system-tools (1.2.0-1) experimental; urgency=low + + * Marq Dequènes (Duck): + + New upstream release (Closes: #300593). + + Removed the following patches now obsolete : + - 05_sarge.dpatch + - 10_relibtoolize.dpatch + + Suggests 'wvdial' useful for networking tool (Closes: #291881). + + Suggests 'ntp-simple' instead of 'ntp' (Closes: #290370). + + Converted to CDBS (could not resist the temptation ;-). + + Rewrote 'debian/copyright'. + + Removed 'ximian-setup-tools' transitional package. + + Fixed 'debian/menu'. + - unquoted-string-in-menu-item + - menu-icon-not-in-xpm-format + - s/runlevel/services/ + + Removed unnecessary call to ldconfig in maintainer scripts (CDBS + parameter in 'debian/rules'). + + Activated 'services' and 'disks' tools to test them in experimental + and see if they can now be trusted (like 'boot' tool was enabled in + 2.8). + * Jose Carlos: + + Add watch file for this package. + + -- Jose Carlos Garcia Sogo Sat, 7 May 2005 17:42:10 +0200 + +gnome-system-tools (1.2.0-0ubuntu9) breezy; urgency=low + + * set default serial_speed to 115200 + + -- Michael Vogt Tue, 21 Jun 2005 16:15:40 +0200 + +gnome-system-tools (1.2.0-0ubuntu8) breezy; urgency=low + + * Add build dependency intltool to debian/control.in. *sigh* + + -- Martin Pitt Fri, 10 Jun 2005 13:52:02 +0000 + +gnome-system-tools (1.2.0-0ubuntu7) breezy; urgency=low + + * debian/rules: Automatically generate a POT file. + + -- Martin Pitt Fri, 10 Jun 2005 12:31:16 +0000 + +gnome-system-tools (1.2.0-0ubuntu6) hoary; urgency=low + + * debian/profiles.xml: Put Desktop and Administrator users into groups + 'video' and 'lpadmin'. (Ubuntu #7313, #7430) + * Added debian/patches/21_disable_login_edit.dpatch: + - Disable changing the username for now; this can be reevaluated for + Breezy, but for Hoary we need something safe. (Ubuntu #6387) + + -- Martin Pitt Wed, 6 Apr 2005 09:05:20 +0200 + +gnome-system-tools (1.2.0-0ubuntu5) hoary; urgency=low + + * debian/patches/05_translations.dpatch: + - translations update. + + -- Sebastien Bacher Mon, 4 Apr 2005 18:31:54 +0200 + +gnome-system-tools (1.2.0-0ubuntu4) hoary; urgency=low + + * debian/patches/20_add_peerdns.dpatch: + - add a peerdns property to the isdn/modem object + - activate it when "default gw to internet" is set + - make "default gw to internet" on by default for new users + + -- Michael Vogt Fri, 1 Apr 2005 13:51:57 +0200 + +gnome-system-tools (1.2.0-0ubuntu3) hoary; urgency=low + + * debian/patches/19_fix_initial_ppp: + - fix the problem that g-s-t does not set "noauth" for newly + created connections + + -- Michael Vogt Tue, 29 Mar 2005 18:42:20 +0200 + +gnome-system-tools (1.2.0-0ubuntu2) hoary; urgency=low + + * debian/patches/05_translations.dpatch: + - translations update. + + -- Sebastien Bacher Tue, 22 Mar 2005 00:20:23 +0100 + +gnome-system-tools (1.2.0-0ubuntu1) hoary; urgency=low + + * New upstream release: + - fixed possible crasher when closing the main dialog with the top-left X + (Hoary: #6160). + - handled correctly "auto" values (Hoary: #5724). + + -- Sebastien Bacher Tue, 8 Mar 2005 01:22:39 +0100 + +gnome-system-tools (1.1.92-0ubuntu1) hoary; urgency=low + + * New upstream release + + -- Michael Vogt Tue, 1 Mar 2005 22:56:45 +0100 + +gnome-system-tools (1.1.91-0ubuntu3) hoary; urgency=low + + * debian/patches/18_disable_uid.dpatch: + - Made uid field disabled when modifying existing users (Hoary: #6092). + * debian/profiles.xml: + - Added administrator profile and changed Desktop profile + to not allow get administrator rights by default (Hoary: #1849) + + -- Sivan Greenberg Wed, 16 Feb 2005 16:27:50 +0200 + +gnome-system-tools (1.1.91-0ubuntu2) hoary; urgency=low + + * debian/patches/17_ntpdate.dpatch: + - patch from Vincent Untz , + add a "Synchronize now" button (Hoary: #4191). + + -- Sebastien Bacher Mon, 14 Feb 2005 12:34:09 +0100 + +gnome-system-tools (1.1.91-0ubuntu1) hoary; urgency=low + + * New upstream release: + - split the backends/frontends in two separated packages. + Network: + - do not crash with wrong hosts file syntax (Hoary: #5856). + * debian/control.in: + - Depends on system-tools-backends. + * debian/patches/04_install_ntp.dpatch: + - updated, fix the duplicated button (Hoary: #6177). + * debian/patches/05_ubuntu-no-warning.dpatch, + debian/patches/17_fix_groups_descriptions.dpatch, + debian/patches/18_fix_config_location.dpatch, + debian/patches/19_add_scanner_group.dpatch: + - system-tools-backends patch. + * debian/patches/10_relibtoolize.dpatch: + - updated. + + -- Sebastien Bacher Tue, 8 Feb 2005 20:53:37 +0100 + +gnome-system-tools (1.1.90-0ubuntu3) hoary; urgency=low + + * debian/gnome-system.tools.install: + - Installs ubuntu proper user profiles for g-s-t. + * debian/rules: + - Added dh_install to make files go the right place from .install file. + * 17_fix_groups_descriptions.dpatch: + - Fixes some group description. + * 18_fix_config_location.dpatch: + - Make g-s-t use /etc/gnome-system-tools the persistent config storage. + * 19_add_scanner_group.dpatch: + - Make users-conf.in recognize the "scanner" group. + * profiles.xml: + - Add scanner group to default desktop user profile. + + -- Sivan Greenberg Tue, 1 Feb 2005 15:08:18 +0200 + +gnome-system-tools (1.1.90-0ubuntu2) hoary; urgency=low + + * debian/control.in: + - Build-Depends on libnautilus-extension-dev. + + -- Sebastien Bacher Thu, 27 Jan 2005 10:20:00 +0100 + +gnome-system-tools (1.1.90-0ubuntu1) hoary; urgency=low + + * New upstream release: + General: + - removed tool descriptions in main windows. + - use the new GtkMessageDialog API. + - make the main windows behave like the other dialogs with cancel/OK. + Boot: + - use GtkFileChooserButton. + Network: + - fixed bootproto stanzas in debian. + - made it stop blocking with buggy wvdialconf. + - use a more generic regexp for getting phone numbers + (Hoary: #4452, #4453). + - made it explicitly drop the dhcp connection when doing ifconfig down + (Hoary: #2228). + - made it to really delete profiles (Hoary: #5796). + - made it to really save essid and WEP keys in profiles. + Disks: + - fixed an important bug in the scsi bus scanning. + - fixed the DMA detection (Hoary: #4469). + - UI Fixes. + Shares: + - added extra checks to know whether SMB/NFS servers are active. + - improved shared paths saving. + - fixed active interfaces network/netmask detection for the NFS acl dialog. + - require sambe to share folders (Hoary: #5772). + - use the Nautilus plugins API for the context menu in folders. + Time: + - use ntp-server instead of ntp-simple or ntp-refclock in Debian. + * debian/patches/03_install_smb.dpatch: + - updated. + * debian/patches/04_install_ntp.dpatch: + - updated. + * debian/patches/06_interfaces.dpatch: + - removed, the changes are in the new version. + * debian/patches/10_relibtoolize.dpatch: + - updated. + * debian/patches/14_ntp_detection.dpatch: + - these changes are in the new upstream release. + + -- Sebastien Bacher Tue, 25 Jan 2005 15:31:16 +0100 + +gnome-system-tools (1.1.4.1-0ubuntu4) hoary; urgency=low + + * debian/patches/16_use_sudo: use sudo to do all authentication + + -- Michael Vogt Fri, 21 Jan 2005 23:25:35 +0100 + +gnome-system-tools (1.1.4.1-0ubuntu3) hoary; urgency=low + + * debian/patches/00list: + - updated so the interfaces patch is really used. + + -- Sebastien Bacher Fri, 21 Jan 2005 16:01:10 +0100 + +gnome-system-tools (1.1.4.1-0ubuntu2) hoary; urgency=low + + * debian/patches/06_interfaces.dpatch: + - upstream patch to fix the iface syntax in network/interfaces + (Hoary: #5578). + + -- Sebastien Bacher Mon, 17 Jan 2005 12:56:42 +0100 + +gnome-system-tools (1.1.4.1-0ubuntu1) hoary; urgency=low + + * New upstream release: + Users: + - fixed groups in profiles stuff. + - small UI fixes. + Shares: + - use GtkFileChooserButton. + General: + - fixed supported/unsupported tools compilation. + * debian/patches/10_relibtoolize.dpatch: + - updated. + + -- Sebastien Bacher Thu, 13 Jan 2005 17:08:24 +0100 + +gnome-system-tools (1.1.4-0ubuntu1) hoary; urgency=low + + * New upstream release: + Users: + - added default groups in profiles. + Network: + - added support for isdn interfaces. + Shares: + - readded general Samba Settings. + General: + - added m4 file for using the backends from other modules. + - made password dialog more HIG. + * debian/patches/01_menu-changes.dpatch: + - removed, these changes are in the new version. + * debian/patches/06_gateway.dpatch: + - removed, that's fixed in the new version. + * debian/patches/10_relibtoolize.dpatch: + - updated. + + -- Sebastien Bacher Wed, 12 Jan 2005 13:00:26 +0100 + +gnome-system-tools (1.1.3-0ubuntu2) hoary; urgency=low + + * debian/patches/06_gateway.dpatch: + - upstream patch to fix the gateway configuration (Hoary: #5002). + + -- Sebastien Bacher Fri, 31 Dec 2004 13:04:42 +0100 + +gnome-system-tools (1.1.3-0ubuntu1) hoary; urgency=low + + * New upstream release: + - async communication with backend, allowing frontends to show a + dialog if a directive takes too long. + - fully rewritten network tool. + * debian/patches/01_menu-changes.dpatch: + - updated (Hoary: #4700). + * debian/patches/02_use-gksudo.dpatch: + - shares-admin use gksuo too (Hoary: #3244). + - updated. + * debian/patches/03_install_smb.dpatch: + - updated. + * debian/patches/10_relibtoolize.dpatch: + - updated. + + -- Sebastien Bacher Tue, 21 Dec 2004 22:54:18 +0100 + +gnome-system-tools (1.1.0-0ubuntu2) hoary; urgency=low + + * Switch the services manager off. + * debian/control.in: + - updated the description (Closes: #2682). + * debian/rules: + - updated the configure parameters. + + -- Sebastien Bacher Sun, 7 Nov 2004 20:38:39 +0100 + +gnome-system-tools (1.1.0-0ubuntu1) hoary; urgency=low + + * New upstream release. + * debian/patches/10_relibtoolize.dpatch: + - updated. + * debian/patches/11_new_user_groups.dpatch: + - removed, this part of the UI has changed. + * debian/patches/12_essid.dpatch: + - removed, the changes are in the new version. + * debian/patches/13_wep_key.dpatch: + - removed, the changes are in the new version. + * debian/patches/15_fix_double_free.dpatch: + - removed, the changes are in the new version. + * debian/patches/16_install_smb.dpatch: + - updated. + + -- Sebastien Bacher Wed, 3 Nov 2004 12:15:32 +0100 + +gnome-system-tools (1.0.0-1) unstable; urgency=medium + + * New upstream release + + Updated translations for GNOME 2.8 release + + * debian/rules: + + Don't build services tool, as it is causing lot of troubles in Debian, + moving around services. (Closes: #271859, 188425) + + * debian/patches: + + 10_relibtoolize: updated + + -- Jose Carlos Garcia Sogo Sun, 26 Sep 2004 10:56:25 +0200 + +gnome-system-tools (1.0.0-0ubuntu8) hoary; urgency=low + + * debian/patches/16_install_smb.dpatch: + - patch by Vincent Untz to add the function to install + a package with a button. Use that to add a button to install samba + (Hoary: #1739). + * debian/patches/17_install_ntp.dpatch: + - patch by Vincent Untz to add a button to install + ntp-simple (Hoary: #1418). + + -- Sebastien Bacher Tue, 2 Nov 2004 12:19:59 +0100 + +gnome-system-tools (1.0.0-0ubuntu7) warty; urgency=low + + * debian/patches/15_fix_double_free.dpatch: + - added from upstream CVS, thanks to Carlos Garnacho + - fix a double free() which caused the network manager (and other tools) + to crash very often (Warty bug #2177) + + -- Martin Pitt Thu, 14 Oct 2004 18:49:22 +0200 + +gnome-system-tools (1.0.0-0ubuntu6) warty; urgency=low + + * debian/patches/13_wep_key.dpatch: + - updated. + + -- Sebastien Bacher Tue, 5 Oct 2004 23:35:08 +0200 + +gnome-system-tools (1.0.0-0ubuntu5) warty; urgency=low + + * debian/patches/13_wep_key.dpatch: + - patch by Vincent Untz to add an entry for the WEP + keys in the interface (Warty: #1851). + * debian/patches/14_ntp_detection.dpatch: + - patch by Vincent Untz to fix the ntp server detection + (Warty: #2024). + + -- Sebastien Bacher Tue, 5 Oct 2004 22:22:59 +0200 + +gnome-system-tools (1.0.0-0ubuntu4) warty; urgency=low + + * debian/patches/12_essid.dpatch: + - patch by Vincent Untz to add a mention of the + ESSID after the Network Name (Warty: #1295). + + -- Sebastien Bacher Thu, 30 Sep 2004 17:26:14 +0200 + +gnome-system-tools (1.0.0-0ubuntu3) warty; urgency=low + + * modified 11_new_user_groups: put new users also in group 'scanner' (Warty + bug #1485) + + -- Martin Pitt Wed, 29 Sep 2004 10:57:18 +0200 + +gnome-system-tools (1.0.0-0ubuntu2) warty; urgency=low + + * 11_new_user_groups: put newly created users in some standard local groups + by default: audio, cdrom, dialout, floppy, lpadmin, video, plugdev + (Warty bug #1430) + + -- Martin Pitt Mon, 20 Sep 2004 13:16:18 +0200 + +gnome-system-tools (1.0.0-0ubuntu1) warty; urgency=low + + * New upstream release. + * 10_relibtoolize.dpatch: + - updated. + + -- Sebastien Bacher Tue, 14 Sep 2004 00:25:57 +0200 + +gnome-system-tools (0.92.0-1) unstable; urgency=medium + + * New upstream release. + * Urgency medium as we still have a chance to put this version in Sarge, + which is interesting for the LSB check fix (below) + * debian/patches: + - 05_sarge: modified. check_debian patch now included upstream, adding a + patch for people going through check_lsb instead. + - 10_relibtoolize: updated. + * debian/rules: + - enable compilation of boot and services tools + * Menu organization complies with GNOME usage. (Closes: #254483, #237485) + + -- Jose Carlos Garcia Sogo Wed, 8 Sep 2004 22:07:04 +0200 + +gnome-system-tools (0.92.0-0ubuntu2) warty; urgency=low + + * debian/patches/02_use-gksudo.dpatch: + - launch all the system tools with gksudo, avoiding the need for a root + password. + + -- Jeff Waugh Thu, 2 Sep 2004 12:55:46 +1000 + +gnome-system-tools (0.92.0-0ubuntu1) warty; urgency=low + + * New upstream release. + + -- Sebastien Bacher Wed, 1 Sep 2004 20:33:47 +0200 + +gnome-system-tools (0.91.0-0ubuntu1) warty; urgency=low + + * New upstream release: + - improved communication with su/ssh, now works with users that don't need + password for becoming root. + - show all the groups when adding/modifying an user. + * debian/patches/05_sarge: + - removed since the changes are included in the new version. + * debian/patches/10_relibtoolize: + - updated. + + -- Sebastien Bacher Sat, 21 Aug 2004 23:37:35 +0200 + +gnome-system-tools (0.90.0-3) unstable; urgency=low + + * debian/rules: + + Using now dh_scrollkeeper and dh_gconf. This should move schemas to /etc + to /usr, where they belong. + + -- Jose Carlos Garcia Sogo Fri, 6 Aug 2004 22:24:41 +0200 + +gnome-system-tools (0.90.0-2) unstable; urgency=low + + * The "I'm quicker than FTBFS bug submitters" release. + * Added missing Build-Dependency on scrollkeeper. + + -- Jose Carlos Garcia Sogo Fri, 6 Aug 2004 18:27:33 +0200 + +gnome-system-tools (0.90.0-1) unstable; urgency=low + + * New upstream version. (Closes: #258228) + + /etc/hostname ended with newline. (Closes: #258551) + + it handles correctly multiboot configs. (Closes: #193300) + * /etc/hostname shouldn't contain fqdn (Closes: #258550) + * debian/patches: + + 05_sarge: fix detection of Sarge, now that /etc/debiaan_version + contains 3.1. Patch from Frederic Peters (Closes: #262080) + + 10_relibtoolize: updated + + * debian/control.in + + removed libvte-dev and libcracklib2-dev Build-Dependency, as they're not + needed any longer. + + -- Jose Carlos Garcia Sogo Wed, 4 Aug 2004 16:46:06 +0200 + +gnome-system-tools (0.90.0-2ubuntu2) warty; urgency=low + + * debian/patches/01_menu-changes.dpatch: + - add Jeff's patch for the menu changes. Now the system tools are in + "Desktop Preferences" -> "System Tools". + + -- Sebastien Bacher Thu, 19 Aug 2004 13:05:11 +0200 + +gnome-system-tools (0.90.0-2ubuntu1) warty; urgency=low + + * debian/patches/05_ubuntu-no-warning.dpatch: + - don't display a warning about warty not supported (Warty #461). + + -- Sebastien Bacher Mon, 9 Aug 2004 15:43:59 +0200 + +gnome-system-tools (0.33.0-1) unstable; urgency=low + + * New upstream release (Closes: #249759) + - Fixes problem with "Less" option not returning to "graphical mode" + (Closes: #231129) + - Offers a valid group id or new group (Closes: #211736) + - Init tool now ignores backups (Closes: #203801) + * debian/patches: 10_relibtoolize.dpatch + + -- Jose Carlos Garcia Sogo Sat, 29 May 2004 10:36:51 +0200 + +gnome-system-tools (0.32.0-2) unstable; urgency=low + + * Build-Depend in libxml-parser-perl to fix intltool FTBFS. + This is a strange method, but... (Closes: #230952) + + -- Jose Carlos Garcia Sogo Sat, 21 Feb 2004 17:10:59 +0100 + +gnome-system-tools (0.32.0-1) unstable; urgency=low + + * New upstream release. (Closes: #232539) + * Users-admin patch applied upstream. + * Fixed again issue with intltool failing on buildds (Closes: #230952) + + -- Jose Carlos Garcia Sogo Sat, 14 Feb 2004 20:10:08 +0100 + +gnome-system-tools (0.31.0-3) unstable; urgency=high + + * Applied patch from upstream to fix users-admin deleting /etc/group file. + Urgency high as this package was pushed to sarge so meta-gnome2 could do it. + (Closes: #227683) + * Using dpatch now. Build-Depend on it. + * Fixed menu entry for runlevel admin. (Closes: #228332) + * Re-intltoolize to be able to build the pakage with intltool 0.29 + + -- Jose Carlos Garcia Sogo Sat, 24 Jan 2004 20:46:07 +0100 + +gnome-system-tools (0.31.0-2) unstable; urgency=low + + * Modified src/common/CommonMakefile so those .desktop file are + not installed in $(DESTDIR)$(DESTIDR)/$(applications) which caused them + to be packaged in /home/jose/devel/gst... (Closes: #226377) + + -- Jose Carlos Garcia Sogo Tue, 6 Jan 2004 12:43:35 +0100 + +gnome-system-tools (0.31.0-1) unstable; urgency=low + + * New upstream release. + * Added intltool build dependency. + + -- Jose Carlos Garcia Sogo Sat, 3 Jan 2004 18:37:39 +0100 + +gnome-system-tools (0.30.0-1) unstable; urgency=low + + * The "Xmas is here. BUY NOW!" release. + * New upstream version. + + Includes NMU path in backends/time-conf.in + * ACK of previous NMU. (Closes: #220801) + * Standars-Version upped to 3.6.1. No changes needed. + + -- Jose Carlos Garcia Sogo Sun, 14 Dec 2003 16:53:28 +0100 + +gnome-system-tools (0.29.0-0.1) unstable; urgency=low + + * Non-Maintainer Upload. + * New upstream release (closes: #208450). + + doesn't do unwanted changes to grub's configuration + (closes: #215595, #198973). + + boot-admin now groks devfs and separate /boot partitions + (closes: #198974) + + fixes syntax error in time-conf backend + (closes: #217607, #199115, #206006). + * backends/backends/service.pl.in: make gst_service_sysv_installed() accept + two arguments. Patch from Alvaro del Castillo . + * backends/backends/time-conf.in: + + create a "debian-3.0" platform and configure it to look for ntp-simple + or ntp-refclock init scripts (closes: #200192). + * debian/control: + + remove tabs from long description (closes: #215595). + + suggest samba-common (closes: #198721). + + add a recommendation to remove x-s-t in its long description. + * debian/rules: + + remove gnome-system-tools.schemas on clean. + + -- Jordi Mallach Fri, 14 Nov 2003 15:14:49 +0100 + +gnome-system-tools (0.26.1-1) unstable; urgency=low + + * New upstream release: + - Grub config is not destroyed any more. (Closes: #194640) + * Description improved. Now it should be clearer for users and also you + should find GST when looking for "network config" or so using apt-cache. + (Closes: #197892) + + -- Jose Carlos Garcia Sogo Wed, 18 Jun 2003 21:03:23 +0200 + +gnome-system-tools (0.26.0-1) unstable; urgency=low + + * New upstream release. + * Added programs to Debian menu. (Closes: #193089) + * ximian-setup-tools package is "arch: all" now. (Closes: #193965) + + -- Jose Carlos Garcia Sogo Thu, 22 May 2003 23:49:56 +0200 + +gnome-system-tools (0.25.0-1) unstable; urgency=low + + * New upstream version: + - Added IPv6 support. (Closes: #170900) + + * Added a XST transitional package to upgrade from Woody automatically. + + -- Jose Carlos Garcia Sogo Tue, 6 May 2003 21:09:22 +0200 + +gnome-system-tools (0.24.0-1) unstable; urgency=low + + * New upstream version. Bugfixes. + + -- Jose Carlos Garcia Sogo Wed, 12 Mar 2003 22:17:30 +0100 + +gnome-system-tools (0.23.0-1) unstable; urgency=low + + * The "I've tomorrow Sanitaria exam" release. + + Changed how 'su' is called. (Closes: #174953) + + Nautilus system-settings URL is now populated. (Closes: #169166) + + Time tool fixed. (Closes: #171106, #173894) + * Font config tool was removed when XST was ported to Gnome 2 and start + being named GST. (Closes: #128108) + * Cleaned some not needed Build-Depends, and added libvte and libgconf2.. + * Removed undocumented(7) links for different tools. + * Bumped Standars-Version to 3.5.9 (Yeah! I have supercow-powers!) + + -- Jose Carlos Garcia Sogo Fri, 21 Feb 2003 22:56:54 +0100 + +gnome-system-tools (0.22.0-1) unstable; urgency=low + + * New upstream release. (Closes: #171712) + * Patch applied from upstream CVS to correct platform.pl detection system. + It now uses "uname" to guess the platform we're running on. (Closes: #171126) + * Changed Build-Dependency on xlibs6g for xlibs-dev one. (Closes: #170173) + * Upped Standars-Version to 3.5.8 + + -- Jose Carlos Garcia Sogo Mon, 16 Dec 2002 21:04:15 +0100 + +gnome-system-tools (0.21.0-1) unstable; urgency=low + + * New upstream release (Closes: #161135) + * Changed the name to gnome-system-tools (GST). + * Patched backend/platform.pl.in to properly detect Debian if lsb-release + package is installed. (Closes: #149411) + * Reinstalled files needed for GNOME Control Center support, as this is the + GNOME2 port of GST. + * Added a patch to detect Debian "testing/unstable". + + -- Jose Carlos Garcia Sogo Sat, 9 Nov 2002 22:54:56 +0100 + +ximian-setup-tools (0.11.0-3) unstable; urgency=low + + * Added lost Build-Depends. (Closes: #126509) + * Removed files installed in /usr/share/control-center until this + package can be compiled with GNOME Control Center support. + (Closes: #127474) + + -- Jose Carlos Garcia Sogo Sun, 20 Jan 2002 17:31:06 +0000 + +ximian-setup-tools (0.11.0-2) unstable; urgency=low + + * backends/platform.in.pl: applied the patch from upstream to detect + Debian Woody. This patch is now included in CVS. (Closes: #125717) + + -- Jose Carlos Garcia Sogo Wed, 19 Dec 2001 15:13:17 +0100 + +ximian-setup-tools (0.11.0-1) unstable; urgency=low + + * New upstream release. HURRAY!! + * Compiled with '--without-archiver' option to avoid dependency on GNOME + Control Center >= 1.5 until it is available in Debian. + * This new version can compile with latest libgal. (Closes: #116465) + * config-{guess,sub} updated (Closes: #114996) + * backends/platform.pl.in: patch applied to correctly detect + Debian 3.0 woody. Thanks to Gergely Nagy. + + -- Jose Carlos Garcia Sogo Mon, 17 Dec 2001 23:26:53 +0100 + +ximian-setup-tools (0.6.0-4) unstable; urgency=low + + * Built with libgal11 (Closes: #110767) + + -- Jose Carlos Garcia Sogo Fri, 31 Aug 2001 14:27:19 +0200 + +ximian-setup-tools (0.6.0-3) unstable; urgency=low + + * Added a missing perl dependency. I had used dh_perl for that, but the perl + scripts that the package include use #!/usr/bin/env perl, instead of + #!/usr/bin/perl which is the line recognized by dh_perl. + + * Linked all the binaries manpage with the undocumented(7) manpage. + * debian/rules: now support DEB_BUILD_OPTIONS. + + -- Jose Carlos Garcia Sogo Wed, 22 Aug 2001 23:32:55 +0200 + +ximian-setup-tools (0.6.0-2) unstable; urgency=low + + * Compiled with gettext support (I forgot to install gettext-base in the + sid chroot I used to compile this package) + * Added two lost build-dependecies. + * Compiled using libgal9 + + -- Jose Carlos Garcia Sogo Wed, 8 Aug 2001 13:27:08 +0200 + +ximian-setup-tools (0.6.0-1) unstable; urgency=low + + * Initial release. (Closes: #98874) + + -- Jose Carlos Garcia Sogo Sun, 05 Aug 2001 11:45:14 +0200 + +Local variables: +mode: debian-changelog +End: --- gnome-system-tools-2.18.1.orig/debian/compat +++ gnome-system-tools-2.18.1/debian/compat @@ -0,0 +1 @@ +4 --- gnome-system-tools-2.18.1.orig/debian/control.in +++ gnome-system-tools-2.18.1/debian/control.in @@ -0,0 +1,33 @@ +Source: gnome-system-tools +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, dpatch, patchutils, debhelper (>= 4.2.21), libglade2-dev (>= 1:2.5.1-1), libgnome2-dev (>= 2.10.0-1), zlib1g-dev, libpopt-dev, gettext, libgnomeui-dev (>= 2.10.0-1), python, libxml2-dev, libgconf2-dev (>= 2.10.0-1), libxml-parser-perl, gnome-pkg-tools, scrollkeeper (>= 0.3.14-9.1), libnautilus-extension-dev (>= 2.10.0-1), gnome-doc-utils, libgtk2.0-dev (>= 2.9), liboobs-1-dev (>= 2.17.5), libart-2.0-dev, libiw-dev +Standards-Version: 3.6.2 + +Package: gnome-system-tools +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, perl +Recommends: gnome-control-center (>= 1:2.10.1-1), gksu +Suggests: ntp, samba-common, wvdial +Provides: ximian-setup-tools +Replaces: ximian-setup-tools +Description: Cross-platform configuration utilities for GNOME + The GNOME System Tools are a fully integrated set of tools aimed to make easy + the job that means the computer administration on an UNIX or Linux system. + They're thought to help from the new Linux or UNIX user to the system + administrators. + . + Its main advantages are: + * Full integration with the new GNOME Control Center. + * An user-friendly interface to carry out the main administration tasks. + * The use of a common user interface in every system. + * A common structure that makes easy the development of new system tools. + Nowadays there are tools for managing: + - Users and groups + - Date and time + - Network configuration + - Bootloaders + --- gnome-system-tools-2.18.1.orig/debian/patches/80_gst-packages-common.dpatch +++ gnome-system-tools-2.18.1/debian/patches/80_gst-packages-common.dpatch @@ -0,0 +1,282 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_gst-packages-common.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.15.3~/src/common/Makefile.am gnome-system-tools-2.15.3/src/common/Makefile.am +--- gnome-system-tools-2.15.3~/src/common/Makefile.am 2006-09-04 20:17:10.000000000 +0200 ++++ gnome-system-tools-2.15.3/src/common/Makefile.am 2006-09-06 12:41:04.000000000 +0200 +@@ -9,6 +9,7 @@ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + + libsetuptool_a_SOURCES = \ ++ gst-package.c \ + gst-widget.c \ + gst-dialog.c \ + gst-tool.c \ +diff -urNad gnome-system-tools-2.15.3~/src/common/gst-package.c gnome-system-tools-2.15.3/src/common/gst-package.c +--- gnome-system-tools-2.15.3~/src/common/gst-package.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-system-tools-2.15.3/src/common/gst-package.c 2006-09-06 12:41:04.000000000 +0200 +@@ -0,0 +1,211 @@ ++/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */ ++/* ++ * Copyright (C) 2004 Vincent Untz ++ * ++ * 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: Vincent Untz ++ * Guillaume Desmottes ++ * Carlos Garnacho ++ */ ++ ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "gst-package.h" ++ ++static void ++show_error_dialog (GtkWindow *window, ++ const gchar *secondary_text) ++{ ++ GtkWidget *dialog; ++ ++ dialog = gtk_message_dialog_new (window, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_CLOSE, ++ _("Could not install package")); ++ ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), secondary_text); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++} ++ ++static gboolean ++find_app (GtkWindow *window, ++ const gchar *app) ++{ ++ gchar *path; ++ ++ path = g_find_program_in_path (app); ++ ++ if (!path) ++ { ++ show_error_dialog (window, ++ _("The necessary applications to install" ++ " the package could not be found.")); ++ return FALSE; ++ } ++ ++ g_free (path); ++ ++ return TRUE; ++} ++ ++static gchar * ++create_temp_file (const gchar *packages[]) ++{ ++ int fd; ++ gchar *path, *str; ++ ++ path = g_strdup_printf ("/tmp/packages.XXXXXX"); ++ fd = mkstemp (path); ++ ++ while (*packages) ++ { ++ str = g_strdup_printf ("%s\ti\n", *packages); ++ write (fd, str, strlen (str)); ++ g_free (str); ++ packages++; ++ } ++ ++ close (fd); ++ return path; ++} ++ ++static gchar* ++get_synaptic_command_line (GtkWindow *window, ++ const gchar *path) ++{ ++ gchar *synaptic_path, *command; ++ ++ synaptic_path = g_find_program_in_path ("synaptic"); ++ command = g_strdup_printf ("%s --hide-main-window --non-interactive " ++ "--set-selections-file %s --parent-window-id %d", ++ synaptic_path, path, GDK_WINDOW_XID (GTK_WIDGET (window)->window)); ++ g_free (synaptic_path); ++ return command; ++} ++ ++static gboolean ++spawn_synaptic (GtkWindow *window, ++ const gchar *path, ++ gint *child_pid) ++{ ++ gchar **argv; ++ GError *error = NULL; ++ gboolean retval = TRUE; ++ gint i = 0; ++ ++ argv = g_new0 (gchar*, 6); ++ argv[i++] = g_find_program_in_path ("gksudo"); ++ argv[i++] = g_strdup ("--desktop"); ++ argv[i++] = g_strdup ("/usr/share/applications/synaptic.desktop"); ++ argv[i++] = g_strdup ("--disable-grab"); ++ argv[i++] = get_synaptic_command_line (window, path); ++ argv[i++] = NULL; ++ ++ if (!gdk_spawn_on_screen (gtk_window_get_screen (window), ++ NULL, argv, NULL, ++ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, ++ NULL, NULL, child_pid, &error)) ++ { ++ show_error_dialog (window, (error) ? error->message : ""); ++ g_error_free (error); ++ retval = FALSE; ++ } ++ ++ g_strfreev (argv); ++ ++ return retval; ++} ++ ++gboolean ++on_wait_timeout (gpointer data) ++{ ++ gint pid, status; ++ ++ pid = GPOINTER_TO_INT (data); ++ ++ if (waitpid (pid, &status, WNOHANG) > 0) ++ { ++ /* FIXME: should show an error dialog if the installation fails, ++ * but funnily I'm getting always an exit status 0 here... maybe gksudo fault? */ ++ gtk_main_quit (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gboolean ++wait_for_synaptic (GtkWindow *window, gint pid) ++{ ++ GdkCursor *cursor; ++ gint timer; ++ ++ cursor = gdk_cursor_new (GDK_WATCH); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); ++ gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE); ++ ++ /* wait here a bit until the process has exited */ ++ timer = g_timeout_add (500, on_wait_timeout, GINT_TO_POINTER (pid)); ++ gtk_main (); ++ ++ g_source_remove (timer); ++ gtk_widget_set_sensitive (GTK_WIDGET (window), TRUE); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); ++ ++ gdk_cursor_unref (cursor); ++ ++ /* keep this until we can get status ++ * info from the launched process */ ++ return TRUE; ++} ++ ++gboolean ++gst_packages_install (GtkWindow *window, ++ const gchar *packages[]) ++{ ++ gchar *path; ++ pid_t pid; ++ gboolean retval = FALSE; ++ ++ g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); ++ ++ if (!find_app (window, "synaptic") || !find_app (window, "gksudo")) ++ return FALSE; ++ ++ path = create_temp_file (packages); ++ ++ if (spawn_synaptic (window, path, &pid)) ++ retval = wait_for_synaptic (window, pid); ++ ++ unlink (path); ++ g_free (path); ++ ++ return retval; ++} +diff -urNad gnome-system-tools-2.15.3~/src/common/gst-package.h gnome-system-tools-2.15.3/src/common/gst-package.h +--- gnome-system-tools-2.15.3~/src/common/gst-package.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-system-tools-2.15.3/src/common/gst-package.h 2006-09-06 12:41:04.000000000 +0200 +@@ -0,0 +1,35 @@ ++/* -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -*- */ ++/* ++ * Copyright (C) 2004 Vincent Untz ++ * ++ * 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: Carlos Garnacho Parro ++ * Authors: Vincent Untz ++ * Authors: Guillaume Desmottes ++ */ ++ ++#ifndef __GST_PACKAGES_H__ ++#define __GST_PACKAGES_H__ ++ ++#include ++ ++G_BEGIN_DECLS ++ ++gboolean gst_packages_install (GtkWindow *window, const char **packages); ++ ++G_END_DECLS ++ ++#endif /* __GST_PACKAGES_H__ */ +diff -urNad gnome-system-tools-2.15.3~/src/common/gst.h gnome-system-tools-2.15.3/src/common/gst.h +--- gnome-system-tools-2.15.3~/src/common/gst.h 2006-09-03 11:40:20.000000000 +0200 ++++ gnome-system-tools-2.15.3/src/common/gst.h 2006-09-06 12:41:04.000000000 +0200 +@@ -1,5 +1,6 @@ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + #include ++#include "gst-package.h" + #include "gst-types.h" + #include "gst-widget.h" + #include "gst-tool.h" --- gnome-system-tools-2.18.1.orig/debian/patches/82_gst-packages-time-admin.dpatch +++ gnome-system-tools-2.18.1/debian/patches/82_gst-packages-time-admin.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 82_gst-packages-time-admin.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.15.3~/src/time/time-tool.c gnome-system-tools-2.15.3/src/time/time-tool.c +--- gnome-system-tools-2.15.3~/src/time/time-tool.c 2006-09-04 03:50:03.000000000 +0200 ++++ gnome-system-tools-2.15.3/src/time/time-tool.c 2006-09-06 12:45:43.000000000 +0200 +@@ -348,6 +348,7 @@ + gboolean active) + { + GtkWidget *message, *widget; ++ gint response; + + if (GST_TIME_TOOL (tool)->ntp_service) + return TRUE; +@@ -366,9 +367,23 @@ + _("Please install and activate NTP support in the system to enable " + "synchronization of your local time server with " + "internet time servers.")); +- gtk_dialog_run (GTK_DIALOG (message)); ++ ++ gtk_dialog_add_button (GTK_DIALOG (message), _("Install NTP support"), GTK_RESPONSE_OK); ++ response = gtk_dialog_run (GTK_DIALOG (message)); + gtk_widget_destroy (message); + ++ if (response == GTK_RESPONSE_OK) { ++ const gchar *packages[] = { "ntp", NULL }; ++ ++ if (gst_packages_install (GTK_WINDOW (tool->main_dialog), packages)) { ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); ++ ++ if (GST_TIME_TOOL (tool)->ntp_service) ++ return TRUE; ++ } ++ } ++ + return FALSE; + } + --- gnome-system-tools-2.18.1.orig/debian/patches/18_disable_uid.dpatch +++ gnome-system-tools-2.18.1/debian/patches/18_disable_uid.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 18_disable_uid.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.15.3~/src/users/user-settings.c gnome-system-tools-2.15.3/src/users/user-settings.c +--- gnome-system-tools-2.15.3~/src/users/user-settings.c 2006-08-28 03:58:40.000000000 +0200 ++++ gnome-system-tools-2.15.3/src/users/user-settings.c 2006-09-06 12:32:35.000000000 +0200 +@@ -293,6 +293,7 @@ + uid = find_new_uid (GST_USERS_TOOL (tool)->minimum_uid, + GST_USERS_TOOL (tool)->maximum_uid); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), uid); ++ gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), TRUE); + setup_profiles_visibility (tool, TRUE); + } else { + g_object_set_data (G_OBJECT (dialog), "is_new", GINT_TO_POINTER (FALSE)); +@@ -309,6 +310,7 @@ + + widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid"); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), oobs_user_get_uid (user)); ++ gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), FALSE); + setup_profiles_visibility (tool, FALSE); + } + --- gnome-system-tools-2.18.1.orig/debian/patches/20_fuse_as_default_group.dpatch +++ gnome-system-tools-2.18.1/debian/patches/20_fuse_as_default_group.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_fuse_as_default_group.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.15.2~/src/users/privileges-table.c gnome-system-tools-2.15.2/src/users/privileges-table.c +--- gnome-system-tools-2.15.2~/src/users/privileges-table.c 2006-05-29 02:48:37.000000000 +0200 ++++ gnome-system-tools-2.15.2/src/users/privileges-table.c 2006-08-23 13:52:16.000000000 +0200 +@@ -53,6 +53,7 @@ + { "dip", N_("Connect to Internet using a modem") }, + { "fax", N_("Send and receive faxes") }, + { "floppy", N_("Use floppy drives") }, ++ { "fuse", N_("Allow use of fuse filesystems like LTSP Thin Client blockdevices") }, + { "plugdev", N_("Access external storage devices automatically") }, + { "scanner", N_("Use scanners") }, + { "tape", N_("Use tape drives") }, --- gnome-system-tools-2.18.1.orig/debian/patches/19_drop_extra_g_print.dpatch +++ gnome-system-tools-2.18.1/debian/patches/19_drop_extra_g_print.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 19_drop_extra_g_print.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.17.3~/src/users/users-tool.c gnome-system-tools-2.17.3/src/users/users-tool.c +--- gnome-system-tools-2.17.3~/src/users/users-tool.c 2006-08-28 03:58:40.000000000 +0200 ++++ gnome-system-tools-2.17.3/src/users/users-tool.c 2006-12-01 13:35:48.000000000 +0100 +@@ -94,8 +94,6 @@ + { + GstUsersTool *tool = GST_USERS_TOOL (object); + +- g_print ("jojojojoijfowiejfowiejfowiej\n"); +- + g_object_unref (tool->users_config); + g_object_unref (tool->groups_config); + g_object_unref (tool->profiles); --- gnome-system-tools-2.18.1.orig/debian/patches/83_network-locations-apply-button.dpatch +++ gnome-system-tools-2.18.1/debian/patches/83_network-locations-apply-button.dpatch @@ -0,0 +1,209 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 83_network-locations-apply-button.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.17.5~/interfaces/network.glade.in gnome-system-tools-2.17.5/interfaces/network.glade.in +--- gnome-system-tools-2.17.5~/interfaces/network.glade.in 2007-01-09 14:38:05.000000000 +0100 ++++ gnome-system-tools-2.17.5/interfaces/network.glade.in 2007-01-09 14:38:06.000000000 +0100 +@@ -124,6 +124,33 @@ + False + + ++ ++ ++ ++ True ++ Apply location as the current configuration ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ True ++ 4 ++ gtk-apply ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ + + + 0 +diff -urNad gnome-system-tools-2.17.5~/src/network/locations-combo.c gnome-system-tools-2.17.5/src/network/locations-combo.c +--- gnome-system-tools-2.17.5~/src/network/locations-combo.c 2006-12-31 20:30:47.000000000 +0100 ++++ gnome-system-tools-2.17.5/src/network/locations-combo.c 2007-01-09 14:39:47.000000000 +0100 +@@ -34,6 +34,7 @@ + GtkWidget *combo; + GtkWidget *save_button; + GtkWidget *delete_button; ++ GtkWidget *apply_button; + + GtkWidget *save_dialog; + GtkWidget *location_entry; +@@ -44,7 +45,8 @@ + PROP_TOOL, + PROP_COMBO, + PROP_SAVE, +- PROP_DELETE ++ PROP_DELETE, ++ PROP_APPLY + }; + + static void gst_locations_combo_class_init (GstLocationsComboClass *class); +@@ -108,6 +110,13 @@ + "Delete", + GTK_TYPE_BUTTON, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); ++ g_object_class_install_property (object_class, ++ PROP_APPLY, ++ g_param_spec_object ("apply", ++ "Apply", ++ "Apply", ++ GTK_TYPE_BUTTON, ++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + g_type_class_add_private (object_class, + sizeof (GstLocationsComboPrivate)); + } +@@ -140,6 +149,9 @@ + if (priv->delete_button) + g_object_unref (priv->delete_button); + ++ if (priv->apply_button) ++ g_object_unref (priv->apply_button); ++ + if (priv->model) + g_object_unref (priv->model); + } +@@ -169,6 +181,9 @@ + case PROP_DELETE: + priv->delete_button = GTK_WIDGET (g_value_dup_object (value)); + break; ++ case PROP_APPLY: ++ priv->apply_button = GTK_WIDGET (g_value_dup_object (value)); ++ break; + } + } + +@@ -197,6 +212,9 @@ + case PROP_DELETE: + g_value_set_object (value, priv->delete_button); + break; ++ case PROP_APPLY: ++ g_value_set_object (value, priv->apply_button); ++ break; + } + } + +@@ -218,11 +236,9 @@ + gtk_tree_model_get (model, &iter, 0, &str, -1); + gst_network_locations_set_location (locations, str); + gst_tool_update_gui (priv->tool); +- +- oobs_object_commit (locations->hosts_config); +- gst_tool_commit_async (priv->tool, locations->ifaces_config, +- _("Changing network location"), NULL, NULL); + g_free (str); ++ ++ gtk_widget_set_sensitive (priv->apply_button, TRUE); + } + } + +@@ -435,6 +451,22 @@ + } + + static void ++on_apply_button_clicked (GtkWidget *widget, gpointer data) ++{ ++ GstNetworkLocations *locations; ++ GstLocationsComboPrivate *priv; ++ ++ priv = GST_LOCATIONS_COMBO (data)->_priv; ++ locations = GST_NETWORK_LOCATIONS (data); ++ ++ oobs_object_commit (locations->hosts_config); ++ gst_tool_commit_async (priv->tool, locations->ifaces_config, ++ _("Changing network location"), NULL, NULL); ++ ++ gtk_widget_set_sensitive (widget, FALSE); ++} ++ ++static void + fill_model (GstLocationsCombo *combo, + GtkTreeModel *model) + { +@@ -485,6 +517,11 @@ + G_CALLBACK (on_save_button_clicked), object); + g_signal_connect (G_OBJECT (priv->delete_button), "clicked", + G_CALLBACK (on_delete_button_clicked), object); ++ g_signal_connect (G_OBJECT (priv->apply_button), "clicked", ++ G_CALLBACK (on_apply_button_clicked), object); ++ ++ /* set the apply button initially unsensitive */ ++ gtk_widget_set_sensitive (priv->apply_button, FALSE); + + return object; + } +@@ -506,12 +543,14 @@ + gst_locations_combo_new (GstTool *tool, + GtkWidget *combo, + GtkWidget *save, +- GtkWidget *delete) ++ GtkWidget *delete, ++ GtkWidget *apply) + { + return g_object_new (GST_TYPE_LOCATIONS_COMBO, + "tool", tool, + "combo", combo, + "save", save, + "delete", delete, ++ "apply", apply, + NULL); + } +diff -urNad gnome-system-tools-2.17.5~/src/network/locations-combo.h gnome-system-tools-2.17.5/src/network/locations-combo.h +--- gnome-system-tools-2.17.5~/src/network/locations-combo.h 2006-12-31 20:00:20.000000000 +0100 ++++ gnome-system-tools-2.17.5/src/network/locations-combo.h 2007-01-09 14:38:06.000000000 +0100 +@@ -53,7 +53,8 @@ + GstLocationsCombo* gst_locations_combo_new (GstTool *tool, + GtkWidget *combo, + GtkWidget *add, +- GtkWidget *remove); ++ GtkWidget *remove, ++ GtkWidget *apply); + + + G_END_DECLS +diff -urNad gnome-system-tools-2.17.5~/src/network/network-tool.c gnome-system-tools-2.17.5/src/network/network-tool.c +--- gnome-system-tools-2.17.5~/src/network/network-tool.c 2007-01-09 14:38:05.000000000 +0100 ++++ gnome-system-tools-2.17.5/src/network/network-tool.c 2007-01-09 14:38:06.000000000 +0100 +@@ -164,7 +164,7 @@ + GstNetworkTool *tool; + gboolean avahi_stat; + +- GtkWidget *widget, *add_button, *delete_button; ++ GtkWidget *widget, *add_button, *delete_button, *apply_button;; + + object = (* G_OBJECT_CLASS (gst_network_tool_parent_class)->constructor) (type, + n_construct_properties, +@@ -202,7 +202,8 @@ + widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "locations_combo"); + add_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "add_location"); + delete_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "remove_location"); +- tool->location = gst_locations_combo_new (GST_TOOL (tool), widget, add_button, delete_button); ++ apply_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "apply_location"); ++ tool->location = gst_locations_combo_new (GST_TOOL (tool), widget, add_button, delete_button, apply_button); + + widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "enable_avahi"); + avahi_stat = avahi_status(); --- gnome-system-tools-2.18.1.orig/debian/patches/81_gst-packages-shares-admin.dpatch +++ gnome-system-tools-2.18.1/debian/patches/81_gst-packages-shares-admin.dpatch @@ -0,0 +1,87 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 81_gst-packages-shares-admin.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.15.3~/src/shares/shares-tool.c gnome-system-tools-2.15.3/src/shares/shares-tool.c +--- gnome-system-tools-2.15.3~/src/shares/shares-tool.c 2006-09-04 04:56:41.000000000 +0200 ++++ gnome-system-tools-2.15.3/src/shares/shares-tool.c 2006-09-06 12:43:41.000000000 +0200 +@@ -111,9 +111,36 @@ + } + + static gboolean ++install_packages (GstTool *tool, gboolean install_nfs, gboolean install_smb) ++{ ++ gchar **packages; ++ gboolean retval; ++ gint i = 0; ++ ++ if (!install_nfs && !install_smb) ++ return FALSE; ++ ++ packages = g_new0 (gchar*, 3); ++ ++ if (install_nfs) ++ packages[i++] = g_strdup ("nfs-kernel-server"); ++ ++ if (install_smb) ++ packages[i++] = g_strdup ("samba"); ++ ++ retval = gst_packages_install (GTK_WINDOW (tool->main_dialog), packages); ++ g_strfreev (packages); ++ ++ return retval; ++} ++ ++static gboolean + check_servers (GstSharesTool *tool) + { + GtkWidget *dialog; ++ GtkWidget *nfs_check, *smb_check; ++ gint response; ++ gboolean retval = FALSE; + + if (tool->smb_available || tool->nfs_available) + return TRUE; +@@ -126,10 +153,36 @@ + gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), + _("You need to install at least either Samba or NFS " + "in order to share your folders.")); +- gtk_dialog_run (GTK_DIALOG (dialog)); +- gtk_widget_destroy (dialog); ++ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Install services"), GTK_RESPONSE_OK); + +- return FALSE; ++ /* add NFS checkbutton */ ++ nfs_check = gtk_check_button_new_with_mnemonic (_("Install Unix networks support (_NFS)")); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nfs_check), TRUE); ++ gtk_widget_show (nfs_check); ++ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), nfs_check); ++ ++ /* add SMB checkbutton */ ++ smb_check = gtk_check_button_new_with_mnemonic (_("Install Windows networks support (_SMB)")); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (smb_check), TRUE); ++ gtk_widget_show (smb_check); ++ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), smb_check); ++ ++ response = gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_hide (dialog); ++ ++ if (response == GTK_RESPONSE_OK) { ++ if (install_packages (GST_TOOL (tool), ++ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (nfs_check)), ++ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (smb_check)))) { ++ gst_tool_update_config (GST_TOOL (tool)); ++ gst_tool_update_gui (GST_TOOL (tool)); ++ ++ retval = TRUE; ++ } ++ } ++ ++ gtk_widget_destroy (dialog); ++ return retval; + } + + static void --- gnome-system-tools-2.18.1.orig/debian/patches/00list +++ gnome-system-tools-2.18.1/debian/patches/00list @@ -0,0 +1,10 @@ +04_activate_avahi_option +10_add_missing_services +20_fuse_as_default_group +22_root_only +23_users_update_model +80_gst-packages-common +81_gst-packages-shares-admin +82_gst-packages-time-admin +83_network-locations-apply-button +98_automake.dpatch --- gnome-system-tools-2.18.1.orig/debian/patches/04_activate_avahi_option.dpatch +++ gnome-system-tools-2.18.1/debian/patches/04_activate_avahi_option.dpatch @@ -0,0 +1,523 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_activate_avahi_option.dpatch by Daniel Holbach +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.17.5~/interfaces/network.glade.in gnome-system-tools-2.17.5/interfaces/network.glade.in +--- gnome-system-tools-2.17.5~/interfaces/network.glade.in 2007-01-03 19:31:45.000000000 +0100 ++++ gnome-system-tools-2.17.5/interfaces/network.glade.in 2007-01-09 14:22:48.000000000 +0100 +@@ -237,160 +237,244 @@ + + + +- +- 12 ++ + True +- 0 +- 0.5 +- GTK_SHADOW_NONE ++ False ++ 0 + + +- ++ ++ 12 + True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 12 +- 0 ++ 0 ++ 0.5 ++ GTK_SHADOW_NONE + + +- ++ + True +- 2 +- 2 +- False +- 6 +- 12 ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 12 ++ 0 + + +- ++ + True +- _Host name: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- hostname +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- 1 +- 0 +- 1 +- fill +- +- +- ++ 2 ++ 2 ++ False ++ 6 ++ 12 + +- +- +- True +- D_omain name: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- domain +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- 1 +- 1 +- 2 +- fill +- +- +- ++ ++ ++ True ++ _Host name: ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ hostname ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 0 ++ 1 ++ fill ++ ++ ++ + +- +- +- True +- True +- True +- True +- 0 +- +- True +- * +- False ++ ++ ++ True ++ D_omain name: ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ domain ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 1 ++ 2 ++ fill ++ ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ ++ True ++ * ++ False ++ ++ ++ 1 ++ 2 ++ 0 ++ 1 ++ ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ ++ True ++ * ++ False ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ + +- +- 1 +- 2 +- 0 +- 1 +- +- + ++ ++ ++ ++ ++ ++ True ++ <b>Host Settings</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ label_item ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ 12 ++ True ++ 0 ++ 0.5 ++ GTK_SHADOW_NONE ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 12 ++ 0 + + +- ++ + True + True +- True +- True +- 0 +- +- True +- * +- False ++ Scan for available services and advertise local services on the network. ++This is a potential security risk ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True + +- +- 1 +- 2 +- 1 +- 2 +- +- + + + +- +- + +- +- +- True +- <b>Host Settings</b> +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 ++ ++ ++ True ++ <b>Automatic service discovery</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ label_item ++ ++ + + +- label_item ++ 0 ++ False ++ False + + ++ ++ ++ ++ + + + False +diff -urNad gnome-system-tools-2.17.5~/src/network/callbacks.c gnome-system-tools-2.17.5/src/network/callbacks.c +--- gnome-system-tools-2.17.5~/src/network/callbacks.c 2007-01-04 02:38:56.000000000 +0100 ++++ gnome-system-tools-2.17.5/src/network/callbacks.c 2007-01-09 14:22:48.000000000 +0100 +@@ -517,3 +517,23 @@ + + return FALSE; + } ++ ++void ++on_avahi_toggled (GtkWidget *item, gpointer user_data) ++{ ++ gboolean bstat, checkbox_state; ++ GstNetworkTool *tool; ++ ++ tool = GST_NETWORK_TOOL (user_data); ++ ++ item = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "enable_avahi"); ++ ++ bstat = avahi_status(); ++ checkbox_state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (item)); ++ ++ if (bstat != checkbox_state) ++ { ++ avahi_set(checkbox_state); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item), avahi_status()); ++ } ++} +diff -urNad gnome-system-tools-2.17.5~/src/network/callbacks.h gnome-system-tools-2.17.5/src/network/callbacks.h +--- gnome-system-tools-2.17.5~/src/network/callbacks.h 2006-12-31 20:30:47.000000000 +0100 ++++ gnome-system-tools-2.17.5/src/network/callbacks.h 2007-01-09 14:22:48.000000000 +0100 +@@ -69,4 +69,7 @@ + GdkEventFocus *event, + gpointer data); + ++void on_avahi_toggled (GtkWidget *item, ++ gpointer user_data); ++ + #endif /* __CALLBACKS_H */ +diff -urNad gnome-system-tools-2.17.5~/src/network/network-tool.c gnome-system-tools-2.17.5/src/network/network-tool.c +--- gnome-system-tools-2.17.5~/src/network/network-tool.c 2006-12-31 20:30:47.000000000 +0100 ++++ gnome-system-tools-2.17.5/src/network/network-tool.c 2007-01-09 14:22:48.000000000 +0100 +@@ -20,6 +20,8 @@ + + #include + #include ++#include ++#include + #include "gst.h" + #include "network-tool.h" + #include "ifaces-list.h" +@@ -97,6 +99,62 @@ + oobs_object_commit (OOBS_OBJECT (tool->hosts_config)); + } + ++gint avahi_status() ++{ ++ ++ gchar *argv_stat[] = { "/usr/share/avahi/avahi_status", NULL}; ++ GSpawnFlags flags = G_SPAWN_FILE_AND_ARGV_ZERO; ++ GError *error=NULL; ++ gint spawn_exit_code, my_return_code; ++ gboolean ok; ++ ++ if (!g_file_test ("/usr/share/avahi/avahi_status", G_FILE_TEST_EXISTS)) ++ return -1; ++ ++ ok = g_spawn_sync (NULL, argv_stat, NULL, flags,NULL, NULL, NULL, NULL, &spawn_exit_code, &error); ++ ++ if (ok) ++ my_return_code = WEXITSTATUS (spawn_exit_code); ++ else ++ { ++ my_return_code = -1; ++ fprintf (stderr, "Error occured spawning: %s\n", error->message); ++ } ++ ++ return (my_return_code); ++} ++ ++gint avahi_set(gboolean enable) ++{ ++ char msg[1024]; ++ char const *argv_enable[] = { "gksudo", msg, "/usr/share/avahi/enable_avahi 1", NULL }; ++ char const *argv_disable[] = { "gksudo", msg, "/usr/share/avahi/enable_avahi 0", NULL }; ++ GSpawnFlags flags = G_SPAWN_SEARCH_PATH; ++ GError *error=NULL; ++ gint spawn_exit_code, my_return_code; ++ gboolean ok; ++ ++ if (enable) ++ { ++ snprintf(msg , sizeof(msg), "-m %s", _("Enter your password to enable the automatic service discovery.")); ++ ok = g_spawn_sync (NULL,(gchar**) argv_enable, NULL, flags,NULL, NULL, NULL, NULL, &spawn_exit_code, &error); ++ } ++ else ++ { ++ snprintf(msg , sizeof(msg), "-m %s", _("Enter your password to disable the automatic service discovery.")); ++ ok = g_spawn_sync (NULL, (gchar**) argv_disable, NULL, flags,NULL, NULL, NULL, NULL, &spawn_exit_code, &error); ++ } ++ ++ if (ok) ++ my_return_code = WEXITSTATUS (spawn_exit_code); ++ else ++ { ++ my_return_code = -1; ++ fprintf (stderr, "Error occured spawning: %s\n", error->message); ++ } ++ return (my_return_code); ++} ++ + static GObject* + gst_network_tool_constructor (GType type, + guint n_construct_properties, +@@ -104,6 +162,8 @@ + { + GObject *object; + GstNetworkTool *tool; ++ gboolean avahi_stat; ++ + GtkWidget *widget, *add_button, *delete_button; + + object = (* G_OBJECT_CLASS (gst_network_tool_parent_class)->constructor) (type, +@@ -143,6 +203,18 @@ + add_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "add_location"); + delete_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "remove_location"); + tool->location = gst_locations_combo_new (GST_TOOL (tool), widget, add_button, delete_button); ++ ++ widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "enable_avahi"); ++ avahi_stat = avahi_status(); ++ ++ if (avahi_stat == 0) ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); ++ else if (avahi_stat == 1) ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); ++ else ++ gtk_widget_set_sensitive (GTK_TOGGLE_BUTTON (widget), FALSE); ++ ++ g_signal_connect (widget, "toggled", G_CALLBACK (on_avahi_toggled), GST_NETWORK_TOOL (tool)); + + tool->dialog = connection_dialog_init (GST_TOOL (tool)); + --- gnome-system-tools-2.18.1.orig/debian/patches/23_users_update_model.dpatch +++ gnome-system-tools-2.18.1/debian/patches/23_users_update_model.dpatch @@ -0,0 +1,170 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +@DPATCH@ +diff -urNad gnome-system-tools-2.18.1~/src/users/callbacks.c gnome-system-tools-2.18.1/src/users/callbacks.c +--- gnome-system-tools-2.18.1~/src/users/callbacks.c 2007-02-24 18:23:23.000000000 +0100 ++++ gnome-system-tools-2.18.1/src/users/callbacks.c 2007-11-13 13:39:52.000000000 +0100 +@@ -207,6 +207,9 @@ + users_table_add_user (user, &list_iter); + oobs_object_commit (GST_USERS_TOOL (tool)->users_config); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + } + +@@ -246,6 +249,9 @@ + users_table_set_user (user, list_iter, &filter_iter); + oobs_object_commit (GST_USERS_TOOL (tool)->users_config); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + + g_object_unref (user); +@@ -274,6 +280,10 @@ + g_list_free (list); + + oobs_object_commit (GST_USERS_TOOL (tool)->users_config); ++ oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + + void +@@ -316,7 +326,11 @@ + oobs_list_set (groups_list, &list_iter, group); + + groups_table_add_group (group, &list_iter); ++ oobs_object_commit (GST_USERS_TOOL (tool)->users_config); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + } + +@@ -356,7 +370,11 @@ + &filter_iter, &iter); + group_settings_dialog_get_data (group); + groups_table_set_group (group, list_iter, &filter_iter); ++ oobs_object_commit (GST_USERS_TOOL (tool)->users_config); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + + g_object_unref (group); +@@ -384,7 +402,11 @@ + g_list_foreach (list, (GFunc) gtk_tree_row_reference_free, NULL); + g_list_free (list); + ++ oobs_object_commit (GST_USERS_TOOL (tool)->users_config); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + + /* User settings callbacks */ +diff -urNad gnome-system-tools-2.18.1~/src/users/privileges-table.c gnome-system-tools-2.18.1/src/users/privileges-table.c +--- gnome-system-tools-2.18.1~/src/users/privileges-table.c 2007-11-13 13:39:52.000000000 +0100 ++++ gnome-system-tools-2.18.1/src/users/privileges-table.c 2007-11-13 13:39:52.000000000 +0100 +@@ -81,7 +81,6 @@ + sizeof (PrivilegeDescription), compare_groups); + } + +- + static void + on_user_privilege_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer data) + { +@@ -262,3 +261,12 @@ + valid = gtk_tree_model_iter_next (model, &iter); + } + } ++ ++void ++privileges_table_clear (void) ++{ ++ GtkWidget *table = gst_dialog_get_widget (tool->main_dialog, "user_privileges"); ++ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (table)); ++ ++ gtk_list_store_clear (GTK_LIST_STORE (model)); ++} +diff -urNad gnome-system-tools-2.18.1~/src/users/privileges-table.h gnome-system-tools-2.18.1/src/users/privileges-table.h +--- gnome-system-tools-2.18.1~/src/users/privileges-table.h 2007-02-24 18:23:23.000000000 +0100 ++++ gnome-system-tools-2.18.1/src/users/privileges-table.h 2007-11-13 13:39:52.000000000 +0100 +@@ -24,11 +24,23 @@ + #ifndef __PRIVILEGES_TABLE_H + #define __PRIVILEGES_TABLE_H + ++#include "user-profiles.h" ++ + void create_user_privileges_table (void); + void create_profile_privileges_table (void); ++void privileges_table_clear (void); + + void populate_privileges_table (GtkWidget*, gchar*); + GList* user_privileges_get_list (GList*); + ++void privileges_table_add_group (OobsGroup *group, ++ OobsListIter *list_iter); ++ ++void privileges_table_set_from_profile (GstUserProfile *profile); ++void privileges_table_set_from_user (OobsUser *user); ++ ++void privileges_table_save (OobsUser *user); ++ ++ + + #endif /* __PRIVILEGES_TABLE_H */ +diff -urNad gnome-system-tools-2.18.1~/src/users/users-table.c gnome-system-tools-2.18.1/src/users/users-table.c +--- gnome-system-tools-2.18.1~/src/users/users-table.c 2007-04-08 19:02:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/users/users-table.c 2007-11-13 13:39:52.000000000 +0100 +@@ -194,3 +194,13 @@ + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + users_table_set_user (user, list_iter, &iter); + } ++ ++void ++users_table_clear (void) ++{ ++ GtkWidget *users_table = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "users_table"); ++ GtkTreeModel *filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (users_table)); ++ GtkTreeModel *model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); ++ ++ gtk_list_store_clear (GTK_LIST_STORE (model)); ++} +diff -urNad gnome-system-tools-2.18.1~/src/users/users-table.h gnome-system-tools-2.18.1/src/users/users-table.h +--- gnome-system-tools-2.18.1~/src/users/users-table.h 2007-02-24 18:23:23.000000000 +0100 ++++ gnome-system-tools-2.18.1/src/users/users-table.h 2007-11-13 13:39:52.000000000 +0100 +@@ -39,6 +39,7 @@ + }; + + void create_users_table (GstUsersTool *tool); ++void users_table_clear (void); + void users_table_set_user (OobsUser *user, + OobsListIter *list_iter, + GtkTreeIter *iter); +diff -urNad gnome-system-tools-2.18.1~/src/users/users-tool.c gnome-system-tools-2.18.1/src/users/users-tool.c +--- gnome-system-tools-2.18.1~/src/users/users-tool.c 2007-02-24 18:23:23.000000000 +0100 ++++ gnome-system-tools-2.18.1/src/users/users-tool.c 2007-11-13 13:39:52.000000000 +0100 +@@ -109,6 +109,7 @@ + GObject *user; + gboolean valid; + ++ users_table_clear (); + list = oobs_users_config_get_users (OOBS_USERS_CONFIG (tool->users_config)); + + valid = oobs_list_get_iter_first (list, &iter); +@@ -130,6 +131,7 @@ + GObject *group; + gboolean valid; + ++ privileges_table_clear (); + list = oobs_groups_config_get_groups (OOBS_GROUPS_CONFIG (tool->groups_config)); + + valid = oobs_list_get_iter_first (list, &iter); --- gnome-system-tools-2.18.1.orig/debian/patches/10_add_missing_services.dpatch +++ gnome-system-tools-2.18.1/debian/patches/10_add_missing_services.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_add_postgres82.dpatch by Daniel Holbach +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.18.0~/src/common/gst-service-role.c gnome-system-tools-2.18.0/src/common/gst-service-role.c +--- gnome-system-tools-2.18.0~/src/common/gst-service-role.c 2007-03-12 10:35:53.000000000 +0100 ++++ gnome-system-tools-2.18.0/src/common/gst-service-role.c 2007-03-12 11:19:31.000000000 +0100 +@@ -104,6 +104,7 @@ + { "kdm", GST_ROLE_DISPLAY_MANAGER }, + { "keepalived", GST_ROLE_CLUSTER_MANAGEMENT }, + { "klogd", GST_ROLE_SYSTEM_LOGGER }, ++ { "lighttpd", GST_ROLE_WEB_SERVER }, + { "lm-sensors", GST_ROLE_HARDWARE_MONITORING }, + { "lpd", GST_ROLE_PRINTER_SERVICE }, + { "lpdng", GST_ROLE_PRINTER_SERVICE }, +@@ -176,6 +177,7 @@ + { "syslog", GST_ROLE_SYSTEM_LOGGER }, + { "tftpd-hpa", GST_ROLE_FILE_SERVER_TFTP }, + { "vcron", GST_ROLE_COMMAND_SCHEDULER }, ++ { "vmware-player", GST_ROLE_VIRTUAL_MACHINE_MANAGEMENT }, + { "vsftpd", GST_ROLE_FILE_SERVER_FTP }, + { "wacom-tools", GST_ROLE_GRAPHIC_TABLETS_MANAGEMENT }, + { "wdm", GST_ROLE_DISPLAY_MANAGER }, +diff -urNad gnome-system-tools-2.18.0~/src/common/gst-service-role.h gnome-system-tools-2.18.0/src/common/gst-service-role.h +--- gnome-system-tools-2.18.0~/src/common/gst-service-role.h 2007-03-12 10:35:53.000000000 +0100 ++++ gnome-system-tools-2.18.0/src/common/gst-service-role.h 2007-03-12 11:19:31.000000000 +0100 +@@ -100,6 +100,7 @@ + GST_ROLE_TELSTRA_BIGPOND_NETWORK_CLIENT, + GST_ROLE_HARDWARE_MONITORING, + GST_ROLE_SYSTEM_MONITORING, ++ GST_ROLE_VIRTUAL_MACHINE_MANAGEMENT, + GST_ROLE_NONE + }; + +diff -urNad gnome-system-tools-2.18.0~/src/services/service.c gnome-system-tools-2.18.0/src/services/service.c +--- gnome-system-tools-2.18.0~/src/services/service.c 2007-03-12 10:35:16.000000000 +0100 ++++ gnome-system-tools-2.18.0/src/services/service.c 2007-03-12 11:19:31.000000000 +0100 +@@ -101,6 +101,7 @@ + { FALSE, NULL, N_("Telstra Bigpond Cable Network client"), NULL }, /* GST_ROLE_TELSTRA_BIGPOND_NETWORK_CLIENT */ + { FALSE, NULL, N_("Hardware monitor"), NULL }, /* GST_ROLE_HARDWARE_MONITORING */ + { FALSE, NULL, N_("System monitor"), NULL }, /* GST_ROLE_SYSTEM_MONITORING */ ++ { FALSE, NULL, N_("Virtual Machine management"), NULL }, /* GST_ROLE_VIRTUAL_MACHINE_MANAGEMENT */ + { FALSE } + }; + --- gnome-system-tools-2.18.1.orig/debian/patches/22_root_only.dpatch +++ gnome-system-tools-2.18.1/debian/patches/22_root_only.dpatch @@ -0,0 +1,193 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 22_root_only.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.17.3~/src/network/network.desktop.in.in gnome-system-tools-2.17.3/src/network/network.desktop.in.in +--- gnome-system-tools-2.17.3~/src/network/network.desktop.in.in 2006-11-16 13:33:15.000000000 +0100 ++++ gnome-system-tools-2.17.3/src/network/network.desktop.in.in 2007-01-03 19:32:58.000000000 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Network + _Comment=Configure network devices and connections +-Exec=network-admin ++Exec=gksu network-admin + Icon=gnome-fs-network + Terminal=false + Type=Application +@@ -11,4 +11,5 @@ + X-GNOME-Bugzilla-Component=network-admin + X-GNOME-Bugzilla-Version=@VERSION@ + StartupNotify=true ++X-KDE-SubstituteUID=true + Encoding=UTF-8 +diff -urNad gnome-system-tools-2.17.3~/src/services/services.desktop.in.in gnome-system-tools-2.17.3/src/services/services.desktop.in.in +--- gnome-system-tools-2.17.3~/src/services/services.desktop.in.in 2006-05-27 17:28:45.000000000 +0200 ++++ gnome-system-tools-2.17.3/src/services/services.desktop.in.in 2007-01-03 19:32:58.000000000 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Services + _Comment=Configure which services will be run when the system starts +-Exec=services-admin ++Exec=gksu services-admin + Icon=gnome-fs-server + Terminal=false + Type=Application +@@ -11,4 +11,5 @@ + X-GNOME-Bugzilla-Component=runlevel-admin + X-GNOME-Bugzilla-Version=@VERSION@ + StartupNotify=true ++X-KDE-SubstituteUID=true + Encoding=UTF-8 +diff -urNad gnome-system-tools-2.17.3~/src/shares/nautilus/nautilus-shares.c gnome-system-tools-2.17.3/src/shares/nautilus/nautilus-shares.c +--- gnome-system-tools-2.17.3~/src/shares/nautilus/nautilus-shares.c 2006-10-02 17:23:26.000000000 +0200 ++++ gnome-system-tools-2.17.3/src/shares/nautilus/nautilus-shares.c 2007-01-03 19:35:23.000000000 +0100 +@@ -82,7 +82,7 @@ + GString *cmd; + gchar *dir; + +- cmd = g_string_new ("shares-admin "); ++ cmd = g_string_new ("gksu -- shares-admin "); + info = g_object_get_data (G_OBJECT (menu_item), "file"); + dir = get_path_from_file_info (info); + +diff -urNad gnome-system-tools-2.17.3~/src/shares/shares-tool.c gnome-system-tools-2.17.3/src/shares/shares-tool.c +--- gnome-system-tools-2.17.3~/src/shares/shares-tool.c 2006-11-10 13:51:26.000000000 +0100 ++++ gnome-system-tools-2.17.3/src/shares/shares-tool.c 2007-01-03 19:35:08.000000000 +0100 +@@ -23,6 +23,9 @@ + #include + #include "gst.h" + ++#include ++#include ++ + static void gst_shares_tool_class_init (GstSharesToolClass *class); + static void gst_shares_tool_init (GstSharesTool *tool); + static void gst_shares_tool_finalize (GObject *object); +@@ -50,6 +53,21 @@ + { + GstTool *gst_tool = GST_TOOL (tool); + ++ /* temporarily switch to real user's uid to connect to his session bus ++ * instead of root's */ ++ gboolean uid_changed = FALSE; ++ if (geteuid() == 0) { ++ const char* sudo_uid_str = getenv("SUDO_UID"); ++ int sudo_uid; ++ if (sudo_uid_str) { ++ sudo_uid = atoi(sudo_uid_str); ++ if (sudo_uid > 0) { ++ setreuid (sudo_uid, sudo_uid); ++ uid_changed = TRUE; ++ } ++ } ++ } ++ + tool->nfs_config = oobs_nfs_config_get (gst_tool->session); + tool->smb_config = oobs_smb_config_get (gst_tool->session); + +@@ -58,6 +76,9 @@ + tool->ifaces_config = oobs_ifaces_config_get (gst_tool->session); + + gst_shares_tool_update_services_availability (tool); ++ ++ if (uid_changed) ++ setreuid (0, 0); + } + + static void +diff -urNad gnome-system-tools-2.17.3~/src/shares/shares.desktop.in.in gnome-system-tools-2.17.3/src/shares/shares.desktop.in.in +--- gnome-system-tools-2.17.3~/src/shares/shares.desktop.in.in 2006-05-27 17:29:09.000000000 +0200 ++++ gnome-system-tools-2.17.3/src/shares/shares.desktop.in.in 2007-01-03 19:32:58.000000000 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Shared Folders + _Comment=Configure which folders are available for your network neighborhood +-Exec=shares-admin ++Exec=gksu shares-admin + Icon=gnome-fs-share + Terminal=false + Type=Application +@@ -11,5 +11,6 @@ + X-GNOME-Bugzilla-Component=shares-admin + X-GNOME-Bugzilla-Version=@VERSION@ + StartupNotify=true ++X-KDE-SubstituteUID=true + Encoding=UTF-8 + +diff -urNad gnome-system-tools-2.17.3~/src/time/time-tool.c gnome-system-tools-2.17.3/src/time/time-tool.c +--- gnome-system-tools-2.17.3~/src/time/time-tool.c 2007-01-03 19:32:57.000000000 +0100 ++++ gnome-system-tools-2.17.3/src/time/time-tool.c 2007-01-03 19:32:58.000000000 +0100 +@@ -19,6 +19,8 @@ + * Authors: Carlos Garnacho Parro + */ + ++#include ++#include + #include + #include + #include +@@ -108,7 +110,25 @@ + OobsList *list; + GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool); + ++ /* temporarily switch to real user's uid to connect to his session bus ++ * instead of root's */ ++ gboolean uid_changed = FALSE; ++ if (geteuid() == 0) { ++ const char* sudo_uid_str = getenv("SUDO_UID"); ++ int sudo_uid; ++ if (sudo_uid_str) { ++ sudo_uid = atoi(sudo_uid_str); ++ if (sudo_uid > 0) { ++ setreuid (sudo_uid, -1); ++ uid_changed = TRUE; ++ } ++ } ++ } ++ + priv->bus_connection = dbus_bus_get (DBUS_BUS_SESSION, NULL); ++ if (uid_changed) ++ setreuid (0, -1); ++ + priv->cookie = 0; + + tool->time_config = oobs_time_config_get (GST_TOOL (tool)->session); +diff -urNad gnome-system-tools-2.17.3~/src/time/time.desktop.in.in gnome-system-tools-2.17.3/src/time/time.desktop.in.in +--- gnome-system-tools-2.17.3~/src/time/time.desktop.in.in 2006-11-15 19:50:19.000000000 +0100 ++++ gnome-system-tools-2.17.3/src/time/time.desktop.in.in 2007-01-03 19:32:58.000000000 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Time and Date + _Comment=Change system time, date, and timezone +-Exec=time-admin ++Exec=gksu time-admin + Icon=config-date + Terminal=false + Type=Application +@@ -11,4 +11,5 @@ + X-GNOME-Bugzilla-Component=time-admin + X-GNOME-Bugzilla-Version=@VERSION@ + StartupNotify=true ++X-KDE-SubstituteUID=true + Encoding=UTF-8 +diff -urNad gnome-system-tools-2.17.3~/src/users/users.desktop.in.in gnome-system-tools-2.17.3/src/users/users.desktop.in.in +--- gnome-system-tools-2.17.3~/src/users/users.desktop.in.in 2006-05-27 17:30:28.000000000 +0200 ++++ gnome-system-tools-2.17.3/src/users/users.desktop.in.in 2007-01-03 19:32:58.000000000 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Users and Groups + _Comment=Add or remove users and groups +-Exec=users-admin ++Exec=gksu users-admin + Icon=config-users + Terminal=false + Type=Application +@@ -11,4 +11,5 @@ + X-GNOME-Bugzilla-Component=users-admin + X-GNOME-Bugzilla-Version=@VERSION@ + StartupNotify=true ++X-KDE-SubstituteUID=true + Encoding=UTF-8 --- gnome-system-tools-2.18.1.orig/debian/patches/98_automake.dpatch +++ gnome-system-tools-2.18.1/debian/patches/98_automake.dpatch @@ -0,0 +1,8658 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 98_automake.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.18.1~/Makefile.in gnome-system-tools-2.18.1/Makefile.in +--- gnome-system-tools-2.18.1~/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/Makefile.in 2007-04-10 12:21:41.000000000 +0200 +@@ -44,8 +44,7 @@ + mkinstalldirs + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +@@ -548,7 +547,7 @@ + distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) +- $(mkdir_p) $(distdir)/. $(distdir)/m4 $(distdir)/po $(distdir)/src/network $(distdir)/src/services $(distdir)/src/shares $(distdir)/src/time $(distdir)/src/users ++ $(mkdir_p) $(distdir)/. $(distdir)/po $(distdir)/src/network $(distdir)/src/services $(distdir)/src/shares $(distdir)/src/time $(distdir)/src/users + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ +diff -urNad gnome-system-tools-2.18.1~/aclocal.m4 gnome-system-tools-2.18.1/aclocal.m4 +--- gnome-system-tools-2.18.1~/aclocal.m4 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/aclocal.m4 2007-04-10 12:21:27.000000000 +0200 +@@ -11,907 +11,6 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +- +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.9.6])]) +- +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- +- +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +-# +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. +-# +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir +-# +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. +-# +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. +-# +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +- +-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 4 +- +-# This was merged into AC_PROG_CC in Autoconf. +- +-AU_DEFUN([AM_PROG_CC_STDC], +-[AC_PROG_CC +-AC_DIAGNOSE([obsolete], [$0: +- your code should no longer depend upon `am_cv_prog_cc_stdc', but upon +- `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when +- you adjust the code. You can also remove the above call to +- AC_PROG_CC if you already called it elsewhere.]) +-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +-]) +-AU_DEFUN([fp_PROG_CC_STDC]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 7 +- +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) +-if $2; then +- $1_TRUE= +- $1_FALSE='#' +-else +- $1_TRUE='#' +- $1_FALSE= +-fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 8 +- +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +- +- +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) +- +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) +- +- +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) +- +- +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) +-]) +- +-# Generate code to set up dependency tracking. -*- Autoconf -*- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-#serial 3 +- +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS +- +- +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) +- +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 8 +- +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) +- +-# Do all the work for Automake. -*- Autoconf -*- +- +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 12 +- +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. +- +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.58])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +-fi +- +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +-AC_SUBST([CYGPATH_W]) +- +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +- +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +- +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-]) +-]) +- +- +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. +- +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $1 | $1:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +- +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) +- +-# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 2 +- +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) +- +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering +- +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 4 +- +-AC_DEFUN([AM_MAINTAINER_MODE], +-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +- dnl maintainer-mode is disabled by default +- AC_ARG_ENABLE(maintainer-mode, +-[ --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- USE_MAINTAINER_MODE=$enableval, +- USE_MAINTAINER_MODE=no) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST(MAINT)dnl +-] +-) +- +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +- +-# Check to see how 'make' treats includes. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 3 +- +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo done +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) +- +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +- +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 4 +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) +- +- +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) +-fi +-]) +- +-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_MKDIR_P +-# --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +-# +-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +-# created by `make install' are always world readable, even if the +-# installer happens to have an overly restrictive umask (e.g. 077). +-# This was a mistake. There are at least two reasons why we must not +-# use `-m 0755': +-# - it causes special bits like SGID to be ignored, +-# - it may be too restrictive (some setups expect 775 directories). +-# +-# Do not use -m 0755 and let people choose whatever they expect by +-# setting umask. +-# +-# We cannot accept any implementation of `mkdir' that recognizes `-p'. +-# Some implementations (such as Solaris 8's) are not thread-safe: if a +-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +-# concurrently, both version can detect that a/ is missing, but only +-# one can create it and the other will error out. Consequently we +-# restrict ourselves to GNU make (using the --version option ensures +-# this.) +-AC_DEFUN([AM_PROG_MKDIR_P], +-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +-AC_SUBST([mkdir_p])]) +- +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 3 +- +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +- +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +- +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +- +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +- +-# Check to make sure that the build environment is sane. -*- Autoconf -*- +- +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 4 +- +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi +- +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT(yes)]) +- +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) +- +-# Check how to create a tarball. -*- Autoconf -*- +- +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 2 +- +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. +-# +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar +-# +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac +- +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break +- +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir +- +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR +- + dnl AM_GCONF_SOURCE_2 + dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas + dnl (i.e. pass to gconftool-2 +@@ -1386,9 +485,263 @@ + fi]) + + ++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from ++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. ++AC_DEFUN([GNOME_DOC_DEFINES], ++[ ++AC_ARG_WITH([help-dir], ++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, ++ [with_help_dir='${datadir}/gnome/help']) ++HELP_DIR="$with_help_dir" ++AC_SUBST(HELP_DIR) ++ ++AC_ARG_WITH([omf-dir], ++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, ++ [with_omf_dir='${datadir}/omf']) ++OMF_DIR="$with_omf_dir" ++AC_SUBST(OMF_DIR) ++ ++AC_ARG_WITH([help-formats], ++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, ++ [with_help_formats='']) ++DOC_USER_FORMATS="$with_help_formats" ++AC_SUBST(DOC_USER_FORMATS) ++ ++AC_ARG_ENABLE([scrollkeeper], ++ [AC_HELP_STRING([--disable-scrollkeeper], ++ [do not make updates to the scrollkeeper database])],, ++ enable_scrollkeeper=yes) ++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) ++ ++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ++]) ++ ++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) ++# ++AC_DEFUN([GNOME_DOC_INIT], ++[ ++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) ++ ++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], ++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) ++ ++if test "$gdu_cv_have_gdu" = "yes"; then ++ ifelse([$2],,[:],[$2]) ++else ++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) ++fi ++ ++GNOME_DOC_DEFINES ++]) ++ ++ ++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 35 IT_PROG_INTLTOOL ++AC_DEFUN([IT_PROG_INTLTOOL], ++[AC_PREREQ([2.50])dnl ++ ++case "$am__api_version" in ++ 1.[01234]) ++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ++ ;; ++ *) ++ ;; ++esac ++ ++if test -n "$1"; then ++ AC_MSG_CHECKING(for intltool >= $1) ++ ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` ++ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` ++ ] ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++fi ++ ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ ++AC_SUBST(INTLTOOL_DESKTOP_RULE) ++AC_SUBST(INTLTOOL_DIRECTORY_RULE) ++AC_SUBST(INTLTOOL_KEYS_RULE) ++AC_SUBST(INTLTOOL_PROP_RULE) ++AC_SUBST(INTLTOOL_OAF_RULE) ++AC_SUBST(INTLTOOL_PONG_RULE) ++AC_SUBST(INTLTOOL_SERVER_RULE) ++AC_SUBST(INTLTOOL_SHEET_RULE) ++AC_SUBST(INTLTOOL_SOUNDLIST_RULE) ++AC_SUBST(INTLTOOL_UI_RULE) ++AC_SUBST(INTLTOOL_XAM_RULE) ++AC_SUBST(INTLTOOL_KBD_RULE) ++AC_SUBST(INTLTOOL_XML_RULE) ++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) ++AC_SUBST(INTLTOOL_CAVES_RULE) ++AC_SUBST(INTLTOOL_SCHEMAS_RULE) ++AC_SUBST(INTLTOOL_THEME_RULE) ++AC_SUBST(INTLTOOL_SERVICE_RULE) ++ ++# Use the tools built into the package, not the ones that are installed. ++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') ++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') ++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') ++ ++AC_PATH_PROG(INTLTOOL_PERL, perl) ++if test -z "$INTLTOOL_PERL"; then ++ AC_MSG_ERROR([perl not found; required for intltool]) ++fi ++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then ++ AC_MSG_ERROR([perl 5.x required for intltool]) ++fi ++if test "x$2" != "xno-xml"; then ++ AC_MSG_CHECKING([for XML::Parser]) ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ AC_MSG_RESULT([ok]) ++ else ++ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ fi ++fi ++ ++AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) ++AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) ++AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) ++AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) ++ ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) ++ ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share ++ dnl in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [DATADIRNAME=share], [DATADIRNAME=lib]) ++ ;; ++ *) ++ [DATADIRNAME=lib] ++ ;; ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) ++ ++IT_PO_SUBDIR([po]) ++ ++dnl The following is very similar to ++dnl ++dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) ++dnl ++dnl with the following slight differences: ++dnl - the *.in files are in ac_aux_dir, ++dnl - if the file haven't changed upon reconfigure, it's not touched, ++dnl - the evaluation of the third parameter enables a hack which computes ++dnl the actual value of $libdir, ++dnl - the user sees "executing intltool commands", instead of ++dnl "creating intltool-extract" and such. ++dnl ++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were ++dnl a reason for it. ++ ++AC_CONFIG_COMMANDS([intltool], [ ++ ++for file in intltool-extract intltool-merge intltool-update; do ++ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ ++ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ ++ -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ ++ -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ ++ -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ ++ -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ ++ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ ++ < ${ac_aux_dir}/${file}.in > ${file}.out ++ if cmp -s ${file} ${file}.out 2>/dev/null; then ++ rm -f ${file}.out ++ else ++ mv -f ${file}.out ${file} ++ fi ++ chmod ugo+x ${file} ++ chmod u+w ${file} ++done ++ ++], ++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' ++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' ++INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' ++INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) ++ ++]) ++ ++ ++# IT_PO_SUBDIR(DIRNAME) ++# --------------------- ++# All po subdirs have to be declared with this macro; the subdir "po" is ++# declared by IT_PROG_INTLTOOL. ++# ++AC_DEFUN([IT_PO_SUBDIR], ++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. ++dnl ++dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl of config.status. ++AC_CONFIG_COMMANDS_PRE([ ++ AC_CONFIG_COMMANDS([$1/stamp-it], [ ++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" ++ >"$1/stamp-it.tmp" ++ [sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ++ ] ++ if test ! -f "$1/Makefile"; then ++ AC_MSG_ERROR([$1/Makefile is not ready.]) ++ fi ++ mv "$1/Makefile" "$1/Makefile.tmp" ++ [sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r $1/POTFILES ++ } ++ ' "$1/Makefile.tmp" >"$1/Makefile"] ++ rm -f "$1/Makefile.tmp" ++ mv "$1/stamp-it.tmp" "$1/stamp-it" ++ ]) ++])dnl ++]) ++ ++ ++# deprecated macros ++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) ++# A hint is needed for aclocal from Automake <= 1.9.4: ++# AC_DEFUN([AC_PROG_INTLTOOL], ...) ++ ++ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 48 AC_PROG_LIBTOOL ++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -2772,18 +2125,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-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='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -2939,7 +2280,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -2953,27 +2294,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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;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 +@@ -2985,7 +2309,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -2994,7 +2318,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -3702,7 +3026,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -3756,11 +3080,11 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + 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 +@@ -4508,7 +3832,7 @@ + freebsd-elf*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_AC_TAGVAR(ld_shlibs, $1)=yes +@@ -4667,7 +3991,7 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -4769,7 +4093,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= +@@ -6034,7 +5358,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[[ABCDGIRSTW]]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -6307,7 +5631,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -6350,7 +5674,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -6393,7 +5717,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -6604,7 +5928,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +@@ -6745,6 +6069,9 @@ + 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' + ;; +@@ -6915,7 +6242,7 @@ + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -6941,12 +6268,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$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= +@@ -7276,7 +6604,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes +@@ -7378,7 +6706,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 +@@ -7918,7 +7246,8 @@ + + _PKG_TEXT + ])], +- [$4]) ++ [AC_MSG_RESULT([no]) ++ $4]) + elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl + [The pkg-config script could not be found or is too old. Make sure it +@@ -7937,5 +7266,904 @@ + fi[]dnl + ])# PKG_CHECK_MODULES + +-m4_include([m4/gnome-doc-utils.m4]) +-m4_include([m4/intltool.m4]) ++# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) ++ ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION so it can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++ [AM_AUTOMAKE_VERSION([1.9.6])]) ++ ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. ++ ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) ++ ++ ++# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# This was merged into AC_PROG_CC in Autoconf. ++ ++AU_DEFUN([AM_PROG_CC_STDC], ++[AC_PROG_CC ++AC_DIAGNOSE([obsolete], [$0: ++ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon ++ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when ++ you adjust the code. You can also remove the above call to ++ AC_PROG_CC if you already called it elsewhere.]) ++am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc ++]) ++AU_DEFUN([fp_PROG_CC_STDC]) ++ ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 7 ++ ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE]) ++AC_SUBST([$1_FALSE]) ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) ++ ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 8 ++ ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ ++ ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl ++ ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) ++ ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_$1_dependencies_compiler_type=none ++fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) ++ ++ ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) ++ ++ ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH]) ++]) ++ ++# Generate code to set up dependency tracking. -*- Autoconf -*- ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++#serial 3 ++ ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ ++ ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 8 ++ ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ ++# Do all the work for Automake. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 12 ++ ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. ++ ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.58])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++# test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++fi ++ ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) ++ ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++]) ++]) ++ ++ ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. ++ ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $1 | $1:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++install_sh=${install_sh-"$am_aux_dir/install-sh"} ++AC_SUBST(install_sh)]) ++ ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) ++ ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ ++# Check to see how 'make' treats includes. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 3 ++ ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) ++ ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi ++]) ++ ++# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_MKDIR_P ++# --------------- ++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. ++# ++# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories ++# created by `make install' are always world readable, even if the ++# installer happens to have an overly restrictive umask (e.g. 077). ++# This was a mistake. There are at least two reasons why we must not ++# use `-m 0755': ++# - it causes special bits like SGID to be ignored, ++# - it may be too restrictive (some setups expect 775 directories). ++# ++# Do not use -m 0755 and let people choose whatever they expect by ++# setting umask. ++# ++# We cannot accept any implementation of `mkdir' that recognizes `-p'. ++# Some implementations (such as Solaris 8's) are not thread-safe: if a ++# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' ++# concurrently, both version can detect that a/ is missing, but only ++# one can create it and the other will error out. Consequently we ++# restrict ourselves to GNU make (using the --version option ensures ++# this.) ++AC_DEFUN([AM_PROG_MKDIR_P], ++[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++ # We used to keeping the `.' as first argument, in order to ++ # allow $(mkdir_p) to be used without argument. As in ++ # $(mkdir_p) $(somedir) ++ # where $(somedir) is conditionally defined. However this is wrong ++ # for two reasons: ++ # 1. if the package is installed by a user who cannot write `.' ++ # make install will fail, ++ # 2. the above comment should most certainly read ++ # $(mkdir_p) $(DESTDIR)$(somedir) ++ # so it does not work when $(somedir) is undefined and ++ # $(DESTDIR) is not. ++ # To support the latter case, we have to write ++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), ++ # so the `.' trick is pointless. ++ mkdir_p='mkdir -p --' ++else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ for d in ./-p ./--version; ++ do ++ test -d $d && rmdir $d ++ done ++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. ++ if test -f "$ac_aux_dir/mkinstalldirs"; then ++ mkdir_p='$(mkinstalldirs)' ++ else ++ mkdir_p='$(install_sh) -d' ++ fi ++fi ++AC_SUBST([mkdir_p])]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 3 ++ ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++ ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++ ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ ++# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++ ++# Check how to create a tarball. -*- Autoconf -*- ++ ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac ++ ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir ++ ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR ++ +diff -urNad gnome-system-tools-2.18.1~/aclocal.m4.rej gnome-system-tools-2.18.1/aclocal.m4.rej +--- gnome-system-tools-2.18.1~/aclocal.m4.rej 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-system-tools-2.18.1/aclocal.m4.rej 2007-04-10 12:21:12.000000000 +0200 +@@ -0,0 +1,1315 @@ ++*************** ++*** 7937,8344 **** ++ fi[]dnl ++ ])# PKG_CHECK_MODULES ++ ++- # Copyright (C) 1995-2002 Free Software Foundation, Inc. ++- # Copyright (C) 2001-2003,2004 Red Hat, Inc. ++ # ++- # This file is free software, distributed under the terms of the GNU ++- # General Public License. As a special exception to the GNU General ++- # Public License, this file may be distributed as part of a program ++- # that contains a configuration script generated by Autoconf, under ++- # the same distribution terms as the rest of that program. ++ # ++- # This file can be copied and used freely without restrictions. It can ++- # be used in projects which are not available under the GNU Public License ++- # but which still want to provide support for the GNU gettext functionality. ++ # ++- # Macro to add for using GNU gettext. ++- # Ulrich Drepper , 1995, 1996 ++ # ++- # Modified to never use included libintl. ++- # Owen Taylor , 12/15/1998 ++ # ++- # Major rework to remove unused code ++- # Owen Taylor , 12/11/2002 ++ # ++- # Added better handling of ALL_LINGUAS from GNU gettext version ++- # written by Bruno Haible, Owen Taylor 5/30/3002 ++ # ++- # Modified to require ngettext ++- # Matthias Clasen 08/06/2004 ++ # ++- # We need this here as well, since someone might use autoconf-2.5x ++- # to configure GLib then an older version to configure a package ++- # using AM_GLIB_GNU_GETTEXT ++- AC_PREREQ(2.53) ++ ++- dnl ++- dnl We go to great lengths to make sure that aclocal won't ++- dnl try to pull in the installed version of these macros ++- dnl when running aclocal in the glib directory. ++- dnl ++- m4_copy([AC_DEFUN],[glib_DEFUN]) ++- m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++- dnl ++- dnl At the end, if we're not within glib, we'll define the public ++- dnl definitions in terms of our private definitions. ++- dnl ++ ++- # GLIB_LC_MESSAGES ++- #-------------------- ++- glib_DEFUN([GLIB_LC_MESSAGES], ++- [AC_CHECK_HEADERS([locale.h]) ++- if test $ac_cv_header_locale_h = yes; then ++- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++- [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++- if test $am_cv_val_LC_MESSAGES = yes; then ++- AC_DEFINE(HAVE_LC_MESSAGES, 1, ++- [Define if your file defines LC_MESSAGES.]) ++- fi ++- fi]) ++ ++- # GLIB_PATH_PROG_WITH_TEST ++- #---------------------------- ++- dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++- dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++- glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++- [# Extract the first word of "$2", so it can be a program name with args. ++- set dummy $2; ac_word=[$]2 ++- AC_MSG_CHECKING([for $ac_word]) ++- AC_CACHE_VAL(ac_cv_path_$1, ++- [case "[$]$1" in ++- /*) ++- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++- ;; ++- *) ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in ifelse([$5], , $PATH, [$5]); do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- if [$3]; then ++- ac_cv_path_$1="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++- IFS="$ac_save_ifs" ++- dnl If no 4th arg is given, leave the cache variable unset, ++- dnl so AC_PATH_PROGS will keep looking. ++- ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++- ])dnl ++- ;; ++- esac])dnl ++- $1="$ac_cv_path_$1" ++- if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++- AC_MSG_RESULT([$]$1) ++ else ++- AC_MSG_RESULT(no) ++ fi ++- AC_SUBST($1)dnl ++ ]) ++ ++- # GLIB_WITH_NLS ++- #----------------- ++- glib_DEFUN([GLIB_WITH_NLS], ++- dnl NLS is obligatory ++- [AC_REQUIRE([AC_CANONICAL_HOST])dnl ++- USE_NLS=yes ++- AC_SUBST(USE_NLS) ++ ++- gt_cv_have_gettext=no ++ ++- CATOBJEXT=NONE ++- XGETTEXT=: ++- INTLLIBS= ++ ++- AC_CHECK_HEADER(libintl.h, ++- [gt_cv_func_dgettext_libintl="no" ++- libintl_extra_libs="" ++ ++- # ++- # First check in libc ++- # ++- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++- [AC_TRY_LINK([ ++- #include ++- ], ++- [return !ngettext ("","", 1)], ++- gt_cv_func_ngettext_libc=yes, ++- gt_cv_func_ngettext_libc=no) ++- ]) ++- ++- if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++- [AC_TRY_LINK([ ++- #include ++- ], ++- [return !dgettext ("","")], ++- gt_cv_func_dgettext_libc=yes, ++- gt_cv_func_dgettext_libc=no) ++- ]) ++- fi ++- ++- if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++- AC_CHECK_FUNCS(bind_textdomain_codeset) ++- fi ++ ++- # ++- # If we don't have everything we want, check in libintl ++- # ++- if test "$gt_cv_func_dgettext_libc" != "yes" \ ++- || test "$gt_cv_func_ngettext_libc" != "yes" \ ++- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++- ++- AC_CHECK_LIB(intl, bindtextdomain, ++- [AC_CHECK_LIB(intl, ngettext, ++- [AC_CHECK_LIB(intl, dgettext, ++- gt_cv_func_dgettext_libintl=yes)])]) ++ ++- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++- AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++- AC_MSG_RESULT([]) ++- AC_CHECK_LIB(intl, ngettext, ++- [AC_CHECK_LIB(intl, dcgettext, ++- [gt_cv_func_dgettext_libintl=yes ++- libintl_extra_libs=-liconv], ++- :,-liconv)], ++- :,-liconv) ++- fi ++ ++- # ++- # If we found libintl, then check in it for bind_textdomain_codeset(); ++- # we'll prefer libc if neither have bind_textdomain_codeset(), ++- # and both have dgettext and ngettext ++- # ++- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++- glib_save_LIBS="$LIBS" ++- LIBS="$LIBS -lintl $libintl_extra_libs" ++- unset ac_cv_func_bind_textdomain_codeset ++- AC_CHECK_FUNCS(bind_textdomain_codeset) ++- LIBS="$glib_save_LIBS" ++ ++- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++- gt_cv_func_dgettext_libc=no ++- else ++- if test "$gt_cv_func_dgettext_libc" = "yes" \ ++- && test "$gt_cv_func_ngettext_libc" = "yes"; then ++- gt_cv_func_dgettext_libintl=no ++- fi ++- fi ++- fi ++- fi ++ ++- if test "$gt_cv_func_dgettext_libc" = "yes" \ ++- || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++- gt_cv_have_gettext=yes ++- fi ++- ++- if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++- INTLLIBS="-lintl $libintl_extra_libs" ++- fi ++- ++- if test "$gt_cv_have_gettext" = "yes"; then ++- AC_DEFINE(HAVE_GETTEXT,1, ++- [Define if the GNU gettext() function is already present or preinstalled.]) ++- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++- if test "$MSGFMT" != "no"; then ++- glib_save_LIBS="$LIBS" ++- LIBS="$LIBS $INTLLIBS" ++- AC_CHECK_FUNCS(dcgettext) ++- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++- return _nl_msg_cat_cntr], ++- [CATOBJEXT=.gmo ++- DATADIRNAME=share], ++- [case $host in ++- *-*-solaris*) ++- dnl On Solaris, if bind_textdomain_codeset is in libc, ++- dnl GNU format message catalog is always supported, ++- dnl since both are added to the libc all together. ++- dnl Hence, we'd like to go with DATADIRNAME=share and ++- dnl and CATOBJEXT=.gmo in this case. ++- AC_CHECK_FUNC(bind_textdomain_codeset, ++- [CATOBJEXT=.gmo ++- DATADIRNAME=share], ++- [CATOBJEXT=.mo ++- DATADIRNAME=lib]) ++- ;; ++- *) ++- CATOBJEXT=.mo ++- DATADIRNAME=lib ++- ;; ++- esac]) ++- LIBS="$glib_save_LIBS" ++- INSTOBJEXT=.mo ++- else ++- gt_cv_have_gettext=no ++- fi ++- fi ++- ]) ++ ++- if test "$gt_cv_have_gettext" = "yes" ; then ++- AC_DEFINE(ENABLE_NLS, 1, ++- [always defined to indicate that i18n is enabled]) ++- fi ++ ++- dnl Test whether we really found GNU xgettext. ++- if test "$XGETTEXT" != ":"; then ++- dnl If it is not GNU xgettext we define it as : so that the ++- dnl Makefiles still can work. ++- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++- : ; ++- else ++- AC_MSG_RESULT( ++- [found xgettext program is not GNU xgettext; ignore it]) ++- XGETTEXT=":" ++- fi ++- fi ++ ++- # We need to process the po/ directory. ++- POSUB=po ++ ++- AC_OUTPUT_COMMANDS( ++- [case "$CONFIG_FILES" in *po/Makefile.in*) ++- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++- esac]) ++ ++- dnl These rules are solely for the distribution goal. While doing this ++- dnl we only have to keep exactly one list of the available catalogs ++- dnl in configure.in. ++- for lang in $ALL_LINGUAS; do ++- GMOFILES="$GMOFILES $lang.gmo" ++- POFILES="$POFILES $lang.po" ++- done ++ ++- dnl Make all variables we use known to autoconf. ++- AC_SUBST(CATALOGS) ++- AC_SUBST(CATOBJEXT) ++- AC_SUBST(DATADIRNAME) ++- AC_SUBST(GMOFILES) ++- AC_SUBST(INSTOBJEXT) ++- AC_SUBST(INTLLIBS) ++- AC_SUBST(PO_IN_DATADIR_TRUE) ++- AC_SUBST(PO_IN_DATADIR_FALSE) ++- AC_SUBST(POFILES) ++- AC_SUBST(POSUB) ++- ]) ++ ++- # AM_GLIB_GNU_GETTEXT ++- # ------------------- ++- # Do checks necessary for use of gettext. If a suitable implementation ++- # of gettext is found in either in libintl or in the C library, ++- # it will set INTLLIBS to the libraries needed for use of gettext ++- # and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ++- # gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ++- # on various variables needed by the Makefile.in.in installed by ++- # glib-gettextize. ++- dnl ++- glib_DEFUN([GLIB_GNU_GETTEXT], ++- [AC_REQUIRE([AC_PROG_CC])dnl ++- AC_REQUIRE([AC_HEADER_STDC])dnl ++- ++- GLIB_LC_MESSAGES ++- GLIB_WITH_NLS ++ ++- if test "$gt_cv_have_gettext" = "yes"; then ++- if test "x$ALL_LINGUAS" = "x"; then ++- LINGUAS= ++- else ++- AC_MSG_CHECKING(for catalogs to be installed) ++- NEW_LINGUAS= ++- for presentlang in $ALL_LINGUAS; do ++- useit=no ++- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++- desiredlanguages="$LINGUAS" ++- else ++- desiredlanguages="$ALL_LINGUAS" ++- fi ++- for desiredlang in $desiredlanguages; do ++- # Use the presentlang catalog if desiredlang is ++- # a. equal to presentlang, or ++- # b. a variant of presentlang (because in this case, ++- # presentlang can be used as a fallback for messages ++- # which are not translated in the desiredlang catalog). ++- case "$desiredlang" in ++- "$presentlang"*) useit=yes;; ++- esac ++- done ++- if test $useit = yes; then ++- NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++- fi ++- done ++- LINGUAS=$NEW_LINGUAS ++- AC_MSG_RESULT($LINGUAS) ++- fi ++ ++- dnl Construct list of names of catalog files to be constructed. ++- if test -n "$LINGUAS"; then ++- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++- fi ++- fi ++ ++- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++- dnl Try to locate is. ++- MKINSTALLDIRS= ++- if test -n "$ac_aux_dir"; then ++- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++- if test -z "$MKINSTALLDIRS"; then ++- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++- AC_SUBST(MKINSTALLDIRS) ++ ++- dnl Generate list of files to be processed by xgettext which will ++- dnl be included in po/Makefile. ++- test -d po || mkdir po ++- if test "x$srcdir" != "x."; then ++- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++- posrcprefix="$srcdir/" ++- else ++- posrcprefix="../$srcdir/" ++- fi ++- else ++- posrcprefix="../" ++ fi ++- rm -f po/POTFILES ++- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++- < $srcdir/po/POTFILES.in > po/POTFILES ++- ]) ++ ++- # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++- # ------------------------------- ++- # Define VARIABLE to the location where catalog files will ++- # be installed by po/Makefile. ++- glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++- [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++- glib_save_prefix="$prefix" ++- glib_save_exec_prefix="$exec_prefix" ++- glib_save_datarootdir="$datarootdir" ++- test "x$prefix" = xNONE && prefix=$ac_default_prefix ++- test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++- datarootdir=`eval echo "${datarootdir}"` ++- if test "x$CATOBJEXT" = "x.mo" ; then ++- localedir=`eval echo "${libdir}/locale"` ++ else ++- localedir=`eval echo "${datadir}/locale"` ++ fi ++- prefix="$glib_save_prefix" ++- exec_prefix="$glib_save_exec_prefix" ++- datarootdir="$glib_save_datarootdir" ++- AC_DEFINE_UNQUOTED($1, "$localedir", ++- [Define the location where the catalogs will be installed]) ++- ]) ++ ++- dnl ++- dnl Now the definitions that aclocal will find ++- dnl ++- ifdef(glib_configure_in,[],[ ++- AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++- AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++- ])dnl ++ ++- m4_include([m4/gnome-doc-utils.m4]) ++- m4_include([m4/intltool.m4]) ++--- 7266,8169 ---- ++ fi[]dnl ++ ])# PKG_CHECK_MODULES ++ +++ # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. ++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # AM_AUTOMAKE_VERSION(VERSION) +++ # ---------------------------- +++ # Automake X.Y traces this macro to ensure aclocal.m4 has been +++ # generated from the m4 files accompanying Automake X.Y. +++ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +++ +++ # AM_SET_CURRENT_AUTOMAKE_VERSION +++ # ------------------------------- +++ # Call AM_AUTOMAKE_VERSION so it can be traced. +++ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +++ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +++ [AM_AUTOMAKE_VERSION([1.9.6])]) +++ +++ # AM_AUX_DIR_EXPAND -*- Autoconf -*- +++ +++ # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +++ # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +++ # `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++ # +++ # Of course, Automake must honor this variable whenever it calls a +++ # tool from the auxiliary directory. The problem is that $srcdir (and +++ # therefore $ac_aux_dir as well) can be either absolute or relative, +++ # depending on how configure is run. This is pretty annoying, since +++ # it makes $ac_aux_dir quite unusable in subdirectories: in the top +++ # source directory, any form will work fine, but in subdirectories a +++ # relative path needs to be adjusted first. ++ # +++ # $ac_aux_dir/missing +++ # fails when called from a subdirectory if $ac_aux_dir is relative +++ # $top_srcdir/$ac_aux_dir/missing +++ # fails if $ac_aux_dir is absolute, +++ # fails when called from a subdirectory in a VPATH build with +++ # a relative $ac_aux_dir ++ # +++ # The reason of the latter failure is that $top_srcdir and $ac_aux_dir +++ # are both prefixed by $srcdir. In an in-source build this is usually +++ # harmless because $srcdir is `.', but things will broke when you +++ # start a VPATH build or use an absolute $srcdir. ++ # +++ # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +++ # iff we strip the leading $srcdir from $ac_aux_dir. That would be: +++ # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +++ # and then we would define $MISSING as +++ # MISSING="\${SHELL} $am_aux_dir/missing" +++ # This will work as long as MISSING is not called from configure, because +++ # unfortunately $(top_srcdir) has no meaning in configure. +++ # However there are other variables, like CC, which are often used in +++ # configure, and could therefore not use this "fixed" $ac_aux_dir. ++ # +++ # Another solution, used here, is to always expand $ac_aux_dir to an +++ # absolute PATH. The drawback is that using absolute paths prevent a +++ # configured tree to be moved without reconfiguration. +++ +++ AC_DEFUN([AM_AUX_DIR_EXPAND], +++ [dnl Rely on autoconf to set up CDPATH properly. +++ AC_PREREQ([2.50])dnl +++ # expand $ac_aux_dir to an absolute path +++ am_aux_dir=`cd $ac_aux_dir && pwd` +++ ]) +++ +++ +++ # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 +++ # Free Software Foundation, Inc. ++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. ++ +++ # serial 4 ++ +++ # This was merged into AC_PROG_CC in Autoconf. ++ +++ AU_DEFUN([AM_PROG_CC_STDC], +++ [AC_PROG_CC +++ AC_DIAGNOSE([obsolete], [$0: +++ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon +++ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when +++ you adjust the code. You can also remove the above call to +++ AC_PROG_CC if you already called it elsewhere.]) +++ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +++ ]) +++ AU_DEFUN([fp_PROG_CC_STDC]) +++ +++ # AM_CONDITIONAL -*- Autoconf -*- +++ +++ # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # serial 7 +++ +++ # AM_CONDITIONAL(NAME, SHELL-CONDITION) +++ # ------------------------------------- +++ # Define a conditional. +++ AC_DEFUN([AM_CONDITIONAL], +++ [AC_PREREQ(2.52)dnl +++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +++ AC_SUBST([$1_TRUE]) +++ AC_SUBST([$1_FALSE]) +++ if $2; then +++ $1_TRUE= +++ $1_FALSE='#' +++ else +++ $1_TRUE='#' +++ $1_FALSE= +++ fi +++ AC_CONFIG_COMMANDS_PRE( +++ [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +++ AC_MSG_ERROR([[conditional "$1" was never defined. +++ Usually this means the macro was only invoked conditionally.]]) +++ fi])]) +++ +++ +++ # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # serial 8 +++ +++ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +++ # written in clear, in which case automake, when reading aclocal.m4, +++ # will think it sees a *use*, and therefore will trigger all it's +++ # C support machinery. Also note that it means that autoscan, seeing +++ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... +++ +++ +++ # _AM_DEPENDENCIES(NAME) +++ # ---------------------- +++ # See how the compiler implements dependency checking. +++ # NAME is "CC", "CXX", "GCJ", or "OBJC". +++ # We try a few techniques and use that to set a single cache variable. +++ # +++ # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +++ # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +++ # dependency, and given that the user is not expected to run this macro, +++ # just rely on AC_PROG_CC. +++ AC_DEFUN([_AM_DEPENDENCIES], +++ [AC_REQUIRE([AM_SET_DEPDIR])dnl +++ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +++ AC_REQUIRE([AM_MAKE_INCLUDE])dnl +++ AC_REQUIRE([AM_DEP_TRACK])dnl +++ +++ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +++ [$1], CXX, [depcc="$CXX" am_compiler_list=], +++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +++ [depcc="$$1" am_compiler_list=]) +++ +++ AC_CACHE_CHECK([dependency style of $depcc], +++ [am_cv_$1_dependencies_compiler_type], +++ [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +++ # We make a subdir and do the tests there. Otherwise we can end up +++ # making bogus files that we don't know about and never remove. For +++ # instance it was reported that on HP-UX the gcc test will end up +++ # making a dummy file named `D' -- because `-MD' means `put the output +++ # in D'. +++ mkdir conftest.dir +++ # Copy depcomp to subdir because otherwise we won't find it if we're +++ # using a relative directory. +++ cp "$am_depcomp" conftest.dir +++ cd conftest.dir +++ # We will build objects and dependencies in a subdirectory because +++ # it helps to detect inapplicable dependency modes. For instance +++ # both Tru64's cc and ICC support -MD to output dependencies as a +++ # side effect of compilation, but ICC will put the dependencies in +++ # the current directory while Tru64 will put them in the object +++ # directory. +++ mkdir sub +++ +++ am_cv_$1_dependencies_compiler_type=none +++ if test "$am_compiler_list" = ""; then +++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +++ fi +++ for depmode in $am_compiler_list; do +++ # Setup a source with many dependencies, because some compilers +++ # like to wrap large dependency lists on column 80 (with \), and +++ # we should not choose a depcomp mode which is confused by this. +++ # +++ # We need to recreate these files for each test, as the compiler may +++ # overwrite some of them when testing with obscure command lines. +++ # This happens at least with the AIX C compiler. +++ : > sub/conftest.c +++ for i in 1 2 3 4 5 6; do +++ echo '#include "conftst'$i'.h"' >> sub/conftest.c +++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +++ # Solaris 8's {/usr,}/bin/sh. +++ touch sub/conftst$i.h +++ done +++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +++ +++ case $depmode in +++ nosideeffect) +++ # after this tag, mechanisms are not by side-effect, so they'll +++ # only be used when explicitly requested +++ if test "x$enable_dependency_tracking" = xyes; then +++ continue +++ else ++ break ++ fi +++ ;; +++ none) break ;; +++ esac +++ # We check with `-c' and `-o' for the sake of the "dashmstdout" +++ # mode. It turns out that the SunPro C++ compiler does not properly +++ # handle `-M -o', and we need to detect this. +++ if depmode=$depmode \ +++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +++ >/dev/null 2>conftest.err && +++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +++ # icc doesn't choke on unknown options, it will just issue warnings +++ # or remarks (even with -Werror). So we grep stderr for any message +++ # that says an option was ignored or not supported. +++ # When given -MP, icc 7.0 and 7.1 complain thusly: +++ # icc: Command line warning: ignoring option '-M'; no argument required +++ # The diagnosis changed in icc 8.0: +++ # icc: Command line remark: option '-MP' not supported +++ if (grep 'ignoring option' conftest.err || +++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +++ am_cv_$1_dependencies_compiler_type=$depmode +++ break +++ fi ++ fi ++ done +++ +++ cd .. +++ rm -rf conftest.dir ++ else +++ am_cv_$1_dependencies_compiler_type=none ++ fi +++ ]) +++ AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +++ AM_CONDITIONAL([am__fastdep$1], [ +++ test "x$enable_dependency_tracking" != xno \ +++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++ ]) ++ ++ +++ # AM_SET_DEPDIR +++ # ------------- +++ # Choose a directory name for dependency files. +++ # This macro is AC_REQUIREd in _AM_DEPENDENCIES +++ AC_DEFUN([AM_SET_DEPDIR], +++ [AC_REQUIRE([AM_SET_LEADING_DOT])dnl +++ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +++ ]) ++ ++ +++ # AM_DEP_TRACK +++ # ------------ +++ AC_DEFUN([AM_DEP_TRACK], +++ [AC_ARG_ENABLE(dependency-tracking, +++ [ --disable-dependency-tracking speeds up one-time build +++ --enable-dependency-tracking do not reject slow dependency extractors]) +++ if test "x$enable_dependency_tracking" != xno; then +++ am_depcomp="$ac_aux_dir/depcomp" +++ AMDEPBACKSLASH='\' +++ fi +++ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +++ AC_SUBST([AMDEPBACKSLASH]) +++ ]) ++ +++ # Generate code to set up dependency tracking. -*- Autoconf -*- ++ +++ # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. ++ +++ #serial 3 ++ +++ # _AM_OUTPUT_DEPENDENCY_COMMANDS +++ # ------------------------------ +++ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +++ [for mf in $CONFIG_FILES; do +++ # Strip MF so we end up with the name of the file. +++ mf=`echo "$mf" | sed -e 's/:.*$//'` +++ # Check whether this is an Automake generated Makefile or not. +++ # We used to match only the files named `Makefile.in', but +++ # some people rename them; so instead we look at the file content. +++ # Grep'ing the first line is not enough: some people post-process +++ # each Makefile.in and add a new line on top of each file to say so. +++ # So let's grep whole file. +++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +++ dirpart=`AS_DIRNAME("$mf")` +++ else +++ continue +++ fi +++ # Extract the definition of DEPDIR, am__include, and am__quote +++ # from the Makefile without running `make'. +++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +++ test -z "$DEPDIR" && continue +++ am__include=`sed -n 's/^am__include = //p' < "$mf"` +++ test -z "am__include" && continue +++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +++ # When using ansi2knr, U may be empty or an underscore; expand it +++ U=`sed -n 's/^U = //p' < "$mf"` +++ # Find all dependency output files, they are included files with +++ # $(DEPDIR) in their names. We invoke sed twice because it is the +++ # simplest approach to changing $(DEPDIR) to its actual value in the +++ # expansion. +++ for file in `sed -n " +++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +++ # Make sure the directory exists. +++ test -f "$dirpart/$file" && continue +++ fdir=`AS_DIRNAME(["$file"])` +++ AS_MKDIR_P([$dirpart/$fdir]) +++ # echo "creating $dirpart/$file" +++ echo '# dummy' > "$dirpart/$file" +++ done +++ done +++ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ ++ +++ # AM_OUTPUT_DEPENDENCY_COMMANDS +++ # ----------------------------- +++ # This macro should only be invoked once -- use via AC_REQUIRE. +++ # +++ # This code is only required when automatic dependency tracking +++ # is enabled. FIXME. This creates each `.P' file that we will +++ # need in order to bootstrap the dependency handling code. +++ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +++ [AC_CONFIG_COMMANDS([depfiles], +++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +++ ]) ++ +++ # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. ++ +++ # serial 8 ++ +++ # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +++ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ +++ # Do all the work for Automake. -*- Autoconf -*- ++ +++ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. ++ +++ # serial 12 ++ +++ # This macro actually does too much. Some checks are only needed if +++ # your package does certain things. But this isn't really a big deal. ++ +++ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +++ # AM_INIT_AUTOMAKE([OPTIONS]) +++ # ----------------------------------------------- +++ # The call with PACKAGE and VERSION arguments is the old style +++ # call (pre autoconf-2.50), which is being phased out. PACKAGE +++ # and VERSION should now be passed to AC_INIT and removed from +++ # the call to AM_INIT_AUTOMAKE. +++ # We support both call styles for the transition. After +++ # the next Automake release, Autoconf can make the AC_INIT +++ # arguments mandatory, and then we can depend on a new Autoconf +++ # release and drop the old call support. +++ AC_DEFUN([AM_INIT_AUTOMAKE], +++ [AC_PREREQ([2.58])dnl +++ dnl Autoconf wants to disallow AM_ names. We explicitly allow +++ dnl the ones we care about. +++ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +++ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +++ AC_REQUIRE([AC_PROG_INSTALL])dnl +++ # test to see if srcdir already configured +++ if test "`cd $srcdir && pwd`" != "`pwd`" && +++ test -f $srcdir/config.status; then +++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +++ fi ++ +++ # test whether we have cygpath +++ if test -z "$CYGPATH_W"; then +++ if (cygpath --version) >/dev/null 2>/dev/null; then +++ CYGPATH_W='cygpath -w' +++ else +++ CYGPATH_W=echo +++ fi +++ fi +++ AC_SUBST([CYGPATH_W]) ++ +++ # Define the identity of the package. +++ dnl Distinguish between old-style and new-style calls. +++ m4_ifval([$2], +++ [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +++ AC_SUBST([PACKAGE], [$1])dnl +++ AC_SUBST([VERSION], [$2])], +++ [_AM_SET_OPTIONS([$1])dnl +++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +++ +++ _AM_IF_OPTION([no-define],, +++ [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +++ +++ # Some tools Automake needs. +++ AC_REQUIRE([AM_SANITY_CHECK])dnl +++ AC_REQUIRE([AC_ARG_PROGRAM])dnl +++ AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +++ AM_MISSING_PROG(AUTOCONF, autoconf) +++ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +++ AM_MISSING_PROG(AUTOHEADER, autoheader) +++ AM_MISSING_PROG(MAKEINFO, makeinfo) +++ AM_PROG_INSTALL_SH +++ AM_PROG_INSTALL_STRIP +++ AC_REQUIRE([AM_PROG_MKDIR_P])dnl +++ # We need awk for the "check" target. The system "awk" is bad on +++ # some platforms. +++ AC_REQUIRE([AC_PROG_AWK])dnl +++ AC_REQUIRE([AC_PROG_MAKE_SET])dnl +++ AC_REQUIRE([AM_SET_LEADING_DOT])dnl +++ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +++ [_AM_PROG_TAR([v7])])]) +++ _AM_IF_OPTION([no-dependencies],, +++ [AC_PROVIDE_IFELSE([AC_PROG_CC], +++ [_AM_DEPENDENCIES(CC)], +++ [define([AC_PROG_CC], +++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +++ AC_PROVIDE_IFELSE([AC_PROG_CXX], +++ [_AM_DEPENDENCIES(CXX)], +++ [define([AC_PROG_CXX], +++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +++ ]) +++ ]) +++ +++ +++ # When config.status generates a header, we must update the stamp-h file. +++ # This file resides in the same directory as the config header +++ # that is generated. The stamp files are numbered to have different names. +++ +++ # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +++ # loop where config.status creates the headers, so we can generate +++ # our stamp files there. +++ AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +++ [# Compute $1's index in $config_headers. +++ _am_stamp_count=1 +++ for _am_header in $config_headers :; do +++ case $_am_header in +++ $1 | $1:* ) +++ break ;; +++ * ) +++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; +++ esac +++ done +++ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +++ +++ # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # AM_PROG_INSTALL_SH +++ # ------------------ +++ # Define $install_sh. +++ AC_DEFUN([AM_PROG_INSTALL_SH], +++ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +++ install_sh=${install_sh-"$am_aux_dir/install-sh"} +++ AC_SUBST(install_sh)]) +++ +++ # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # serial 2 +++ +++ # Check whether the underlying file-system supports filenames +++ # with a leading dot. For instance MS-DOS doesn't. +++ AC_DEFUN([AM_SET_LEADING_DOT], +++ [rm -rf .tst 2>/dev/null +++ mkdir .tst 2>/dev/null +++ if test -d .tst; then +++ am__leading_dot=. +++ else +++ am__leading_dot=_ +++ fi +++ rmdir .tst 2>/dev/null +++ AC_SUBST([am__leading_dot])]) +++ +++ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +++ # From Jim Meyering +++ +++ # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # serial 4 +++ +++ AC_DEFUN([AM_MAINTAINER_MODE], +++ [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +++ dnl maintainer-mode is disabled by default +++ AC_ARG_ENABLE(maintainer-mode, +++ [ --enable-maintainer-mode enable make rules and dependencies not useful +++ (and sometimes confusing) to the casual installer], +++ USE_MAINTAINER_MODE=$enableval, +++ USE_MAINTAINER_MODE=no) +++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) +++ MAINT=$MAINTAINER_MODE_TRUE +++ AC_SUBST(MAINT)dnl +++ ] +++ ) +++ +++ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +++ +++ # Check to see how 'make' treats includes. -*- Autoconf -*- +++ +++ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # serial 3 +++ +++ # AM_MAKE_INCLUDE() +++ # ----------------- +++ # Check to see how make treats includes. +++ AC_DEFUN([AM_MAKE_INCLUDE], +++ [am_make=${MAKE-make} +++ cat > confinc << 'END' +++ am__doit: +++ @echo done +++ .PHONY: am__doit +++ END +++ # If we don't find an include directive, just comment out the code. +++ AC_MSG_CHECKING([for style of include used by $am_make]) +++ am__include="#" +++ am__quote= +++ _am_result=none +++ # First try GNU make style include. +++ echo "include confinc" > confmf +++ # We grep out `Entering directory' and `Leaving directory' +++ # messages which can occur if `w' ends up in MAKEFLAGS. +++ # In particular we don't look at `^make:' because GNU make might +++ # be invoked under some other name (usually "gmake"), in which +++ # case it prints its new name instead of `make'. +++ if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +++ am__include=include +++ am__quote= +++ _am_result=GNU +++ fi +++ # Now try BSD make style include. +++ if test "$am__include" = "#"; then +++ echo '.include "confinc"' > confmf +++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +++ am__include=.include +++ am__quote="\"" +++ _am_result=BSD ++ fi +++ fi +++ AC_SUBST([am__include]) +++ AC_SUBST([am__quote]) +++ AC_MSG_RESULT([$_am_result]) +++ rm -f confinc confmf +++ ]) +++ +++ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +++ +++ # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # serial 4 +++ +++ # AM_MISSING_PROG(NAME, PROGRAM) +++ # ------------------------------ +++ AC_DEFUN([AM_MISSING_PROG], +++ [AC_REQUIRE([AM_MISSING_HAS_RUN]) +++ $1=${$1-"${am_missing_run}$2"} +++ AC_SUBST($1)]) +++ +++ +++ # AM_MISSING_HAS_RUN +++ # ------------------ +++ # Define MISSING if not defined so far and test if it supports --run. +++ # If it does, set am_missing_run to use it, otherwise, to nothing. +++ AC_DEFUN([AM_MISSING_HAS_RUN], +++ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +++ test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +++ # Use eval to expand $SHELL +++ if eval "$MISSING --run true"; then +++ am_missing_run="$MISSING --run " +++ else +++ am_missing_run= +++ AC_MSG_WARN([`missing' script is too old or missing]) +++ fi +++ ]) +++ +++ # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # AM_PROG_MKDIR_P +++ # --------------- +++ # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +++ # +++ # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +++ # created by `make install' are always world readable, even if the +++ # installer happens to have an overly restrictive umask (e.g. 077). +++ # This was a mistake. There are at least two reasons why we must not +++ # use `-m 0755': +++ # - it causes special bits like SGID to be ignored, +++ # - it may be too restrictive (some setups expect 775 directories). +++ # +++ # Do not use -m 0755 and let people choose whatever they expect by +++ # setting umask. +++ # +++ # We cannot accept any implementation of `mkdir' that recognizes `-p'. +++ # Some implementations (such as Solaris 8's) are not thread-safe: if a +++ # parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +++ # concurrently, both version can detect that a/ is missing, but only +++ # one can create it and the other will error out. Consequently we +++ # restrict ourselves to GNU make (using the --version option ensures +++ # this.) +++ AC_DEFUN([AM_PROG_MKDIR_P], +++ [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +++ # We used to keeping the `.' as first argument, in order to +++ # allow $(mkdir_p) to be used without argument. As in +++ # $(mkdir_p) $(somedir) +++ # where $(somedir) is conditionally defined. However this is wrong +++ # for two reasons: +++ # 1. if the package is installed by a user who cannot write `.' +++ # make install will fail, +++ # 2. the above comment should most certainly read +++ # $(mkdir_p) $(DESTDIR)$(somedir) +++ # so it does not work when $(somedir) is undefined and +++ # $(DESTDIR) is not. +++ # To support the latter case, we have to write +++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +++ # so the `.' trick is pointless. +++ mkdir_p='mkdir -p --' +++ else +++ # On NextStep and OpenStep, the `mkdir' command does not +++ # recognize any option. It will interpret all options as +++ # directories to create, and then abort because `.' already +++ # exists. +++ for d in ./-p ./--version; +++ do +++ test -d $d && rmdir $d +++ done +++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +++ if test -f "$ac_aux_dir/mkinstalldirs"; then +++ mkdir_p='$(mkinstalldirs)' +++ else +++ mkdir_p='$(install_sh) -d' +++ fi +++ fi +++ AC_SUBST([mkdir_p])]) +++ +++ # Helper functions for option handling. -*- Autoconf -*- +++ +++ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # serial 3 +++ +++ # _AM_MANGLE_OPTION(NAME) +++ # ----------------------- +++ AC_DEFUN([_AM_MANGLE_OPTION], +++ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +++ +++ # _AM_SET_OPTION(NAME) +++ # ------------------------------ +++ # Set option NAME. Presently that only means defining a flag for this option. +++ AC_DEFUN([_AM_SET_OPTION], +++ [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +++ +++ # _AM_SET_OPTIONS(OPTIONS) +++ # ---------------------------------- +++ # OPTIONS is a space-separated list of Automake options. +++ AC_DEFUN([_AM_SET_OPTIONS], +++ [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +++ +++ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +++ # ------------------------------------------- +++ # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +++ AC_DEFUN([_AM_IF_OPTION], +++ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +++ +++ # Check to make sure that the build environment is sane. -*- Autoconf -*- +++ +++ # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # serial 4 +++ +++ # AM_SANITY_CHECK +++ # --------------- +++ AC_DEFUN([AM_SANITY_CHECK], +++ [AC_MSG_CHECKING([whether build environment is sane]) +++ # Just in case +++ sleep 1 +++ echo timestamp > conftest.file +++ # Do `set' in a subshell so we don't clobber the current shell's +++ # arguments. Must try -L first in case configure is actually a +++ # symlink; some systems play weird games with the mod time of symlinks +++ # (eg FreeBSD returns the mod time of the symlink's containing +++ # directory). +++ if ( +++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +++ if test "$[*]" = "X"; then +++ # -L didn't work. +++ set X `ls -t $srcdir/configure conftest.file` ++ fi +++ rm -f conftest.file +++ if test "$[*]" != "X $srcdir/configure conftest.file" \ +++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ +++ # If neither matched, then we have a broken ls. This can happen +++ # if, for instance, CONFIG_SHELL is bash and it inherits a +++ # broken ls alias from the environment. This has actually +++ # happened. Such a system could not be considered "sane". +++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +++ alias in your environment]) ++ fi ++ +++ test "$[2]" = conftest.file +++ ) +++ then +++ # Ok. +++ : ++ else +++ AC_MSG_ERROR([newly created file is older than distributed files! +++ Check your system clock]) ++ fi +++ AC_MSG_RESULT(yes)]) ++ +++ # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # AM_PROG_INSTALL_STRIP +++ # --------------------- +++ # One issue with vendor `install' (even GNU) is that you can't +++ # specify the program used to strip binaries. This is especially +++ # annoying in cross-compiling environments, where the build's strip +++ # is unlikely to handle the host's binaries. +++ # Fortunately install-sh will honor a STRIPPROG variable, so we +++ # always use install-sh in `make install-strip', and initialize +++ # STRIPPROG with the value of the STRIP variable (set by the user). +++ AC_DEFUN([AM_PROG_INSTALL_STRIP], +++ [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +++ # Installed binaries are usually stripped using `strip' when the user +++ # run `make install-strip'. However `strip' might not be the right +++ # tool to use in cross-compilation environments, therefore Automake +++ # will honor the `STRIP' environment variable to overrule this program. +++ dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +++ if test "$cross_compiling" != no; then +++ AC_CHECK_TOOL([STRIP], [strip], :) +++ fi +++ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +++ AC_SUBST([INSTALL_STRIP_PROGRAM])]) +++ +++ # Check how to create a tarball. -*- Autoconf -*- +++ +++ # Copyright (C) 2004, 2005 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. +++ +++ # serial 2 +++ +++ # _AM_PROG_TAR(FORMAT) +++ # -------------------- +++ # Check how to create a tarball in format FORMAT. +++ # FORMAT should be one of `v7', `ustar', or `pax'. +++ # +++ # Substitute a variable $(am__tar) that is a command +++ # writing to stdout a FORMAT-tarball containing the directory +++ # $tardir. +++ # tardir=directory && $(am__tar) > result.tar +++ # +++ # Substitute a variable $(am__untar) that extract such +++ # a tarball read from stdin. +++ # $(am__untar) < result.tar +++ AC_DEFUN([_AM_PROG_TAR], +++ [# Always define AMTAR for backward compatibility. +++ AM_MISSING_PROG([AMTAR], [tar]) +++ m4_if([$1], [v7], +++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +++ [m4_case([$1], [ustar],, [pax],, +++ [m4_fatal([Unknown tar format])]) +++ AC_MSG_CHECKING([how to create a $1 tar archive]) +++ # Loop over all known methods to create a tar archive until one works. +++ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +++ _am_tools=${am_cv_prog_tar_$1-$_am_tools} +++ # Do not fold the above two line into one, because Tru64 sh and +++ # Solaris sh will not grok spaces in the rhs of `-'. +++ for _am_tool in $_am_tools +++ do +++ case $_am_tool in +++ gnutar) +++ for _am_tar in tar gnutar gtar; +++ do +++ AM_RUN_LOG([$_am_tar --version]) && break +++ done +++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +++ am__untar="$_am_tar -xf -" +++ ;; +++ plaintar) +++ # Must skip GNU tar: if it does not support --format= it doesn't create +++ # ustar tarball either. +++ (tar --version) >/dev/null 2>&1 && continue +++ am__tar='tar chf - "$$tardir"' +++ am__tar_='tar chf - "$tardir"' +++ am__untar='tar xf -' +++ ;; +++ pax) +++ am__tar='pax -L -x $1 -w "$$tardir"' +++ am__tar_='pax -L -x $1 -w "$tardir"' +++ am__untar='pax -r' +++ ;; +++ cpio) +++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +++ am__untar='cpio -i -H $1 -d' +++ ;; +++ none) +++ am__tar=false +++ am__tar_=false +++ am__untar=false +++ ;; +++ esac +++ +++ # If the value was cached, stop now. We just wanted to have am__tar +++ # and am__untar set. +++ test -n "${am_cv_prog_tar_$1}" && break +++ +++ # tar/untar a dummy directory, and stop if the command works +++ rm -rf conftest.dir +++ mkdir conftest.dir +++ echo GrepMe > conftest.dir/file +++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +++ rm -rf conftest.dir +++ if test -s conftest.tar; then +++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +++ fi +++ done +++ rm -rf conftest.dir +++ +++ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +++ AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +++ AC_SUBST([am__tar]) +++ AC_SUBST([am__untar]) +++ ]) # _AM_PROG_TAR ++ +diff -urNad gnome-system-tools-2.18.1~/config.h.in~ gnome-system-tools-2.18.1/config.h.in~ +--- gnome-system-tools-2.18.1~/config.h.in~ 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-system-tools-2.18.1/config.h.in~ 2007-04-09 13:36:23.000000000 +0200 +@@ -0,0 +1,94 @@ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* capplets directory */ ++#undef DESKTOP_DATA_DIR ++ ++/* Enable GNOME support. */ ++#undef ENABLE_GNOME ++ ++/* always defined to indicate that i18n is enabled */ ++#undef ENABLE_NLS ++ ++/* frontend files path */ ++#undef FRONTEND_DIR ++ ++/* gettext package name */ ++#undef GETTEXT_PACKAGE ++ ++/* Define to 1 if you have the `bind_textdomain_codeset' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET ++ ++/* Define to 1 if you have the `dcgettext' function. */ ++#undef HAVE_DCGETTEXT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++#undef HAVE_GETTEXT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define if your file defines LC_MESSAGES. */ ++#undef HAVE_LC_MESSAGES ++ ++/* whether libiw is available */ ++#undef HAVE_LIBIW_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* path where glade files will be installed */ ++#undef INTERFACES_DIR ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* pixmaps directory */ ++#undef PIXMAPS_DIR ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Version number of package */ ++#undef VERSION +diff -urNad gnome-system-tools-2.18.1~/config.log gnome-system-tools-2.18.1/config.log +--- gnome-system-tools-2.18.1~/config.log 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-system-tools-2.18.1/config.log 2007-04-10 12:21:12.000000000 +0200 +@@ -0,0 +1,385 @@ ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. ++ ++It was created by gnome-system-tools configure 2.17.92, which was ++generated by GNU Autoconf 2.61. Invocation command line was ++ ++ $ ./configure --enable-maintainer-mode ++ ++## --------- ## ++## Platform. ## ++## --------- ## ++ ++hostname = seb128-desktop ++uname -m = i686 ++uname -r = 2.6.20-8-generic ++uname -s = Linux ++uname -v = #2 SMP Tue Feb 13 05:18:42 UTC 2007 ++ ++/usr/bin/uname -p = unknown ++/bin/uname -X = unknown ++ ++/bin/arch = i686 ++/usr/bin/arch -k = unknown ++/usr/convex/getsysinfo = unknown ++/usr/bin/hostinfo = unknown ++/bin/machine = unknown ++/usr/bin/oslevel = unknown ++/bin/universe = unknown ++ ++PATH: /usr/local/sbin ++PATH: /usr/local/bin ++PATH: /usr/sbin ++PATH: /usr/bin ++PATH: /sbin ++PATH: /bin ++PATH: /usr/bin/X11 ++PATH: /usr/games ++PATH: /usr/games ++PATH: /home/seb128/bin ++PATH: /usr/games ++PATH: /home/seb128/bin ++ ++ ++## ----------- ## ++## Core tests. ## ++## ----------- ## ++ ++configure:2114: checking for a BSD-compatible install ++configure:2170: result: /usr/bin/install -c ++configure:2181: checking whether build environment is sane ++configure:2224: result: yes ++configure:2289: checking for gawk ++configure:2305: found /usr/bin/gawk ++configure:2316: result: gawk ++configure:2327: checking whether make sets $(MAKE) ++configure:2348: result: yes ++configure:2545: checking for style of include used by make ++configure:2573: result: GNU ++configure:2646: checking for gcc ++configure:2662: found /usr/bin/gcc ++configure:2673: result: gcc ++configure:2911: checking for C compiler version ++configure:2918: gcc --version >&5 ++gcc (GCC) 4.1.2 (Ubuntu 4.1.2-0ubuntu3) ++Copyright (C) 2006 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. ++ ++configure:2921: $? = 0 ++configure:2928: gcc -v >&5 ++Using built-in specs. ++Target: i486-linux-gnu ++Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release i486-linux-gnu ++Thread model: posix ++gcc version 4.1.2 (Ubuntu 4.1.2-0ubuntu3) ++configure:2931: $? = 0 ++configure:2938: gcc -V >&5 ++gcc: '-V' option must have argument ++configure:2941: $? = 1 ++configure:2964: checking for C compiler default output file name ++configure:2991: gcc conftest.c >&5 ++configure:2994: $? = 0 ++configure:3032: result: a.out ++configure:3049: checking whether the C compiler works ++configure:3059: ./a.out ++configure:3062: $? = 0 ++configure:3079: result: yes ++configure:3086: checking whether we are cross compiling ++configure:3088: result: no ++configure:3091: checking for suffix of executables ++configure:3098: gcc -o conftest conftest.c >&5 ++configure:3101: $? = 0 ++configure:3125: result: ++configure:3131: checking for suffix of object files ++configure:3157: gcc -c conftest.c >&5 ++configure:3160: $? = 0 ++configure:3183: result: o ++configure:3187: checking whether we are using the GNU C compiler ++configure:3216: gcc -c conftest.c >&5 ++configure:3222: $? = 0 ++configure:3239: result: yes ++configure:3244: checking whether gcc accepts -g ++configure:3274: gcc -c -g conftest.c >&5 ++configure:3280: $? = 0 ++configure:3379: result: yes ++configure:3396: checking for gcc option to accept ISO C89 ++configure:3470: gcc -c -g -O2 conftest.c >&5 ++ ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++ ++ac_cv_c_compiler_gnu=yes ++ac_cv_env_CCC_set= ++ac_cv_env_CCC_value= ++ac_cv_env_CC_set= ++ac_cv_env_CC_value= ++ac_cv_env_CFLAGS_set= ++ac_cv_env_CFLAGS_value= ++ac_cv_env_CPPFLAGS_set= ++ac_cv_env_CPPFLAGS_value= ++ac_cv_env_CPP_set= ++ac_cv_env_CPP_value= ++ac_cv_env_CXXCPP_set= ++ac_cv_env_CXXCPP_value= ++ac_cv_env_CXXFLAGS_set= ++ac_cv_env_CXXFLAGS_value= ++ac_cv_env_CXX_set= ++ac_cv_env_CXX_value= ++ac_cv_env_DBUS_CFLAGS_set= ++ac_cv_env_DBUS_CFLAGS_value= ++ac_cv_env_DBUS_LIBS_set= ++ac_cv_env_DBUS_LIBS_value= ++ac_cv_env_F77_set= ++ac_cv_env_F77_value= ++ac_cv_env_FFLAGS_set= ++ac_cv_env_FFLAGS_value= ++ac_cv_env_GNOME_CFLAGS_set= ++ac_cv_env_GNOME_CFLAGS_value= ++ac_cv_env_GNOME_LIBS_set= ++ac_cv_env_GNOME_LIBS_value= ++ac_cv_env_GST_DEPENDS_CFLAGS_set= ++ac_cv_env_GST_DEPENDS_CFLAGS_value= ++ac_cv_env_GST_DEPENDS_LIBS_set= ++ac_cv_env_GST_DEPENDS_LIBS_value= ++ac_cv_env_LDFLAGS_set= ++ac_cv_env_LDFLAGS_value= ++ac_cv_env_LIBS_set= ++ac_cv_env_LIBS_value= ++ac_cv_env_NAUTILUS_CFLAGS_set= ++ac_cv_env_NAUTILUS_CFLAGS_value= ++ac_cv_env_NAUTILUS_LIBS_set= ++ac_cv_env_NAUTILUS_LIBS_value= ++ac_cv_env_PKG_CONFIG_set= ++ac_cv_env_PKG_CONFIG_value= ++ac_cv_env_build_alias_set= ++ac_cv_env_build_alias_value= ++ac_cv_env_host_alias_set= ++ac_cv_env_host_alias_value= ++ac_cv_env_target_alias_set= ++ac_cv_env_target_alias_value= ++ac_cv_objext=o ++ac_cv_path_install='/usr/bin/install -c' ++ac_cv_prog_AWK=gawk ++ac_cv_prog_ac_ct_CC=gcc ++ac_cv_prog_cc_c89=no ++ac_cv_prog_cc_g=yes ++ac_cv_prog_make_make_set=yes ++ ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++ ++ACLOCAL='${SHELL} /tmp/dpep-work.oF5663/gnome-system-tools-2.17.92/missing --run aclocal-1.9' ++ALL_LINGUAS='' ++AMDEPBACKSLASH='\' ++AMDEP_FALSE='#' ++AMDEP_TRUE='' ++AMTAR='${SHELL} /tmp/dpep-work.oF5663/gnome-system-tools-2.17.92/missing --run tar' ++AR='' ++AUTOCONF='${SHELL} /tmp/dpep-work.oF5663/gnome-system-tools-2.17.92/missing --run autoconf' ++AUTOHEADER='${SHELL} /tmp/dpep-work.oF5663/gnome-system-tools-2.17.92/missing --run autoheader' ++AUTOMAKE='${SHELL} /tmp/dpep-work.oF5663/gnome-system-tools-2.17.92/missing --run automake-1.9' ++AWK='gawk' ++BUILD_NAUTILUS_FALSE='' ++BUILD_NAUTILUS_TRUE='' ++BUILD_NETWORK_FALSE='' ++BUILD_NETWORK_TRUE='' ++BUILD_SERVICES_FALSE='' ++BUILD_SERVICES_TRUE='' ++BUILD_SHARES_FALSE='' ++BUILD_SHARES_TRUE='' ++BUILD_TIME_FALSE='' ++BUILD_TIME_TRUE='' ++BUILD_USERS_FALSE='' ++BUILD_USERS_TRUE='' ++CATALOGS='' ++CATOBJEXT='' ++CC='gcc ' ++CCDEPMODE='' ++CFLAGS='-g -O2' ++CPP='' ++CPPFLAGS='' ++CXX='' ++CXXCPP='' ++CXXDEPMODE='' ++CXXFLAGS='' ++CYGPATH_W='echo' ++DATADIRNAME='' ++DBUS_CFLAGS='' ++DBUS_LIBS='' ++DEFS='' ++DEPDIR='.deps' ++DOC_USER_FORMATS='' ++ECHO='echo' ++ECHO_C='' ++ECHO_N='-n' ++ECHO_T='' ++EGREP='' ++ENABLE_GNOME_FALSE='' ++ENABLE_GNOME_TRUE='' ++ENABLE_SK_FALSE='' ++ENABLE_SK_TRUE='' ++EXEEXT='' ++F77='' ++FFLAGS='' ++GCONFTOOL='' ++GCONF_SCHEMAS_INSTALL_FALSE='' ++GCONF_SCHEMAS_INSTALL_TRUE='' ++GCONF_SCHEMA_CONFIG_SOURCE='' ++GCONF_SCHEMA_FILE_DIR='' ++GETTEXT_PACKAGE='' ++GLIB_GENMARSHAL='' ++GMOFILES='' ++GMSGFMT='' ++GNOME_CFLAGS='' ++GNOME_LIBS='' ++GREP='' ++GST_CFLAGS='' ++GST_DEPENDS_CFLAGS='' ++GST_DEPENDS_LIBS='' ++GST_IW_LIBS='' ++GST_LIBS='' ++GST_TOOL_CFLAGS='' ++GST_TOOL_CLEANFILES='' ++GST_TOOL_DEPENDENCIES='' ++GST_TOOL_EXTRA_DIST='' ++GST_TOOL_LIBS='' ++HAVE_GNOME_DOC_UTILS_FALSE='' ++HAVE_GNOME_DOC_UTILS_TRUE='' ++HAVE_LIBIW_H_FALSE='' ++HAVE_LIBIW_H_TRUE='' ++HELP_DIR='' ++INSTALL_DATA='${INSTALL} -m 644' ++INSTALL_PROGRAM='${INSTALL}' ++INSTALL_SCRIPT='${INSTALL}' ++INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s' ++INSTOBJEXT='' ++INTLLIBS='' ++INTLTOOL_CAVES_RULE='' ++INTLTOOL_DESKTOP_RULE='' ++INTLTOOL_DIRECTORY_RULE='' ++INTLTOOL_EXTRACT='' ++INTLTOOL_ICONV='' ++INTLTOOL_KBD_RULE='' ++INTLTOOL_KEYS_RULE='' ++INTLTOOL_MERGE='' ++INTLTOOL_MSGFMT='' ++INTLTOOL_MSGMERGE='' ++INTLTOOL_OAF_RULE='' ++INTLTOOL_PERL='' ++INTLTOOL_PONG_RULE='' ++INTLTOOL_PROP_RULE='' ++INTLTOOL_SCHEMAS_RULE='' ++INTLTOOL_SERVER_RULE='' ++INTLTOOL_SERVICE_RULE='' ++INTLTOOL_SHEET_RULE='' ++INTLTOOL_SOUNDLIST_RULE='' ++INTLTOOL_THEME_RULE='' ++INTLTOOL_UI_RULE='' ++INTLTOOL_UPDATE='' ++INTLTOOL_XAM_RULE='' ++INTLTOOL_XGETTEXT='' ++INTLTOOL_XML_NOMERGE_RULE='' ++INTLTOOL_XML_RULE='' ++LDFLAGS='' ++LIBOBJS='' ++LIBS='' ++LIBTOOL='' ++LN_S='' ++LTLIBOBJS='' ++MAINT='' ++MAINTAINER_MODE_FALSE='' ++MAINTAINER_MODE_TRUE='' ++MAKEINFO='${SHELL} /tmp/dpep-work.oF5663/gnome-system-tools-2.17.92/missing --run makeinfo' ++MKINSTALLDIRS='' ++MSGFMT='' ++NAUTILUS_CFLAGS='' ++NAUTILUS_LIBS='' ++OBJEXT='o' ++OMF_DIR='' ++PACKAGE='gnome-system-tools' ++PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools' ++PACKAGE_NAME='gnome-system-tools' ++PACKAGE_STRING='gnome-system-tools 2.17.92' ++PACKAGE_TARNAME='gnome-system-tools' ++PACKAGE_VERSION='2.17.92' ++PATH_SEPARATOR=':' ++PKG_CONFIG='' ++POFILES='' ++POSUB='' ++PO_IN_DATADIR_FALSE='' ++PO_IN_DATADIR_TRUE='' ++RANLIB='' ++SET_MAKE='' ++SHELL='/bin/bash' ++STRIP='' ++USE_NLS='' ++VERSION='2.17.92' ++XGETTEXT='' ++ac_ct_CC='gcc' ++ac_ct_CXX='' ++ac_ct_F77='' ++am__fastdepCC_FALSE='' ++am__fastdepCC_TRUE='' ++am__fastdepCXX_FALSE='' ++am__fastdepCXX_TRUE='' ++am__include='include' ++am__leading_dot='.' ++am__quote='' ++am__tar='${AMTAR} chof - "$$tardir"' ++am__untar='${AMTAR} xf -' ++bindir='${exec_prefix}/bin' ++build='' ++build_alias='' ++build_cpu='' ++build_os='' ++build_vendor='' ++datadir='${datarootdir}' ++datarootdir='${prefix}/share' ++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ++dvidir='${docdir}' ++exec_prefix='NONE' ++gnomelocaledir='' ++host='' ++host_alias='' ++host_cpu='' ++host_os='' ++host_vendor='' ++htmldir='${docdir}' ++includedir='${prefix}/include' ++infodir='${datarootdir}/info' ++install_sh='/tmp/dpep-work.oF5663/gnome-system-tools-2.17.92/install-sh' ++interfacesdir='' ++libdir='${exec_prefix}/lib' ++libexecdir='${exec_prefix}/libexec' ++localedir='${datarootdir}/locale' ++localstatedir='${prefix}/var' ++mandir='${datarootdir}/man' ++mkdir_p='mkdir -p --' ++oldincludedir='/usr/include' ++pdfdir='${docdir}' ++pixmapsdir='' ++prefix='NONE' ++program_transform_name='s,x,x,' ++psdir='${docdir}' ++sbindir='${exec_prefix}/sbin' ++sharedstatedir='${prefix}/com' ++sysconfdir='${prefix}/etc' ++target_alias='' ++ ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++ ++#define PACKAGE_NAME "gnome-system-tools" ++#define PACKAGE_TARNAME "gnome-system-tools" ++#define PACKAGE_VERSION "2.17.92" ++#define PACKAGE_STRING "gnome-system-tools 2.17.92" ++#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools" ++#define PACKAGE "gnome-system-tools" ++#define VERSION "2.17.92" ++ ++configure: caught signal 2 ++configure: exit 1 +diff -urNad gnome-system-tools-2.18.1~/configure gnome-system-tools-2.18.1/configure +--- gnome-system-tools-2.18.1~/configure 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/configure 2007-04-10 12:21:34.000000000 +0200 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.60 for gnome-system-tools 2.18.1. ++# Generated by GNU Autoconf 2.61 for gnome-system-tools 2.18.1. + # + # Report bugs to . + # +@@ -12,7 +12,8 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -21,10 +22,13 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ ++ + + + # PATH needs CR +@@ -217,7 +221,7 @@ + else + as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +@@ -235,7 +239,6 @@ + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +-# Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -244,10 +247,12 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ + + : + _ASEOF +@@ -255,7 +260,6 @@ + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +-# Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -264,10 +268,12 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ + + : + (as_func_return () { +@@ -514,19 +520,28 @@ + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -722,36 +737,36 @@ + # Factoring default headers for most tests. + ac_includes_default="\ + #include +-#if HAVE_SYS_TYPES_H ++#ifdef HAVE_SYS_TYPES_H + # include + #endif +-#if HAVE_SYS_STAT_H ++#ifdef HAVE_SYS_STAT_H + # include + #endif +-#if STDC_HEADERS ++#ifdef STDC_HEADERS + # include + # include + #else +-# if HAVE_STDLIB_H ++# ifdef HAVE_STDLIB_H + # include + # endif + #endif +-#if HAVE_STRING_H +-# if !STDC_HEADERS && HAVE_MEMORY_H ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H + # include + # endif + # include + #endif +-#if HAVE_STRINGS_H ++#ifdef HAVE_STRINGS_H + # include + #endif +-#if HAVE_INTTYPES_H ++#ifdef HAVE_INTTYPES_H + # include + #endif +-#if HAVE_STDINT_H ++#ifdef HAVE_STDINT_H + # include + #endif +-#if HAVE_UNISTD_H ++#ifdef HAVE_UNISTD_H + # include + #endif" + +@@ -960,6 +975,7 @@ + CC + CFLAGS + LDFLAGS ++LIBS + CPPFLAGS + PKG_CONFIG + CPP +@@ -1082,10 +1098,10 @@ + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) +@@ -1101,10 +1117,10 @@ + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ +@@ -1298,19 +1314,19 @@ + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package| sed 's/-/_/g'` ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/-/_/g'` ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; + + --x) +@@ -1594,6 +1610,7 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + PKG_CONFIG path to pkg-config utility +@@ -1682,7 +1699,7 @@ + if $ac_init_version; then + cat <<\_ACEOF + gnome-system-tools configure 2.18.1 +-generated by GNU Autoconf 2.60 ++generated by GNU Autoconf 2.61 + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +@@ -1696,7 +1713,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by gnome-system-tools $as_me 2.18.1, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +@@ -2049,14 +2066,6 @@ + + + +-case m4 in +- [\\/]* | ?:[\\/]* ) ac_macro_dir=m4 ;; +- *) ac_macro_dir=$srcdir/m4 ;; +-esac +-test -d "$ac_macro_dir" || +- { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5 +-echo "$as_me: error: cannot find macro directory \`m4'" >&2;} +- { (exit 1); exit 1; }; } + + am__api_version="1.9" + ac_aux_dir= +@@ -2126,7 +2135,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -2292,7 +2301,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2427,7 +2436,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2467,7 +2476,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2609,7 +2618,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2649,7 +2658,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2706,7 +2715,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2747,7 +2756,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -2805,7 +2814,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2849,7 +2858,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2990,7 +2999,7 @@ + # in a Makefile. We should not override ac_cv_exeext if it was cached, + # so that the user can short-circuit this test for compilers unknown to + # Autoconf. +-for ac_file in $ac_files ++for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +@@ -3018,6 +3027,12 @@ + test "$ac_cv_exeext" = no && ac_cv_exeext= + + else ++ ac_file='' ++fi ++ ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++if test -z "$ac_file"; then + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +@@ -3029,8 +3044,6 @@ + fi + + ac_exeext=$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +@@ -3208,27 +3221,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3283,27 +3279,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3338,27 +3317,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -3394,27 +3356,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3530,27 +3475,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 +@@ -3788,7 +3716,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3851,7 +3779,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3892,7 +3820,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3933,7 +3861,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3974,7 +3902,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4033,27 +3961,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + DATADIRNAME=share + else + echo "$as_me: failed program was:" >&5 +@@ -4124,27 +4036,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_bind_textdomain_codeset=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4153,7 +4049,7 @@ + ac_cv_func_bind_textdomain_codeset=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +@@ -4171,7 +4067,7 @@ + esac + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + +@@ -4209,7 +4105,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4252,7 +4148,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4654,7 +4550,7 @@ + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in +@@ -4736,7 +4632,7 @@ + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in +@@ -5042,7 +4938,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -5096,11 +4992,11 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + 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 +@@ -5216,7 +5112,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5219 "configure"' > conftest.$ac_ext ++ echo '#line 5115 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -5340,27 +5236,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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_cc_needs_belf=yes + else + echo "$as_me: failed program was:" >&5 +@@ -5369,7 +5249,7 @@ + lt_cv_cc_needs_belf=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -5463,17 +5343,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5507,17 +5380,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -5582,17 +5448,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5626,17 +5485,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -5707,27 +5559,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -5903,27 +5738,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -5986,27 +5804,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6042,17 +5843,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6144,7 +5938,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6188,7 +5982,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6301,27 +6095,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6376,27 +6153,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6431,27 +6191,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -6487,27 +6230,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6710,17 +6436,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -6754,17 +6473,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -6829,17 +6541,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -6873,17 +6578,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -6924,7 +6622,7 @@ + ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_f77_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -6942,7 +6640,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6968,7 +6666,7 @@ + fi + if test -z "$F77"; then + ac_ct_F77=$F77 +- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -6986,7 +6684,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_F77="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7093,27 +6791,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7156,27 +6837,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7374,7 +7038,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -7631,7 +7295,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7671,7 +7335,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7727,7 +7391,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7767,7 +7431,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7823,7 +7487,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7863,7 +7527,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8180,11 +7844,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:8183: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7847: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8187: \$? = $ac_status" >&5 ++ echo "$as_me:7851: \$? = $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. +@@ -8342,7 +8006,7 @@ + lt_prog_compiler_static='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl='-Wl,' +@@ -8448,11 +8112,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:8451: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8115: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8455: \$? = $ac_status" >&5 ++ echo "$as_me:8119: \$? = $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. +@@ -8552,11 +8216,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:8555: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8219: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8559: \$? = $ac_status" >&5 ++ echo "$as_me:8223: \$? = $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 +@@ -8781,7 +8445,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -8807,12 +8471,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$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= +@@ -9032,27 +8697,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -9066,7 +8715,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -9107,27 +8756,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -9141,7 +8774,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -9272,7 +8905,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -9374,7 +9007,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 +@@ -9864,18 +9497,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-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='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -10031,7 +9652,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -10045,31 +9666,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 10052 "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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;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 +@@ -10081,7 +9681,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -10090,7 +9690,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -10410,27 +10010,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -10439,7 +10023,7 @@ + ac_cv_lib_dl_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -10521,27 +10105,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_shl_load=yes + else + echo "$as_me: failed program was:" >&5 +@@ -10550,7 +10118,7 @@ + ac_cv_func_shl_load=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +@@ -10600,27 +10168,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dld_shl_load=yes + else + echo "$as_me: failed program was:" >&5 +@@ -10629,7 +10181,7 @@ + ac_cv_lib_dld_shl_load=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -10701,27 +10253,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -10730,7 +10266,7 @@ + ac_cv_func_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +@@ -10780,27 +10316,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -10809,7 +10329,7 @@ + ac_cv_lib_dl_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -10860,27 +10380,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_svld_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -10889,7 +10393,7 @@ + ac_cv_lib_svld_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -10940,27 +10444,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dld_dld_link=yes + else + echo "$as_me: failed program was:" >&5 +@@ -10969,7 +10457,7 @@ + ac_cv_lib_dld_dld_link=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -11025,7 +10513,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -12246,7 +11718,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -12288,27 +11760,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -12322,7 +11778,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -12470,7 +11926,7 @@ + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes +@@ -12629,7 +12085,7 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -12731,7 +12187,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= +@@ -13298,7 +12754,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -13341,7 +12797,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -13384,7 +12840,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -13493,11 +12949,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:13496: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12952: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13500: \$? = $ac_status" >&5 ++ echo "$as_me:12956: \$? = $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. +@@ -13597,11 +13053,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:13600: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13056: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13604: \$? = $ac_status" >&5 ++ echo "$as_me:13060: \$? = $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 +@@ -13669,6 +13125,9 @@ + 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' + ;; +@@ -13948,18 +13407,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-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='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -14115,7 +13562,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -14129,31 +13576,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 14136 "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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;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 +@@ -14165,7 +13591,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -14174,7 +13600,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -15082,7 +14508,7 @@ + lt_prog_compiler_static_F77='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_F77='-Wl,' +@@ -15188,11 +14614,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:15191: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14617: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15195: \$? = $ac_status" >&5 ++ echo "$as_me:14621: \$? = $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. +@@ -15292,11 +14718,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:15295: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14721: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15299: \$? = $ac_status" >&5 ++ echo "$as_me:14725: \$? = $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 +@@ -15521,7 +14947,7 @@ + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -15547,12 +14973,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$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= +@@ -15762,27 +15189,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -15796,7 +15207,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -15827,27 +15238,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -15861,7 +15256,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -15992,7 +15387,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes +@@ -16094,7 +15489,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 +@@ -16584,18 +15979,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-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='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -16751,7 +16134,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -16765,31 +16148,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 16772 "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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;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 +@@ -16801,7 +16163,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -16810,7 +16172,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -17543,11 +16905,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:17546: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16908: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17550: \$? = $ac_status" >&5 ++ echo "$as_me:16912: \$? = $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. +@@ -17705,7 +17067,7 @@ + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -17811,11 +17173,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:17814: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17176: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17818: \$? = $ac_status" >&5 ++ echo "$as_me:17180: \$? = $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. +@@ -17915,11 +17277,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:17918: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17280: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17922: \$? = $ac_status" >&5 ++ echo "$as_me:17284: \$? = $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 +@@ -18144,7 +17506,7 @@ + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -18170,12 +17532,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$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= +@@ -18395,27 +17758,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -18429,7 +17776,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -18470,27 +17817,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -18504,7 +17835,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -18635,7 +17966,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes +@@ -18737,7 +18068,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 +@@ -19227,18 +18558,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-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='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -19394,7 +18713,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -19408,31 +18727,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 19415 "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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;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 +@@ -19444,7 +18742,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -19453,7 +18751,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -20679,27 +19977,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_search_strerror=$ac_res + else + echo "$as_me: failed program was:" >&5 +@@ -20708,7 +19990,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then + break +@@ -20752,7 +20034,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -20792,7 +20074,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -20849,7 +20131,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -20890,7 +20172,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -20948,7 +20230,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -20992,7 +20274,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21112,27 +20394,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -21187,27 +20452,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -21242,27 +20490,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -21298,27 +20529,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -21434,27 +20648,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 +@@ -21622,7 +20819,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21662,7 +20859,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21719,7 +20916,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21760,7 +20957,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -21818,7 +21015,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21862,7 +21059,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21982,27 +21179,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22057,27 +21237,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22112,27 +21275,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -22168,27 +21314,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22304,27 +21433,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 +@@ -22510,27 +21622,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22700,7 +21795,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -22793,7 +21888,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -23457,27 +22552,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23513,17 +22591,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23621,27 +22692,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + am_cv_val_LC_MESSAGES=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23650,7 +22705,7 @@ + am_cv_val_LC_MESSAGES=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +@@ -23706,27 +22761,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23762,17 +22800,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23868,27 +22899,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + gt_cv_func_ngettext_libc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23897,7 +22912,7 @@ + gt_cv_func_ngettext_libc=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -23940,27 +22955,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + gt_cv_func_dgettext_libc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23969,7 +22968,7 @@ + gt_cv_func_dgettext_libc=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -24045,27 +23044,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -24074,7 +23057,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -24139,27 +23122,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_bindtextdomain=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24168,7 +23135,7 @@ + ac_cv_lib_intl_bindtextdomain=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24217,27 +23184,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_ngettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24246,7 +23197,7 @@ + ac_cv_lib_intl_ngettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24295,27 +23246,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_dgettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24324,7 +23259,7 @@ + ac_cv_lib_intl_dgettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24386,27 +23321,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_ngettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24415,7 +23334,7 @@ + ac_cv_lib_intl_ngettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24464,27 +23383,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_dcgettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24493,7 +23396,7 @@ + ac_cv_lib_intl_dcgettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24588,27 +23491,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -24617,7 +23504,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -24764,27 +23651,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -24793,7 +23664,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -24854,7 +23725,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -24942,27 +23813,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -25034,27 +23889,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_bind_textdomain_codeset=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25063,7 +23902,7 @@ + ac_cv_func_bind_textdomain_codeset=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +@@ -25084,7 +23923,7 @@ + esac + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo +@@ -25278,7 +24117,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -25422,27 +24261,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25478,17 +24300,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25586,27 +24401,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_iw_main=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25615,7 +24414,7 @@ + ac_cv_lib_iw_main=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26035,7 +24834,8 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -26044,10 +24844,13 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ ++ + + + # PATH needs CR +@@ -26271,19 +25074,28 @@ + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -26299,7 +25111,7 @@ + # values after options handling. + ac_log=" + This file was extended by gnome-system-tools $as_me 2.18.1, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -26328,7 +25140,7 @@ + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +@@ -26352,7 +25164,7 @@ + cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + gnome-system-tools config.status 2.18.1 +-configured by $0, generated by GNU Autoconf 2.60, ++configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + + Copyright (C) 2006 Free Software Foundation, Inc. +diff -urNad gnome-system-tools-2.18.1~/configure.rej gnome-system-tools-2.18.1/configure.rej +--- gnome-system-tools-2.18.1~/configure.rej 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-system-tools-2.18.1/configure.rej 2007-04-10 12:21:12.000000000 +0200 +@@ -0,0 +1,83 @@ ++*************** ++*** 1,6 **** ++ #! /bin/sh ++ # Guess values for system-dependent variables and create Makefiles. ++- # Generated by GNU Autoconf 2.60 for gnome-system-tools 2.18.0. ++ # ++ # Report bugs to . ++ # ++--- 1,6 ---- ++ #! /bin/sh ++ # Guess values for system-dependent variables and create Makefiles. +++ # Generated by GNU Autoconf 2.61 for gnome-system-tools 2.18.0. ++ # ++ # Report bugs to . ++ # ++*************** ++*** 1682,1688 **** ++ if $ac_init_version; then ++ cat <<\_ACEOF ++ gnome-system-tools configure 2.18.0 ++- generated by GNU Autoconf 2.60 ++ ++ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++--- 1699,1705 ---- ++ if $ac_init_version; then ++ cat <<\_ACEOF ++ gnome-system-tools configure 2.18.0 +++ generated by GNU Autoconf 2.61 ++ ++ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++*************** ++*** 1696,1702 **** ++ running configure, to aid debugging if configure makes a mistake. ++ ++ It was created by gnome-system-tools $as_me 2.18.0, which was ++- generated by GNU Autoconf 2.60. Invocation command line was ++ ++ $ $0 $@ ++ ++--- 1713,1719 ---- ++ running configure, to aid debugging if configure makes a mistake. ++ ++ It was created by gnome-system-tools $as_me 2.18.0, which was +++ generated by GNU Autoconf 2.61. Invocation command line was ++ ++ $ $0 $@ ++ ++*************** ++*** 26299,26305 **** ++ # values after options handling. ++ ac_log=" ++ This file was extended by gnome-system-tools $as_me 2.18.0, which was ++- generated by GNU Autoconf 2.60. Invocation command line was ++ ++ CONFIG_FILES = $CONFIG_FILES ++ CONFIG_HEADERS = $CONFIG_HEADERS ++--- 25111,25117 ---- ++ # values after options handling. ++ ac_log=" ++ This file was extended by gnome-system-tools $as_me 2.18.0, which was +++ generated by GNU Autoconf 2.61. Invocation command line was ++ ++ CONFIG_FILES = $CONFIG_FILES ++ CONFIG_HEADERS = $CONFIG_HEADERS ++*************** ++*** 26352,26358 **** ++ cat >>$CONFIG_STATUS <<_ACEOF ++ ac_cs_version="\\ ++ gnome-system-tools config.status 2.18.0 ++- configured by $0, generated by GNU Autoconf 2.60, ++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++ ++ Copyright (C) 2006 Free Software Foundation, Inc. ++--- 25164,25170 ---- ++ cat >>$CONFIG_STATUS <<_ACEOF ++ ac_cs_version="\\ ++ gnome-system-tools config.status 2.18.0 +++ configured by $0, generated by GNU Autoconf 2.61, ++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++ ++ Copyright (C) 2006 Free Software Foundation, Inc. +diff -urNad gnome-system-tools-2.18.1~/doc/Makefile.in gnome-system-tools-2.18.1/doc/Makefile.in +--- gnome-system-tools-2.18.1~/doc/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/doc/Makefile.in 2007-04-10 12:21:37.000000000 +0200 +@@ -38,8 +38,7 @@ + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/doc/network/Makefile.in gnome-system-tools-2.18.1/doc/network/Makefile.in +--- gnome-system-tools-2.18.1~/doc/network/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/doc/network/Makefile.in 2007-04-10 12:21:37.000000000 +0200 +@@ -63,8 +63,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/network + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/doc/services/Makefile.in gnome-system-tools-2.18.1/doc/services/Makefile.in +--- gnome-system-tools-2.18.1~/doc/services/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/doc/services/Makefile.in 2007-04-10 12:21:38.000000000 +0200 +@@ -63,8 +63,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/services + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/doc/services/nl/Makefile.in gnome-system-tools-2.18.1/doc/services/nl/Makefile.in +--- gnome-system-tools-2.18.1~/doc/services/nl/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/doc/services/nl/Makefile.in 2007-04-10 12:21:38.000000000 +0200 +@@ -101,8 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = doc/services/nl + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/doc/shares/Makefile.in gnome-system-tools-2.18.1/doc/shares/Makefile.in +--- gnome-system-tools-2.18.1~/doc/shares/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/doc/shares/Makefile.in 2007-04-10 12:21:38.000000000 +0200 +@@ -63,8 +63,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/shares + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/doc/time/Makefile.in gnome-system-tools-2.18.1/doc/time/Makefile.in +--- gnome-system-tools-2.18.1~/doc/time/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/doc/time/Makefile.in 2007-04-10 12:21:38.000000000 +0200 +@@ -63,8 +63,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/time + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/doc/time/nl/Makefile.in gnome-system-tools-2.18.1/doc/time/nl/Makefile.in +--- gnome-system-tools-2.18.1~/doc/time/nl/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/doc/time/nl/Makefile.in 2007-04-10 12:21:38.000000000 +0200 +@@ -101,8 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = doc/time/nl + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/doc/users/Makefile.in gnome-system-tools-2.18.1/doc/users/Makefile.in +--- gnome-system-tools-2.18.1~/doc/users/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/doc/users/Makefile.in 2007-04-10 12:21:38.000000000 +0200 +@@ -63,8 +63,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/users + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/interfaces/Makefile.in gnome-system-tools-2.18.1/interfaces/Makefile.in +--- gnome-system-tools-2.18.1~/interfaces/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/interfaces/Makefile.in 2007-04-10 12:21:39.000000000 +0200 +@@ -39,8 +39,7 @@ + subdir = interfaces + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/intltool-extract.in gnome-system-tools-2.18.1/intltool-extract.in +--- gnome-system-tools-2.18.1~/intltool-extract.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/intltool-extract.in 2007-04-10 12:21:12.000000000 +0200 +@@ -32,7 +32,7 @@ + ## Release information + my $PROGRAM = "intltool-extract"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.35.4"; ++my $VERSION = "0.35.5"; + + ## Loaded modules + use strict; +diff -urNad gnome-system-tools-2.18.1~/intltool-merge.in gnome-system-tools-2.18.1/intltool-merge.in +--- gnome-system-tools-2.18.1~/intltool-merge.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/intltool-merge.in 2007-04-10 12:21:12.000000000 +0200 +@@ -35,7 +35,7 @@ + ## Release information + my $PROGRAM = "intltool-merge"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.35.4"; ++my $VERSION = "0.35.5"; + + ## Loaded modules + use strict; +diff -urNad gnome-system-tools-2.18.1~/intltool-update.in gnome-system-tools-2.18.1/intltool-update.in +--- gnome-system-tools-2.18.1~/intltool-update.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/intltool-update.in 2007-04-10 12:21:12.000000000 +0200 +@@ -30,7 +30,7 @@ + + ## Release information + my $PROGRAM = "intltool-update"; +-my $VERSION = "0.35.4"; ++my $VERSION = "0.35.5"; + my $PACKAGE = "intltool"; + + ## Loaded modules +diff -urNad gnome-system-tools-2.18.1~/pixmaps/Makefile.in gnome-system-tools-2.18.1/pixmaps/Makefile.in +--- gnome-system-tools-2.18.1~/pixmaps/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/pixmaps/Makefile.in 2007-04-10 12:21:39.000000000 +0200 +@@ -39,8 +39,7 @@ + subdir = pixmaps + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/src/Makefile.in gnome-system-tools-2.18.1/src/Makefile.in +--- gnome-system-tools-2.18.1~/src/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/Makefile.in 2007-04-10 12:21:39.000000000 +0200 +@@ -38,8 +38,7 @@ + subdir = src + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/src/common/Makefile.in gnome-system-tools-2.18.1/src/common/Makefile.in +--- gnome-system-tools-2.18.1~/src/common/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/common/Makefile.in 2007-04-10 12:21:39.000000000 +0200 +@@ -39,8 +39,7 @@ + subdir = src/common + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -50,10 +49,10 @@ + ARFLAGS = cru + libsetuptool_a_AR = $(AR) $(ARFLAGS) + libsetuptool_a_LIBADD = +-am_libsetuptool_a_OBJECTS = gst-widget.$(OBJEXT) gst-dialog.$(OBJEXT) \ +- gst-tool.$(OBJEXT) gst-platform-dialog.$(OBJEXT) \ +- gst-conf.$(OBJEXT) gst-filter.$(OBJEXT) \ +- gst-service-role.$(OBJEXT) ++am_libsetuptool_a_OBJECTS = gst-package.$(OBJEXT) gst-widget.$(OBJEXT) \ ++ gst-dialog.$(OBJEXT) gst-tool.$(OBJEXT) \ ++ gst-platform-dialog.$(OBJEXT) gst-conf.$(OBJEXT) \ ++ gst-filter.$(OBJEXT) gst-service-role.$(OBJEXT) + libsetuptool_a_OBJECTS = $(am_libsetuptool_a_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -278,6 +277,7 @@ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + + libsetuptool_a_SOURCES = \ ++ gst-package.c \ + gst-widget.c \ + gst-dialog.c \ + gst-tool.c \ +@@ -348,6 +348,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-conf.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-dialog.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-filter.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-package.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-platform-dialog.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-service-role.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-tool.Po@am__quote@ +diff -urNad gnome-system-tools-2.18.1~/src/network/Makefile.in gnome-system-tools-2.18.1/src/network/Makefile.in +--- gnome-system-tools-2.18.1~/src/network/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/network/Makefile.in 2007-04-10 12:21:39.000000000 +0200 +@@ -43,8 +43,7 @@ + bin_PROGRAMS = network-admin$(EXEEXT) + subdir = src/network + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/src/services/Makefile.in gnome-system-tools-2.18.1/src/services/Makefile.in +--- gnome-system-tools-2.18.1~/src/services/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/services/Makefile.in 2007-04-10 12:21:39.000000000 +0200 +@@ -43,8 +43,7 @@ + bin_PROGRAMS = services-admin$(EXEEXT) + subdir = src/services + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/src/shares/Makefile.in gnome-system-tools-2.18.1/src/shares/Makefile.in +--- gnome-system-tools-2.18.1~/src/shares/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/shares/Makefile.in 2007-04-10 12:21:39.000000000 +0200 +@@ -42,8 +42,7 @@ + bin_PROGRAMS = shares-admin$(EXEEXT) + subdir = src/shares + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/src/shares/nautilus/Makefile.in gnome-system-tools-2.18.1/src/shares/nautilus/Makefile.in +--- gnome-system-tools-2.18.1~/src/shares/nautilus/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/shares/nautilus/Makefile.in 2007-04-10 12:21:40.000000000 +0200 +@@ -39,8 +39,7 @@ + subdir = src/shares/nautilus + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/src/time/Makefile.in gnome-system-tools-2.18.1/src/time/Makefile.in +--- gnome-system-tools-2.18.1~/src/time/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/time/Makefile.in 2007-04-10 12:21:41.000000000 +0200 +@@ -42,8 +42,7 @@ + bin_PROGRAMS = time-admin$(EXEEXT) + subdir = src/time + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/src/time/e-map/Makefile.in gnome-system-tools-2.18.1/src/time/e-map/Makefile.in +--- gnome-system-tools-2.18.1~/src/time/e-map/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/time/e-map/Makefile.in 2007-04-10 12:21:41.000000000 +0200 +@@ -39,8 +39,7 @@ + subdir = src/time/e-map + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.18.1~/src/users/Makefile.in gnome-system-tools-2.18.1/src/users/Makefile.in +--- gnome-system-tools-2.18.1~/src/users/Makefile.in 2007-04-10 12:20:57.000000000 +0200 ++++ gnome-system-tools-2.18.1/src/users/Makefile.in 2007-04-10 12:21:41.000000000 +0200 +@@ -43,8 +43,7 @@ + bin_PROGRAMS = users-admin$(EXEEXT) + subdir = src/users + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gnome-system-tools-2.18.1.orig/debian/copyright +++ gnome-system-tools-2.18.1/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Jose Carlos Garcia Sogo on +Sun, 05 Aug 2001 11:45:14 +0200. + +It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/ + +Copyright Holders: copyright (c) 2002-2003 Jean-Baptiste LAMY +the full list of authors is in: + /usr/share/doc/gnome-system-tools/AUTHORS + +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-system-tools-2.18.1.orig/debian/profiles +++ gnome-system-tools-2.18.1/debian/profiles @@ -0,0 +1,28 @@ +[Unprivileged] +name=Unprivileged +name[es]=Usuario sin privilegios +default=1 +shell=/bin/bash +home-prefix=/home +uid-min=1000 +uid-max=6000 + +[Desktop] +name=Desktop user +name[es]=Usuario del escritorio +default=1 +shell=/bin/bash +home-prefix=/home +uid-min=1000 +uid-max=6000 +groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,lpadmin,video + +[Administrator] +name=Administrator +name[es]=Administrador +shell=/bin/bash +home-prefix=/home +uid-min=1000 +uid-max=6000 +groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,admin,lpadmin,video + --- gnome-system-tools-2.18.1.orig/debian/pixmaps/disks.xpm +++ gnome-system-tools-2.18.1/debian/pixmaps/disks.xpm @@ -0,0 +1,192 @@ +/* XPM */ +static char *disks[] = { +/* columns rows colors chars-per-pixel */ +"32 31 155 2", +" c #000000", +". c #0B0B0B", +"X c #1D1D1D", +"o c #21201E", +"O c #232323", +"+ c #2C2C2C", +"@ c #353535", +"# c #393836", +"$ c #3A3A3A", +"% c #3F4C3D", +"& c #42403C", +"* c #4C493F", +"= c #40503D", +"- c #5C503A", +"; c #656031", +": c #434443", +"> c #454C44", +", c #4B4943", +"< c #4C4C4C", +"1 c #495247", +"2 c #4A5548", +"3 c #495B44", +"4 c #4D5A4B", +"5 c #504F4D", +"6 c #565141", +"7 c #56554D", +"8 c #515E4F", +"9 c #545454", +"0 c #595750", +"q c #5C5A55", +"w c #5C5C5B", +"e c #53644F", +"r c #546550", +"t c #556C51", +"y c #596355", +"u c #5F635E", +"i c #5C7457", +"p c #5C7859", +"a c #6E674F", +"s c #666250", +"d c #62625F", +"f c #606F5C", +"g c #60775A", +"h c #617E5E", +"j c #797B5C", +"k c #646463", +"l c #686763", +"z c #6C6B66", +"x c #6C6C6B", +"c c #667462", +"v c #667F62", +"b c #6E706D", +"n c #6D7966", +"m c #706E66", +"M c #726F69", +"N c #73736C", +"B c #747373", +"V c #747973", +"C c #787672", +"Z c #7C7A75", +"A c #7B7B7B", +"S c #7D8352", +"D c #678261", +"F c #688463", +"G c #6F866A", +"H c #75846F", +"J c #758F6F", +"K c #7B806D", +"L c #778672", +"P c #798874", +"I c #73906D", +"U c #789572", +"Y c #8A7F5B", +"T c #847C60", +"R c #807F7C", +"E c #8D8152", +"W c #81807B", +"Q c #828E7B", +"! c #809C79", +"~ c #998F6C", +"^ c #9F8C7D", +"/ c #9D9577", +"( c #A49973", +") c #B3A475", +"_ c #848483", +"` c #898987", +"' c #8C8B8A", +"] c #8C9986", +"[ c #92948F", +"{ c #9B9681", +"} c #9E998C", +"| c #949593", +" . c #969893", +".. c #989793", +"X. c #999B96", +"o. c #9C9C9A", +"O. c #8CA586", +"+. c #90AA89", +"@. c #99AE92", +"#. c #9BB195", +"$. c #A19F9C", +"%. c #A3A29D", +"&. c #BCB496", +"*. c #A4A3A3", +"=. c #A6AAA2", +"-. c #A8A6A2", +";. c #A9A6A8", +":. c #ABAAA5", +">. c #ACACAB", +",. c #A4B0A0", +"<. c #A7BFA0", +"1. c #AFB0AC", +"2. c #B2ADA7", +"3. c #B4B1A6", +"4. c #B1B2AF", +"5. c #B4B4B2", +"6. c #B6B8B3", +"7. c #B8B7B7", +"8. c #B8B9B6", +"9. c #BCBCBB", +"0. c #B0C2A9", +"q. c #BEC0BD", +"w. c #BFC0C0", +"e. c #C1B488", +"r. c #C2B792", +"t. c #C4BEAB", +"y. c #C0BEC0", +"u. c #CEC49E", +"i. c #C2C2BE", +"p. c #C0CDB4", +"a. c #D4CCB1", +"s. c #DBD4BA", +"d. c #C4C3C2", +"f. c #C9C5C8", +"g. c #C9CAC7", +"h. c #CCCBCA", +"j. c #CED0C7", +"k. c #D0CDCC", +"l. c #D2CED1", +"z. c #D0D0CD", +"x. c #D9D4C5", +"c. c #DCD8CC", +"v. c #D4D4D3", +"b. c #D8D7D4", +"n. c #D9D8D5", +"m. c #DCDCDA", +"M. c #E0DFDD", +"N. c #E1E1DF", +"B. c #E4E4E2", +"V. c #E9E9E6", +"C. c #ECEBEC", +"Z. c #F1F1EF", +"A. c #F5F4F4", +"S. c #FCFCFC", +"D. c None", +/* pixels */ +"D.D.D.D.D.D.D.D.D.D.D. D.D.D.D.D.D.D.D.D.D.D.D.", +"D.D.D.D.D. & s q q q q q q q , . D.D.", +"D.D.D. . C Z M M M m N N N 0 o X o X O o X X X . D.", +"D.D.D. 9 ,.] ] Q L L L L P n c y w x x x B Z w + D.", +"D.D.D. Z 0.O.U #.#.G S j v I g > w x B ` ` k k @ D.", +"D.D.D. . L 0.^ J z.:.4 ; - t F 2 x w b o...o.w @ O D.", +"D.D.D. . V 0.K U ,.m 3 p p i > : b C %.x.{ , + O O D.", +"D.D.D. V +.D U F % % 2 < < > 9 l >.s.u.~ , + + O D.", +"D.D.D. . u i y y 8 : , d B _ _ ` 3.s.e.Y 6 @ + $ @ D.", +"D.D.D. . k _ 9 : B w | y.y.y.d.c.a.( a & @ @ 9 w < D.", +"D.D.D. . B ` < < *.w.y.2.$.$.t.&.T q 5 < : : k 9 9 D.", +"D.D.D. . w w 9 _ m.g.;...$.e./ s 9 x A ;.| 9 9 B w D.", +"D.D.D. . k x _ v.v.l.5.$.) Y 7 k .y.N.Z.m.' Z | k D.", +"D.D.D. . B A 7.y.7.l.y.>.} ' | 9.V.A.S.S.Z.l.A ` k D.", +"D.D.D. . Z X.y.*.;.7.l.l.n.n.N.V.B.S.S.S.A.N.X.A w D.", +"D.D.D. . A 4.5.$.*.;.y.A.S.l.b.k.5.9.N.B.V.N.*.B w D.", +"D.D.D. . A >.;.$.@.*.d.V.i.| N ' $.R 8.v.n.n.>.x 9 D.", +"D.D.D. . A >.;.*.*.-.g.A.z.q # l C d *.d.v.b.1.b 9 D.", +"D.D.D. . B >.>.;.>.4.i.b.:.C 5 m Z s X.q.z.v.>.b 9 D.", +"D.D.D. . B 4.9.9.i.i.i.2.%.%.C x z k .4.d.g.X.B 9 D.", +"D.D.D. . B *.g.v.m.n.v.>._ B z 0 9 V ..:.6.6.A x w D.", +"D.D.D. . B _ v.Z.A.Z.C.v.*.B d l Z _ [ %.>.X.k B w D.", +"D.D.D. . B A >.A.S.S.A.M.g.5.*.o. . . .X.X.x w _ w D.", +"D.D.D. . A _ _ y.A.S.Z.B.n.f.9.5.>.=.%. .b 2 x | k D.", +"D.D.D. . Z ' A A 5.N.V.B.N.v.g.i.6.>.X.x < k ` o.w D.", +"D.D.D. . A *.B A B _ >.h.n.v.h.d.>._ w 9 x _ $._ w D.", +"D.D.D. . x x x ' _ A B Z _ _ _ V k w k A ' .A w < D.", +"D.D.D. + : < 9 w 9 9 : : : : : : : 9 9 w w 9 < X D.", +"D.D.D. D.", +"D.D.D. D.", +"D.D.D. D." +}; --- gnome-system-tools-2.18.1.orig/debian/pixmaps/network.xpm +++ gnome-system-tools-2.18.1/debian/pixmaps/network.xpm @@ -0,0 +1,290 @@ +/* XPM */ +static char *network[] = { +/* columns rows colors chars-per-pixel */ +"32 32 252 2", +" c black", +". c #010101", +"X c #020202", +"o c #030303", +"O c #040404", +"+ c #050505", +"@ c #060606", +"# c #070707", +"$ c #080808", +"% c #0A0A0A", +"& c #0B0B0B", +"* c #0C0C0C", +"= c #0D0D0D", +"- c #0E0E0E", +"; c #0F0F0F", +": c #101010", +"> c #111111", +", c #151515", +"< c #161616", +"1 c #171717", +"2 c #1C1C1C", +"3 c #1E1E1E", +"4 c #1F1F1F", +"5 c #242424", +"6 c #252525", +"7 c #272727", +"8 c #282828", +"9 c #2C2C2C", +"0 c #2E2E2E", +"q c #303030", +"w c #323232", +"e c #333333", +"r c #373737", +"t c #383838", +"y c #3B3F3C", +"u c #3C3C3C", +"i c #3D3D3D", +"p c #3E3E3E", +"a c #3F3F3F", +"s c #414442", +"d c #454C46", +"f c #494949", +"g c #4B4B4B", +"h c #4C4C4C", +"j c #4D4D4D", +"k c #4E4E4E", +"l c #4F5450", +"z c #505050", +"x c #515151", +"c c #525252", +"v c #535353", +"b c #555555", +"n c #565756", +"m c #575757", +"M c #555B56", +"N c #565B57", +"B c #575D59", +"V c #585958", +"C c #595A59", +"Z c #5A5A5A", +"A c #5B5B5B", +"S c #595D5A", +"D c #585E5A", +"F c #5C5C5C", +"G c #5D5E5D", +"H c #5E5E5E", +"J c #5F5F5F", +"K c #5B605C", +"L c #606060", +"P c #626262", +"I c #636563", +"U c #676767", +"Y c #696969", +"T c #6B6B6B", +"R c #6E6E6E", +"E c #707070", +"W c #737373", +"Q c #777777", +"! c #797979", +"~ c #7A7A7A", +"^ c #7C7C7C", +"/ c #7D7D7D", +"( c #7E7E7E", +") c #758077", +"_ c #78817A", +"` c #78827A", +"' c #79827B", +"] c #7C817D", +"[ c #7C847E", +"{ c #7D857E", +"} c #7E8780", +"| c #808080", +" . c #828282", +".. c #838283", +"X. c #838383", +"o. c #848484", +"O. c #858484", +"+. c #858585", +"@. c #868686", +"#. c #878787", +"$. c #818983", +"%. c #848887", +"&. c #858987", +"*. c #878B89", +"=. c #868D88", +"-. c #888888", +";. c #888B89", +":. c #8A8A8A", +">. c #8B8B8B", +",. c #888C8A", +"<. c #888D8A", +"1. c #8C8C8C", +"2. c #8D8D8D", +"3. c #8E8E8E", +"4. c #8A8C90", +"5. c #89908A", +"6. c #8C928E", +"7. c #8D938E", +"8. c #8E938F", +"9. c #909090", +"0. c #919191", +"q. c #929292", +"w. c #939393", +"e. c #909194", +"r. c #909691", +"t. c #929793", +"y. c #929596", +"u. c #949494", +"i. c #969696", +"p. c #979797", +"a. c #949895", +"s. c #999999", +"d. c #98999A", +"f. c #9A9A9A", +"g. c #9B9B9B", +"h. c #9A9C9B", +"j. c #9C9B9C", +"k. c #9C9C9C", +"l. c #9D9D9D", +"z. c #9E9E9E", +"x. c #9F9F9F", +"c. c #9CA09C", +"v. c #A0A0A0", +"b. c #A1A1A1", +"n. c #A2A2A2", +"m. c #A4A4A4", +"M. c #A6A6A6", +"N. c #A7A7A7", +"B. c #A8A8A8", +"V. c #A9A9A9", +"C. c #AAAAAA", +"Z. c #ABABAB", +"A. c #ACACAC", +"S. c #AEAEAE", +"D. c #AFAFAF", +"F. c #AFAEBE", +"G. c #B0B0B0", +"H. c #B2B2B2", +"J. c #B3B3B3", +"K. c #B4B4B4", +"L. c #B5B5B5", +"P. c #B6B6B6", +"I. c #BBBBBB", +"U. c #BCBCBC", +"Y. c #BFBFBF", +"T. c #B4B2C1", +"R. c #B6B5C3", +"E. c #BCB9C8", +"W. c #C0C0C0", +"Q. c #C2C2C2", +"!. c #C3C3C3", +"~. c #C4C4C4", +"^. c #C5C5C5", +"/. c #C6C6C6", +"(. c #C7C7C7", +"). c #C1C0CC", +"_. c #C1C4CB", +"`. c #C3CBC5", +"'. c #C4CBC7", +"]. c #C5CCC7", +"[. c #C6CEC7", +"{. c #C9C9C9", +"}. c #CACACA", +"|. c #CBCBCB", +" X c #C8CFC9", +".X c #CCCCCC", +"XX c #CDCDCD", +"oX c #CECECE", +"OX c #CFCFCF", +"+X c #C7C5D2", +"@X c #C9C9D2", +"#X c #CACDD4", +"$X c #C3D0C6", +"%X c #C7D3CA", +"&X c #CCD9CF", +"*X c #CFDAD2", +"=X c #D0D0D0", +"-X c #D1D1D1", +";X c #D2D2D2", +":X c #D3D3D3", +">X c #D4D4D4", +",X c #D6D6D6", +" < < < < < < < < , , = KXKX", +"KXKXKXKXKXKXKXKXKXKXKXKXKXKXKX 0 P.=X|.|.{.(.~.Q.E.U.^.~ ", +"KXKXKXKXKXKXKXKXKXKXKX a cXn.n G A C V m n g J.t. ", +"KXKXKXKXKXKXKXKXKXKXKX$ h s + a eX#.-.8X X`.'.'. X{ x.t. ", +"KXKXKXKXKXKXKXKXKXKXKX1 :X-.+ u wX#.1.iX#XdXsX@X_.<.x.w. ", +"KX KX& W u u wX+.d.HXAXNX2XT.F.%.z.q. ", +"KX t x.n.x.x.x.m z z t wX+.t.FXNXdXpX+X1X<.z.q. ", +"KX C GXY.|.OXyXU z z u a =X3.s K S S S M M a M.>. ", +"KX n ZX{.I.cXyXn z n./ T 0 z.bX.-.r v z 3 / z.z.z.f.d.p.p.t.q.q.m KXKX", +"KX v ,Xw.t.d.z.k 7 g k -.z a yXE.3.-.-.#.+. . .{ /.w. ", +"KX m c #151513", +", c #141414", +"< c #151515", +"1 c #171717", +"2 c #191917", +"3 c #1B1A18", +"4 c #1A1A1A", +"5 c #1C1B19", +"6 c #1C1C1B", +"7 c #1D1C1B", +"8 c #1C1C1C", +"9 c #1D1D1D", +"0 c #1E1E1E", +"q c #212121", +"w c #232222", +"e c #242421", +"r c #252422", +"t c #262625", +"y c #262626", +"u c #292827", +"i c #282828", +"p c #2A2A2A", +"a c #2B2B2B", +"s c #2D2D29", +"d c #2C2C2C", +"f c #31302E", +"g c #33322F", +"h c #333333", +"j c #353431", +"k c #353432", +"l c #343434", +"z c #393834", +"x c #3D3C37", +"c c #383838", +"v c #393939", +"b c #3A3938", +"n c #3B3B39", +"m c #3B3B3B", +"M c #3F3D39", +"N c #3C3C3C", +"B c #3D3D3D", +"V c #3E3E3E", +"C c #3F3F3E", +"Z c #3F3F3F", +"A c #404040", +"S c #414141", +"D c #464540", +"F c #454545", +"G c #474747", +"H c #484742", +"J c #4E4D49", +"K c #4D4D4D", +"L c #4E4E4E", +"P c #4F4F4F", +"I c #504F4B", +"U c #50504F", +"Y c #53524D", +"T c #505050", +"R c #525252", +"E c #535352", +"W c #535353", +"Q c #565550", +"! c #575652", +"~ c #545454", +"^ c #555555", +"/ c #565656", +"( c #575757", +") c #595752", +"_ c #585755", +"` c #585857", +"' c #5A5954", +"] c #5B5A55", +"[ c #585858", +"{ c #595959", +"} c #5A5A5A", +"| c #5D5C58", +" . c #5C5C5A", +".. c #5C5C5B", +"X. c #5D5D5D", +"o. c #5E5E5E", +"O. c #62605C", +"+. c #62615E", +"@. c #64625D", +"#. c #64625F", +"$. c #64635E", +"%. c #68655E", +"&. c #606060", +"*. c #656563", +"=. c #676561", +"-. c #646464", +";. c #656565", +":. c #666665", +">. c #666666", +",. c #676767", +"<. c #6C6A64", +"1. c #6D6B66", +"2. c #686868", +"3. c #6B6B6B", +"4. c #6C6C6C", +"5. c #6E6E6E", +"6. c #71706B", +"7. c #72706A", +"8. c #73726D", +"9. c #73726E", +"0. c #77756D", +"q. c #707070", +"w. c #727272", +"e. c #777670", +"r. c #797874", +"t. c #7B7A76", +"y. c #7F7D78", +"u. c #7E7E7E", +"i. c #817F7A", +"p. c #82817C", +"a. c #83827D", +"s. c #85837C", +"d. c #86847E", +"f. c #89877F", +"g. c #828282", +"h. c #848484", +"j. c #858585", +"k. c #868686", +"l. c #878787", +"z. c #898882", +"x. c #8A8882", +"c. c #898884", +"v. c #8B8A85", +"b. c #8C8B86", +"n. c #8E8C86", +"m. c #898989", +"M. c #8A8A8A", +"N. c #8D8C8A", +"B. c #8D8D8D", +"V. c #93918C", +"C. c #96948C", +"Z. c #909090", +"A. c #939393", +"S. c #949494", +"D. c #969696", +"F. c #9F9F9D", +"G. c #A6A59F", +"H. c #A3A3A3", +"J. c #A6A6A6", +"K. c #A7A7A7", +"L. c #A8A7A1", +"P. c #ACACAC", +"I. c #AFAFAF", +"U. c #B1B1B1", +"Y. c #B2B2B2", +"T. c #B3B3B3", +"R. c #B4B4B4", +"E. c #B5B5B5", +"W. c #B6B6B6", +"Q. c #B7B7B7", +"!. c #B8B8B8", +"~. c #B9B9B9", +"^. c #BABABA", +"/. c #BBBBBB", +"(. c #BCBCBC", +"). c #BDBDBD", +"_. c #BEBEBE", +"`. c #BFBFBF", +"'. c #C0C0C0", +"]. c #C1C1C1", +"[. c #C2C2C2", +"{. c #C3C3C3", +"}. c #C4C4C4", +"|. c #C5C5C5", +" X c #C6C6C6", +".X c #C7C7C7", +"XX c #C8C8C8", +"oX c #C9C9C9", +"OX c #CACACA", +"+X c #CBCBCB", +"@X c #CCCCCC", +"#X c #CDCDCD", +"$X c #CECECE", +"%X c #CFCFCF", +"&X c #D0D0D0", +"*X c #D1D1D1", +"=X c #D2D2D2", +"-X c #D3D3D3", +";X c #D4D4D4", +":X c #D5D5D5", +">X c #D6D6D6", +",X c #D7D7D7", +"X&.*.p.0.H x X.c.C.L.G.<.2 aXaXaXaX", +"aXaXaXaXaXaXaX E 9X9X;X;X(.V a.Y $.1.; d &.J %.D z > aXaXaXaX", +"aXaXaXaXaXaXaX E 9X2X.X.X~.A .y.v.I i w.} Y 3 % o aXaXaXaX", +"aXaXaXaXaXaXaX E 5X>X{.{.{.g.i h s 8 4.R.=Xq. aXaXaXaXaXaXaX", +"aXaXaXaXaXaXaX E 2X>XoXXX}.`.K.} } K.(.(.X>X;X=X&X5X4. aXaXaXaXaXaXaXaX", +"aXaXaXaXaXaXaX E 5XK.Z.H.&XX5XXXoX{.~.~.(.~.Q.Q.Q.U.`.+X*. aXaX", +"aXaXaX P ;X.X{.R.~.(.~.T.R.Q.I.`.$X*. aXaXaX", +"aXaX E ;X{.{.(.].{.].(.(.`.Q.{.{.( aXaXaX", +"aXaX 8 G A A A A A V A A V m m h < aXaX", +"aXaX aXaX", +"aXaX aXaX", +"aXaX aXaXaX", +"aXaXaX aXaXaXaX" +}; --- gnome-system-tools-2.18.1.orig/debian/pixmaps/time.xpm +++ gnome-system-tools-2.18.1/debian/pixmaps/time.xpm @@ -0,0 +1,135 @@ +/* XPM */ +static char *time[] = { +/* columns rows colors chars-per-pixel */ +"32 32 97 2", +" c #000000", +". c #0C0C0C", +"X c #131313", +"o c #1B1A15", +"O c #1C1B1B", +"+ c #2C281D", +"@ c #252525", +"# c #2C2A24", +"$ c #322E20", +"% c #353121", +"& c #333333", +"* c #373738", +"= c #3C3C3B", +"- c #43423D", +"; c #54503E", +": c #665A31", +"> c #655B39", +", c #434343", +"< c #474748", +"1 c #4B4B4B", +"2 c #4F4F50", +"3 c #57554D", +"4 c #5A574E", +"5 c #535353", +"6 c #5C5A52", +"7 c #5B5B5B", +"8 c #6C654F", +"9 c #65635C", +"0 c #636363", +"q c #6D6C67", +"w c #6C6C6C", +"e c #737373", +"r c #7C7C7C", +"t c #7D8B9A", +"y c #867744", +"u c #877843", +"i c #887A47", +"p c #8A7C48", +"a c #948550", +"s c #8C8365", +"d c #8E866A", +"f c #83827E", +"g c #88867F", +"h c #938B70", +"j c #969078", +"k c #BAA762", +"l c #C9B46D", +"z c #CAB671", +"x c #CCB875", +"c c #CEBB7B", +"v c #838383", +"b c #8E8D8C", +"n c #868F98", +"m c #93928E", +"M c #949493", +"N c #9C9C9C", +"B c #8795A4", +"V c #8894A1", +"C c #8F9DAB", +"Z c #9E9FA1", +"A c #99A4AF", +"S c #9EAAB6", +"D c #A2A19D", +"F c #A3A3A3", +"G c #A7A9AC", +"H c #A8A7A7", +"J c #ACABA6", +"K c #ADADAD", +"L c #A5ADB5", +"P c #ACAFB2", +"I c #A7B1BC", +"U c #ABB3BC", +"Y c #B4B4B4", +"T c #B3B8BD", +"R c #BBBBBB", +"E c #ACB5C0", +"W c #BEBFC0", +"Q c #BBC2CA", +"! c #BEC7D0", +"~ c #D7C689", +"^ c #C3C3C3", +"/ c #C2C7CB", +"( c #C4C9CE", +") c #C8C7C7", +"_ c #CBCBCC", +"` c #C5CBD2", +"' c #CFCFD0", +"] c #CFD0D1", +"[ c #D3D3D3", +"{ c #D1D6DC", +"} c #DCDCDC", +"| c #DDDEE0", +" . c #E4E4E4", +".. c #ECECEC", +"X. c #F3F3F3", +"o. c #FBFBFB", +"O. c None", +/* pixels */ +"O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.", +"O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O. O.O.O.O.O.O.O.", +"O.O.O.O.O. O < < < , O O.O.O.O.O.", +"O.O.O. O. X w Y .......R w X O.O.O.O.", +"O.O.O.O. X M ..o.o.} } o.o...M X O.O.O.", +"O.O.O.O. 9 j d d d d s s s s ; v ..o.o.o._ ) o.o.o...v . O.O.", +"O.O.O.O. h ~ c c x x z l l k 8 ' o.o.o.o.R Y o.o.X.X.} & O.O.", +"O.O.O.O. > a p p i i u u u : g ..o.o.o.o.K H o.o.X.X...v O.O.", +"O.O.O. O J H D M m f b m 6 M o.o.o.o.o.N M ..X.X.....D O.", +"O.O.O. = . . .' ^ Y _ [ v M ....o.o.o.K 0 v ^ ..} .D O.", +"O.O.O. 1 .... .W M _ } .N M o.X.o.o.o...Y w 5 ^ ..X.N O.", +"O.O.O. 0 [ _ Q K H Y Q ) F f .o.X.o.X.X.X. .Q } X.X.w O.", +"O.O.O. v ..Q V V U K } } } w Y ..X.X.X.X.X.......X._ O O.", +"O.O.O.O. F { E } _ U t } . .K e _ ..X...........X...7 O.", +"O.O.O.O.@ _ ! Q .H A n } ..} M 0 e ^ ...[ [ ..o.} 0 . O.O.", +"O.O.O. & [ / A T G n n / ' ) P S p 7 b ^ [ } } F * O.O.", +"O.O.O. < ....{ U C K } .. . . .{ _ ^ b w 5 5 < # . O.O.", +"O.O.O. v o.o.X.] ] [ X..... .^ { { ..| [ ^ Y w = o O.O.", +"O.O.O.. H .. . ._ K [ } ....^ Y _ ... .} Y T 5 = o O.O.", +"O.O.O.O ] X... . .R } .[ [ ^ R T ] _ _ ) ^ M 2 - o O.O.", +"O.O. 0 o.o.X.^ ^ } X.o..... .' _ W E ( . .e 2 4 + O.O.", +"O.O.. F X.} } Y K } X..... .K Q ( L L ` ( T 7 5 6 % O.O.", +"O.O.* } o.o.o...^ } } } } } _ R ' ' { | _ v - 0 4 $ O.O.", +"O.. b o.X.........o.o.o.o.o. . .o.X.X. .Y 2 7 e 6 + O.O.", +"O.& r r r e v M H Y Q Q R ) ] } ..} ] T 0 2 r b 9 + O.O.", +" . O r v r e 0 3 6 9 0 w 0 7 5 7 7 v N F w $ O.O.", +"O.O.O. . 0 5 1 < < < , , , , - = = = < < < 1 - X O.O.", +"O.O.O. O.O.", +"O.O.O. O.O.O.", +"O.O.O.O. O.O.O.", +"O.O.O.O. O.O.O.O.", +"O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O." +}; --- gnome-system-tools-2.18.1.orig/debian/pixmaps/users.xpm +++ gnome-system-tools-2.18.1/debian/pixmaps/users.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *users[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c #000000", +". c #040608", +"X c #030A04", +"o c #06090C", +"O c #0A0501", +"+ c #0E0902", +"@ c #0C0C0B", +"# c #0B1A0E", +"$ c #0E141A", +"% c #100F0D", +"& c #1A0F02", +"* c #1E1003", +"= c #191711", +"- c #1D1D1B", +"; c #181715", +": c #151C23", +"> c #0E290E", +", c #0C2210", +"< c #172F1F", +"1 c #162614", +"2 c #1C300E", +"3 c #153B1A", +"4 c #173916", +"5 c #162B20", +"6 c #1E2A36", +"7 c #1D2B38", +"8 c #2C1905", +"9 c #2D1E08", +"0 c #22180D", +"q c #251E18", +"w c #261C13", +"e c #351C04", +"r c #3A1D03", +"t c #29271D", +"y c #29350E", +"u c #382209", +"i c #3D2814", +"p c #343618", +"a c #2E2B24", +"s c #20302F", +"d c #20303F", +"f c #302C24", +"g c #302E28", +"h c #3B372C", +"j c #3D3E3F", +"k c #303438", +"l c #233343", +"z c #283847", +"x c #2B3D4F", +"c c #2E3F50", +"v c #353F49", +"b c #174B19", +"n c #184719", +"m c #1A4718", +"M c #1E5B1E", +"N c #1A521E", +"B c #214515", +"V c #2E4922", +"C c #205624", +"Z c #205B22", +"A c #285825", +"S c #215C29", +"D c #37492B", +"F c #236522", +"G c #236C23", +"H c #276729", +"J c #267626", +"K c #257128", +"L c #267927", +"P c #297D29", +"I c #2F4154", +"U c #35475A", +"Y c #37495D", +"T c #394A57", +"R c #3E4B58", +"E c #324354", +"W c #344B63", +"Q c #384D62", +"! c #3B556F", +"~ c #3F5C7A", +"^ c #442507", +"/ c #4A2706", +"( c #4E2A07", +") c #4D2D0B", +"_ c #46330C", +"` c #572E07", +"' c #532E08", +"] c #563208", +"[ c #463C33", +"{ c #653709", +"} c #633B0E", +"| c #6C3A09", +" . c #643D10", +".. c #703D0B", +"X. c #4D4512", +"o. c #5F4318", +"O. c #4A473D", +"+. c #7B440D", +"@. c #77420D", +"#. c #764C14", +"$. c #7D5111", +"%. c #4A535C", +"&. c #50504E", +"*. c #555145", +"=. c #525250", +"-. c #445463", +";. c #455668", +":. c #425D77", +">. c #505A64", +",. c #44617E", +"<. c #4C647C", +"1. c #53677D", +"2. c #5A6672", +"3. c #676251", +"4. c #736E5B", +"5. c #7C755E", +"6. c #716E65", +"7. c #7B7A78", +"8. c #476381", +"9. c #4A6683", +"0. c #4D6985", +"q. c #4E6B88", +"w. c #526B84", +"e. c #516E8B", +"r. c #55718E", +"t. c #5B748D", +"y. c #577390", +"u. c #5A7693", +"i. c #5D7995", +"p. c #5F7C98", +"a. c #63788D", +"s. c #627C96", +"d. c #627E99", +"f. c #2B832B", +"g. c #2E8C2E", +"h. c #318F31", +"j. c #319431", +"k. c #349A34", +"l. c #66829E", +"z. c #6B839C", +"x. c #758798", +"c. c #768A9E", +"v. c #6A85A1", +"b. c #6D89A4", +"n. c #728CA7", +"m. c #718DA9", +"M. c #7792AE", +"N. c #7C92A7", +"B. c #7B93AA", +"V. c #8C4C0D", +"C. c #814D13", +"Z. c #8B5716", +"A. c #99540F", +"S. c #96510D", +"D. c #955B14", +"F. c #995712", +"G. c #945613", +"H. c #99671D", +"J. c #966926", +"K. c #A0560E", +"L. c #AB5E11", +"P. c #A55A10", +"I. c #A56717", +"U. c #AC6113", +"Y. c #AF731C", +"T. c #BE6913", +"R. c #BD7C1E", +"E. c #B87D25", +"W. c #A87527", +"Q. c #C66D14", +"!. c #C97117", +"~. c #CC7519", +"^. c #CE781B", +"/. c #D37C1E", +"(. c #D57F20", +"). c #BA832D", +"_. c #81835F", +"`. c #88826F", +"'. c #95907E", +"]. c #AD884A", +"[. c #A59C7E", +"{. c #BBA97F", +"}. c #C88727", +"|. c #C08A34", +" X c #CE9232", +".X c #D18A23", +"XX c #D98222", +"oX c #D08F2B", +"OX c #D79027", +"+X c #D89027", +"@X c #DB952C", +"#X c #DE982E", +"$X c #D5932F", +"%X c #D39432", +"&X c #D99631", +"*X c #DE9A33", +"=X c #E29E36", +"-X c #E3A13A", +";X c #C89541", +":X c #C89D57", +">X c #CEA55E", +",X c #C4A267", +"XX2XvX4.O YXYXYXYXYX", +"YXYXYXYXYXYXYX - tX1X@X%X X X XoX;XbXwX@ YXYXYXYXYX", +"YXYXYXYXYXYX g ].=X-X-X-X=X$X).zXuXa YXYXYXYXYX", +"YXYXYXYXYXYX o.@X*X*X*X#XoX).3XcXh YXYXYXYXYX", +"YXYXYXYXYX O O O O O 9 ).#X#X#X@X}.W.4XcXh YXYXYXYXYX", +"YXYXYXYXYX 8 Z.C. .) } $.G.) O H.@X@X@X+X).J.{.xXf YXYXYXYXYX", +"YXYXYXYXYX + } ^.XXXXXX(././.+.& Z.+XOXOXOXY.#.yXyXt YXYXYXYXYX", +"YXYXYXYXYX 8 F.^./.(.(./.^.~.F.^ _ R..X.XR.$.p jX[.= YXYXYXYX", +"YXYXYXYXYX e U.~.^.^.^.^.~.~.U.] > X.H.I.@.y A {.5.1 X YXYX", +"YXYXYXYXYX e U.!.~.~.~.!.!.!.L.` b F 4 2 m M H _.D M C # YX", +"YXYXYXYXYX * F.Q.L.@.+.@.V.T.K.i F f.L J K F F V M K J H # YX", +"YXYXYXYXYXYX { Q...{ P.V./ K.V.B g.h.g.f.f.P L J L J L f.Z X ", +"YXYXYXYX 0 S.| ( { ' / V.u m L k.k.k.j.j.h.g.f.f.f.L J > ", +"YXYXYX : -.1.[ ^ e r e e i E T s b f.k.j.j.j.g.f.f.f.L P b ", +"YXYX @ %.c.9Xn.a.%.a 0 w j -.1.t.w.E 4 G h.g.g.f.f.P L L K 3 ", +"YX @ 2.7XM.M.M.d.8XfXaXaXdXz.t.s.s.i.;.5 F f.f.f.P L L K N X ", +"YX. >.N.b.b.n.n.b.c.VXUXGXdXz.l.s.u.u.y.Y < K K H S 3 > , X ", +" k z.l.v.b.b.b.b.s.qXIXFXM.l.z.7Xd.t.e.9.7 X X X X ", +" R i.d.d.d.d.d.v.s.x.DXhXl.p.0XVX0Xt.q.9.W X ", +" Y u.u.p.p.p.d.d.i.a.mX0Xu.l.dX0XN.u.9.9.! o ", +" c e.y.y.u.u.u.i.u.t.fX8Xr.r.e.q.q.9.8.8.W . YX", +" : 0.e.e.y.y.y.r.u.w.6Xs.e.e.q.0.9.8.~ ~ d YX", +" 6 Q :.<.0.e.e.r.9.z.u.q.0.9.:.~ ! W d o YXYXYXYXYXYX", +" . o $ 6 z c E I ;.U I c z 7 : o . YXYXYXYXYXYX", +" @ YXYXYXYXYXYXYX", +" YXYXYXYXYXYXYXYX", +"YX YXYXYXYXYXYXYXYXYX" +}; --- gnome-system-tools-2.18.1.orig/debian/pixmaps/boot.xpm +++ gnome-system-tools-2.18.1/debian/pixmaps/boot.xpm @@ -0,0 +1,237 @@ +/* XPM */ +static char *boot[] = { +/* columns rows colors chars-per-pixel */ +"32 32 199 2", +" c #000000", +". c #0B0404", +"X c #0C0C0C", +"o c #110D0D", +"O c #131313", +"+ c #191212", +"@ c #1C1C1C", +"# c #280606", +"$ c #2A0909", +"% c #241818", +"& c #281919", +"* c #340B08", +"= c #3C0000", +"- c #371E1C", +"; c #3B221F", +": c #242424", +"> c #2A2A2A", +", c #3F302F", +"< c #343434", +"1 c #373838", +"2 c #3B3B3B", +"3 c #480C06", +"4 c #48150D", +"5 c #441E18", +"6 c #530000", +"7 c #570E05", +"8 c #5A0300", +"9 c #57170C", +"0 c #443C3C", +"q c #4C3B3B", +"w c #592D24", +"e c #573932", +"r c #523C3B", +"t c #640101", +"y c #6C0000", +"u c #6B0C03", +"i c #64180A", +"p c #6B1306", +"a c #740101", +"s c #7A0000", +"d c #7B0909", +"f c #771708", +"g c #7D1105", +"h c #7F1212", +"j c #7F1917", +"k c #692623", +"l c #7F2424", +"z c #444444", +"x c #4C4343", +"c c #4C4C4C", +"v c #524948", +"b c #545454", +"n c #5D5D5D", +"m c #5F6060", +"M c #625D5D", +"N c #744A4A", +"B c #656565", +"V c #676868", +"C c #686767", +"Z c #6B6A6A", +"A c #746D6C", +"S c #747474", +"D c #7C7C7C", +"F c #850000", +"G c #830B0C", +"H c #8B0000", +"J c #8C0F04", +"K c #8B1B09", +"L c #861414", +"P c #8B1717", +"I c #881A1A", +"U c #930000", +"Y c #910A0A", +"T c #9C0000", +"R c #971406", +"E c #9A1D0A", +"W c #991F1F", +"Q c #99230C", +"! c #8A2626", +"~ c #873D3D", +"^ c #972626", +"/ c #942A2A", +"( c #9C2222", +") c #953636", +"_ c #9E3131", +"` c #9A3C3C", +"' c #A50101", +"] c #A40908", +"[ c #AB0101", +"{ c #A51507", +"} c #A31A09", +"| c #AD1C0B", +" . c #A21413", +".. c #AD1715", +"X. c #B30303", +"o. c #B40809", +"O. c #BB0101", +"+. c #BB0909", +"@. c #B01616", +"#. c #BF1010", +"$. c #BC1818", +"%. c #A4240E", +"&. c #AA210E", +"*. c #AF2216", +"=. c #AB211D", +"-. c #AF2A11", +";. c #B5250F", +":. c #B42112", +">. c #B72815", +",. c #B6291C", +"<. c #BD2B12", +"1. c #BF371A", +"2. c #A42E2D", +"3. c #AC2E2E", +"4. c #A3322A", +"5. c #A63F3F", +"6. c #AB3333", +"7. c #AD3C3A", +"8. c #B92424", +"9. c #B83423", +"0. c #BE3A2D", +"q. c #B73932", +"w. c #BE3434", +"e. c #BD4338", +"r. c #925454", +"t. c #936363", +"y. c #A34444", +"u. c #A84947", +"i. c #A94949", +"p. c #A45C4D", +"a. c #A55757", +"s. c #A65959", +"d. c #AC5656", +"f. c #A95B5B", +"g. c #BE524C", +"h. c #B45353", +"j. c #B75954", +"k. c #B15E5E", +"l. c #BD5C52", +"z. c #BD5A5A", +"x. c #A67575", +"c. c #A77878", +"v. c #AF7F7F", +"b. c #B26767", +"n. c #B46D6D", +"m. c #B67D7D", +"M. c #C21D1D", +"N. c #C42B12", +"B. c #C63115", +"V. c #CB3015", +"C. c #D23416", +"Z. c #D73E1F", +"A. c #CB3E27", +"S. c #C33232", +"D. c #C83D3D", +"F. c #C5432E", +"G. c #CB513E", +"H. c #D54125", +"J. c #C04B4B", +"K. c #C0554A", +"L. c #CA5A5A", +"P. c #C96B67", +"I. c #E28572", +"U. c #E78E7C", +"Y. c #848484", +"T. c #8B8B8B", +"R. c #998B89", +"E. c #939393", +"W. c #9B9B9B", +"Q. c #A59D9D", +"!. c #B69D9D", +"~. c #BC9A9A", +"^. c #A4A4A4", +"/. c #A8A6A6", +"(. c #ABABAB", +"). c #B5A1A1", +"_. c #B1AAAA", +"`. c #B3B3B3", +"'. c #B6B8B8", +"]. c #BCBCBC", +"[. c #BFC0C0", +"{. c #D68383", +"}. c #C4BDBC", +"|. c #CFBABA", +" X c #EA998A", +".X c #E5ADAD", +"XX c #C4C4C4", +"oX c #C7C8C8", +"OX c #CCCCCC", +"+X c #D3D3D3", +"@X c #D7D8D8", +"#X c #DCDCDC", +"$X c #E3D4D1", +"%X c #EEDEDB", +"&X c #E3E4E4", +"*X c #EBEBEB", +"=X c #F3F3F3", +"-X c #F9F9F9", +";X c None", +/* pixels */ +";X;X2 XX+XXX^.T.b ;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X", +";X;X> /.OXOX'.E.S @ ;X;X;X;X;X o O O O ;X;X;X;X;X;X;X;X;X;X;X", +";X;X;Xb `.+XoX(.T.z ;X+ q q r R.m.s.t.X ;X;X;X;X;X;X;X;X;X;X;X", +";X;X;XX T.XX+X].Q.Y.S R.x.z.7.6.3.( H t . ;X;X;X;X;X;X;X;X;X;X", +";X;X;X;X1 (.+X+XOX@X$X XP.2.U H U H F l . ;X;X;X;X;X;X;X;X;X", +";X;X. V /.XX@X&X*X%XU.H.K.2.H Y i.u.G ) M ;X;X;X;X;X;X;X;X", +";X;XD *X*X&X#X&X$XI.Z.C.G.2.H 5.k.d.) I |.1 ;X;X;X;X;X;X;X;X", +";X: *X-X&X&X#X}.p.B.C.C.G._ F u./ ^ ) L |.W.X ;X;X;X;X;X;X;X", +"@ `.-X-X*X#X&X].w Q B.C.F.u.F y.y.` ) d ~.@Xb ;X;X;X;X;X;X;X", +"S -X-X-X=X&X#X@XA i -.V.A.j.G I f.a.j a c.+X(.> ;X;X;X;X;X;X", +"#X-X=X=X=X*X#X#X'.e K <.V.l.G s d d a y r.XXXXD . ;X;X;X;X;X", +"`.=X=X=X=X=X#X#X@XD 9 %.N.l.L s a a a a ! !.].'.z ;X;X;X;X;X", +"z +X=X*X*X=X*X@X@X[.r f ;.K.L s F F H H U 7.).].T.O ;X;X;X;X", +";XD *X=X*X*X*X#X+X+XY.4 E 9.4.H H U .] ' [ h._.`.V . ;X;X;X", +";XO ].*X*X*X*X*X+X+XXXc p &.e. .T ' J.L.X.X.o.h.(.^.> ;X;X", +";X;Xn #X*X*X*X*X#XOX+XW.5 K >.0.] ' ..{.L.X.O.+.b.(.Y.O ;X;X", +";X;X@ (.*X&X#X*X*X+XOXoXn 7 } 0.q.] [ w..XD.O.O.+.n./.b ;X;X", +";X;X;Xb +X&X&X&X&X#XOXOX^.; g | 0.=.[ X.S.M.+.M.S.j.Q.E.> ;X", +";X;X;X;XW.#X#X#X#X*XOXoXXXZ 3 R :.e...X.$.8.3.^ G ~ W.^.S X ", +";X;X;X;Xz XX#X#X#X&X#XoXoX(., u { ,.g.6.( P a a t N W.W.W.c ", +";X;X;X;X;XS #X@X@X#X&XOX[.XXD * J *.7.d a y 6 = $ z E.E.^.W.: ", +";X;X;X;X;X: '.@X+X+X#X%XXXXX`.0 8 4.j 8 = # & z Z Y.^.`.`.`.c ", +";X;X;X;X;X;XV OX+X+X+X#XOX[.[.Y.; k # % 2 m Y.E.^.(.`./.E.D O ", +";X;X;X;X;X;X: ^.+X+XOX@X#XXX].`.m x C Y.W.W.(.(.W.E.T.T.E.b . ", +";X;X;X;X;X;X;Xz XXOXOXOX#XOX].'.`./.`.(././.W.T.T.T.T.E.Y.> ", +";X;X;X;X;X;X;X;XT.oXoXoXOX%X[.'.'.`.^.W.T.Y.D Y.T.T.Y.V 2 . ", +";X;X;X;X;X;X;X;X1 '.oXoXoX+XXX(.W.T.T.T.Y.D D S S b : . ", +";X;X;X;X;X;X;X;XX S XXXX[.[.E.T.Y.T.T.T.S Y.T.Y.B O ;X", +";X;X;X;X;X;X;X;X;X< (.XX[.(.Y.T.T.T.D V Z Y.^.(.T.2 ;X;X;X", +";X;X;X;X;X;X;X;X;X;Xb '.'.E.Y.D Z z : O m T.].XX/.Y.1 ;X;X;X;X;X", +";X;X;X;X;X;X;X;X;X;X@ T.E.m z : o 1 E.'.OX].W.B X ;X;X;X;X", +";X;X;X;X;X;X;X;X;X;X;Xc c O . O S /.oXOX(.T.> ;X;X;X;X" +}; --- gnome-system-tools-2.18.1.orig/debian/install +++ gnome-system-tools-2.18.1/debian/install @@ -0,0 +1 @@ +debian/pixmaps/* usr/share/gnome-system-tools/pixmaps/ --- gnome-system-tools-2.18.1.orig/intltool-merge.in +++ gnome-system-tools-2.18.1/intltool-merge.in @@ -35,7 +35,7 @@ ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; -my $VERSION = "0.35.5"; +my $VERSION = "0.35.4"; ## Loaded modules use strict;