--- gnome-system-tools-2.22.2.orig/debian/rules +++ gnome-system-tools-2.22.2/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f + +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +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 + +binary-install/gnome-system-tools:: + rm -rfv debian/gnome-system-tools/var/scrollkeeper + # boot-admin is disabled (see #309932), also remove some associated files + $(RM) -rfv debian/gnome-system-tools/usr/share/omf/boot-admin + $(RM) -rfv debian/gnome-system-tools/usr/share/gnome/help/boot-admin + $(RM) -rfv debian/gnome-system-tools/usr/share/gnome-system-tools/interfaces/boot.glade + $(RM) -rfv debian/gnome-system-tools/usr/share/gnome-system-tools/pixmaps/boot.png + $(RM) -rfv debian/gnome-system-tools/usr/share/gnome-system-tools/pixmaps/boot.xpm + # don't install shares-admin since nautilus-share is used now + rm -rf debian/gnome-system-tools/usr/lib/nautilus + +build/gnome-system-tools:: + cd doc/network; make pot + cd doc/services; make pot + cd doc/time; make pot + cd doc/users; make pot --- gnome-system-tools-2.22.2.orig/debian/dirs +++ gnome-system-tools-2.22.2/debian/dirs @@ -0,0 +1 @@ +var/cache/gnome-system-tools/backup --- gnome-system-tools-2.22.2.orig/debian/changelog +++ gnome-system-tools-2.22.2/debian/changelog @@ -0,0 +1,1025 @@ +gnome-system-tools (2.22.2-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #344359) + - Clean up GTK Includes (Maxim Ermilov) + - Remove usage of deprecated API + (Andre Klapper, Thomas H.P. Andersen) + * debian/patches/98_automake.patch: + - Refreshed for the new upstream + + -- Pedro Fragoso Tue, 17 Mar 2009 16:08:08 +0000 + +gnome-system-tools (2.22.1-0ubuntu3) jaunty; urgency=low + + * Add 51_users_fit_575_height.patch: Make the 'edit user info' dialog + fit in 575 vertical pixels by moving the contact information into + its own tab. + + -- Michael Terry Thu, 22 Jan 2009 12:43:27 -0500 + +gnome-system-tools (2.22.1-0ubuntu2) jaunty; urgency=low + + * Add 92_postgresql_versions.patch: Add postgresql-8.3 package, and also + some future versions (8.4/8.5/9.0) to cover future backports. + (LP: #214496) + + -- Martin Pitt Mon, 10 Nov 2008 17:43:33 +0100 + +gnome-system-tools (2.22.1-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #273579) + - Mark interface as active if it wasn't previously configured, and as + auto if it's been (or already was) activated + - Translation update + * 90_from_svn_correctly_configure_interface.patch: removed as applied + upstream + * 98_automake.patch: some changes to comply with new source file + + -- Didier Roche Tue, 23 Sep 2008 18:51:35 +0200 + +gnome-system-tools (2.22.0-1ubuntu2) intrepid; urgency=low + + * GtkAdjustment behaviour has changed to restrict the range of the values. + From the GTK README: + GtkAdjustment now enforces that values are restricted to the + range [lower, upper - page_size]. This has always been the + documented behaviour, and the recommended practice is to set + page_size to 0 when using adjustments for simple scalar values, + like in a slider or spin button. + This change meant that the time couldn't be set to greater than 13:49:49, + as the upper was 23:59:59 and the page_sizes 10:10:10. + debian/patches/91_time_admin_adjustment.patch corrects this by reducing + the page_sizes to 0, as recommended in the above quote. + - http://bugzilla.gnome.org/show_bug.cgi?id=551740 + + -- James Westby Thu, 11 Sep 2008 00:18:54 +0100 + +gnome-system-tools (2.22.0-1ubuntu1) intrepid; urgency=low + + * Merge from Debian (LP: #242880). Remaining changes: + - Make it possible to create a group by using the tool by not + ignoring the group name that was chosen. (LP: #205144) + This is debian/patches/85_users_fix_add_group.patch. + - http://bugzilla.gnome.org/show_bug.cgi?id=529228 + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488249 + - change from svn, correctly configure the network interfaces, + thanks to the different people who worked on the issue (lp: #185854) + debian/patches/90_from_svn_correctly_configure_interface.patch: + - http://bugzilla.gnome.org/show_bug.cgi?id=526137 + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488250 + - debian/control, debian/control.in: remove gksu from Depends, add + policykit-gnome to Recommends; needed to press the Unlock button + in network-admin, LP: #206198. + - Ubuntu-specific as Debian hasn't enabled policykit. + - If a user already exists then set the home directory text box + to display their home directory, rather than the default for their + profile. This avoids changing the homedir inadvertantly when + a user's homedir isn't the default for their profile, in + particular the root user on Ubuntu. (LP: #198172) + - http://bugzilla.gnome.org/show_bug.cgi?id=523180 + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488252 + - list the sambashare group as known so it can be used when adding users + debian/patches/25_sambashare_group_definition.patch: + - Unsure if this should be forwarded to Debian. + - list the lpadmin group as known so it can be used when adding users + (lp: #152107) + debian/patches/24_lpadmin_group_definition.patch: + - Unsure if this should be forwarded to Debian. + - Add some extra known services for services-admin. + - debian/patches/10_add_missing_services.patch + - Unsure if this should be forwarded to Debian. + - debian/patches/22_root_only.patch: + - really remove this change which is not used nor required + - Ubuntu-specific. + - translate extra shares admin strings (lp: #200107) + debian/patches/84_translate_extra_strings.patch: + - http://bugzilla.gnome.org/show_bug.cgi?id=522276 + - Not needed in Debian, as they don't have extra translations. + - Build-dep in libpolkit-dbus-dev >=0.5 to get policykit support. + - Ubuntu-specific. + - 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 + - debian/patches/23_users_update_model.patch: + - Unsure if this should be forwarded to Debian. + - don't Recommends gnome-control-center since the current version + doesn't require it (LP: #137915) + - Unsure if this should be forwarded to Debian. + - Replace "Bootloaders" and "Runlevels" with "Services" and "Shares" + in the description. + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488255 + - Add profiles. + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488256 + - Add an apply button to Network Locations. + - http://bugzilla.gnome.org/show_bug.cgi?id=540478 + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488260 + - Install nfs, ntp and samba on demand. + - Unsure if this should be forwarded to Debian. + - Don't show "shares-admin" under GNOME. + - debian/patches/11_shares_admin_not_listed_under_gnome.patch + - Ubuntu-specific. + * Refresh all packages and transition them to quilt patches. + + -- James Westby Tue, 24 Jun 2008 14:05:30 +0100 + +gnome-system-tools (2.22.0-1) unstable; urgency=low + + * New upstream release. + * Massive update to build-dependencies. + + Strip the versioned build-dependency on scrollkeeper. + Closes: #483583. + * Refresh and update patches to apply cleanly. + * 22_root_only.patch: don't switch uid for shares-admin, it does not + connect to the session bus. + * more-groups.patch renamed to 40_more-groups.patch. + + -- Josselin Mouette Mon, 09 Jun 2008 18:34:44 +0200 + +gnome-system-tools (2.22.0-0ubuntu9) hardy; urgency=low + + * Make it possible to create a group by using the tool by not + ignoring the group name that was chosen. (LP: #205144) + This is debian/patches/85_users_fix_add_group.dpatch. + + -- James Westby Sun, 20 Apr 2008 13:06:09 +0100 + +gnome-system-tools (2.22.0-0ubuntu8) hardy; urgency=low + + * debian/control.in, + debian/gnome-system-tools.manpages, + debian/menu, + debian/patches/00list, + debian/patches/11_shares_admin_not_listed_under_gnome.dpatch, + debian rules: + - install shares-admin again since it has been requested by several users + and some derivative distributions, it'll also make easier to edit + previous shares for users upgrading and having some configured, + don't install the nautilus integration and not list + the menu item under GNOME though (lp: #208480) + * debian/patches/90_from_svn_correctly_configure_interface.dpatch: + - change from svn, correctly configure the network interfaces, + thanks to the different people who worked on the issue (lp: #185854) + + -- Sebastien Bacher Mon, 14 Apr 2008 14:31:56 +0200 + +gnome-system-tools (2.22.0-0ubuntu7) hardy; urgency=low + + * debian/control, debian/control.in + - Remove reference to managing shares in description as shares-admin + isn't installed as of version 2.22.0-0ubuntu4. (LP: #209094) + + -- Andrew Starr-Bochicchio (andrewsomething) Mon, 07 Apr 2008 21:34:59 -0400 + +gnome-system-tools (2.22.0-0ubuntu6) hardy; urgency=low + + * debian/control, debian/control.in: remove gksu from Recommends, add + policykit-gnome; needed to press the Unlock button in network-admin, + LP: #206198 + -- Dustin Kirkland Thu, 03 Apr 2008 09:18:03 -0500 + +gnome-system-tools (2.22.0-0ubuntu5) hardy; urgency=low + + * If a user already exists then set the home directory text box + to display their home directory, rather than the default for their + profile. This avoids changing the homedir inadvertantly when + a user's homedir isn't the default for their profile, in + particular the root user on Ubuntu. (LP: #198172) + + -- James Westby Mon, 31 Mar 2008 13:10:26 +0100 + +gnome-system-tools (2.22.0-0ubuntu4) hardy; urgency=low + + * debian/gnome-system-tools.manpages, debian/menu, debian/rules: + - don't install shares-admin since nautilus-share is used in hardy + * debian/patches/25_sambashare_group_definition.dpatch: + - lists the sambashare group as known so it can be used when adding users + * debian/profiles: + - add sambashare to the admin groups + - don't list the lpadmin group in the desktop profile (lp: #152107) + + -- Sebastien Bacher Thu, 27 Mar 2008 23:54:25 +0100 + +gnome-system-tools (2.22.0-0ubuntu3) hardy; urgency=low + + * debian/control.in: + - updated the description + * debian/patches/22_root_only.dpatch: + - really remove this change which is not used nor required + * debian/patches/24_lpadmin_group_definition.dpatch: + - lists the lpadmin group as known so it can be used when adding users + (lp: #152107) + + -- Sebastien Bacher Fri, 14 Mar 2008 00:17:25 +0100 + +gnome-system-tools (2.22.0-0ubuntu2) hardy; urgency=low + + * debian/patches/84_translate_extra_strings.dpatch: + - translate extra shares admin strings (lp: #200107) + + -- Sebastien Bacher Thu, 13 Mar 2008 18:35:09 +0100 + +gnome-system-tools (2.22.0-0ubuntu1) hardy; urgency=low + + * New upstream version: + Users + - Fix #518785 + Common + - Fix #518796 + Shares + - Fix spurious critical warning in the nautilus extension + Network + - Support having '/' in location names + - Support better having a NULL OobsIfacePPP::ethernet + when dealing with locations + Translation + + -- Sebastien Bacher Wed, 12 Mar 2008 16:20:21 +0100 + +gnome-system-tools (2.21.92-0ubuntu1) hardy; urgency=low + + * New upstream releases: + + Time + - Add tangoified time-admin icon + + Common + - Only show one "configuration changed" dialog if several + signals are received + - Do not reload configuration if there's a good chance + the tool changed the configuration + + Shares + - Do not behave strangely when clicked on a separator + in the shares table header + + Network + - Make ESSID field mandatory + + Updated translations + * debian/patches/98_automake.dpatch: + + Updated for the new release. + + -- Emilio Pozuelo Monfort Tue, 26 Feb 2008 18:31:28 +0100 + +gnome-system-tools (2.21.90-0ubuntu1) hardy; urgency=low + + * New upstream release: + - Plug a leak + - Translations. + * debian/patches/98_automake.dpatch: + - Regenerated for the new release. + + -- Emilio Pozuelo Monfort Tue, 29 Jan 2008 17:11:20 +0100 + +gnome-system-tools (2.21.5.1-0ubuntu1) hardy; urgency=low + + * New upstream release: + - Common + + Switch CFLAGS order to be able to compile with other gst.h files around + - Network + + Use Gio to monitor changes in locations + + Do not put a \n in a window title + + Use non-obsolete icons + + Make locations code more extensible + - Shares + + Fix nautilus extension, update emblem after any change to folders + + Locate correctly the nautilus extensions dir + + Label the OK button "Share", more according to HIG + + Fix share dialog width + + Use HIG capitalization for window title + - Time + + Put the "synchronize now" button besides the time spin buttons + + Fix potential crash if it couldn't get dbus connection to inhibit the + screensaver. + - Services + + Use HIG capitalization for window title + + Use non-obsolete icons + - Users + + Use HIG capitalization for window title + + Fixed potential crash when adding a new user + + Do not mislead people putting something in the password entries when + editing an user + + Check whether the home directory doesn't exist before adding a new user + + * debian/control: + - Build-Depend on libglib2.0-dev >= 2.15.2. + * debian/patches/98_automake.dpatch: + - Regenerated for the new release. + + -- Emilio Pozuelo Monfort Tue, 15 Jan 2008 18:41:08 +0100 + +gnome-system-tools (2.21.3-0ubuntu1) hardy; urgency=low + + * New upstream release. + - Network: Support PPPoE/GPRS/UMTS interfaces. + - Shares: Handle SMB passwords. + - Common: Improvements to UI locking + - Ask whether to update config if the user is editing configuration + and the backends detect some change + - Translations + + be@latin (Ihar Hrachyshka) + + es (Jorge Gonzalez) + + nb (Kjartan Maraas) + + ru (Vasiliy Faronov) + + sv (Daniel Nylander) + + * debian/control: + - Require liboobs >= 2.21.3 in build-depends. + * debian/patches/23_users_update_model.dpatch: + - Updated for the new release. + * debian/patches/98_automake.dpatch: + - Regenerated. + + -- Emilio Pozuelo Monfort Thu, 20 Dec 2007 23:22:31 +0100 + +gnome-system-tools (2.21.2.1-0ubuntu2) hardy; urgency=low + + * debian/control.in: + - don't Build-Depends on libglade2-dev the new version use gtkbuild + (LP: #175922) + * debian/patches/83_network-locations-apply-button.dpatch: + - updated the network-admin interface changes (LP: #174512) + + -- Sebastien Bacher Wed, 12 Dec 2007 18:43:04 +0100 + +gnome-system-tools (2.21.2.1-0ubuntu1) hardy; urgency=low + + * New upstream release + * debian/control: + - Require liboobs-1-dev >= 2.21.2. + - Build-dep in libpolkit-dbus-dev >=0.5 to get policykit support. + * debian/patches/22_root_only.dpatch: + - Removed. We don't need it anymore as we use PolicyKit now. + * debian/patches/18_disable_uid.dpatch, + debian/patches/23_users_update_model.dpatch, + debian/patches/80_gst-packages-common.dpatch, + debian/patches/81_gst-packages-shares-admin.dpatch, + debian/patches/82_gst-packages-time-admin.dpatch, + debian/patches/83_network-locations-apply-button.dpatch: + - Updated for the new release. + * debian/patches/19_drop_extra_g_print.dpatch + - Removed, fixed upstream. + * debian/patches/98_autoconf.dpatch: + - Regenerated using autoreconf + * debian/patches/00list: + - Remove 22_root_only.dpatch. + + -- Emilio Pozuelo Monfort Wed, 05 Dec 2007 18:07:38 +0100 + +gnome-system-tools (2.20.0-6) unstable; urgency=low + + * Upload to unstable. + * Add -v when rm-ing and use $(RM). + + -- Loic Minier Mon, 26 May 2008 15:25:06 +0200 + +gnome-system-tools (2.20.0-5) experimental; urgency=low + + * Fix list of omf directories to ship in gnome-system-tools. + + -- Loic Minier Tue, 13 May 2008 16:35:35 +0200 + +gnome-system-tools (2.20.0-4) experimental; urgency=low + + * Regenerate debian/pixmaps/shares.xpm with size 32 instead of 48. + + -- Loic Minier Tue, 13 May 2008 16:14:53 +0200 + +gnome-system-tools (2.20.0-3) experimental; urgency=low + + * Add a new gnome-network-admin package for network-admin; based on a patch + by Robert Millan; closes: #460691. + - Target at experimental for NEW. + - gnome-network-admin depends on gnome-system-tools for translations. + - gnome-network-admin replaces gnome-system-tools (<< 2.20.0-3) as it now + ships the help manual, menu files etc. + - Add per package debian/*.install and debian/*.menu files; drop + debian/install and debian/menu. + - Add a new entry in the control file. + * Fix menu entries to use Applications/System/Administration instead of + Apps/System. + * Add a XPM for shares-admin. + + -- Loic Minier Mon, 12 May 2008 21:20:56 +0200 + +gnome-system-tools (2.20.0-2) unstable; urgency=low + + [ Sam Morris ] + * Added more-groups.patch: adds fuse, lpadmin, netdev, powerdev, vboxusers + and video groups to users-admin. + + [ Loic Minier ] + * New patch, 50_min-max-gid, fixes Minimum versus Maximum GID in + users-admin; thanks Kenrick Bingham and Goswin von Brederlow; + GNOME #526590; closes: #305842. + * Depend on system-tools-backends. + * Bump up Standards-Version to 3.7.3. + * Cleanup rules. + * Drop Debian revisions in build-deps. + + -- Loic Minier Sun, 06 Apr 2008 23:33:54 +0200 + +gnome-system-tools (2.20.0-1) unstable; urgency=low + + [ Niv Sardi ] + * Add 02_amd64_fix.patch that should prevent segfaults on AMD64 arch + thanks to Dann Frazier + (closes: #423867: gnome-system-tools: get_services_tool_new() implicitly converted to pointer) + (closes: #423868: gnome-system-tools: connectino_combo_get_value() implicitly converted to pointer) + + [ Josselin Mouette ] + * New upstream release. + * Drop 02_amd64_fix.patch, integrated upstream. + * Build-depend on libdbus-1-dev and intltool. + * Drop build-depends on libxml2-dev, patchutils, zlib1g-dev, + libpopt-dev, libgnomeui-dev and python. + * Switch to quilt for patch handling; build-depend on quilt. + * Refresh patches to apply cleanly. + * Make gksu a dependency. + + -- Josselin Mouette Sun, 25 Nov 2007 13:54:54 +0100 + +gnome-system-tools (2.20.0-0ubuntu2) gutsy-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 11:26:21 +0100 + +gnome-system-tools (2.20.0-0ubuntu1) gutsy; urgency=low + + * New upstream version + Users + - Actually obbey the "show_all" gconf key (LP: #124993) + Translations + + -- Sebastien Bacher Mon, 17 Sep 2007 15:18:26 +0200 + +gnome-system-tools (2.19.92-0ubuntu2) gutsy; urgency=low + + * debian/control.in: + - don't Recommends gnome-control-center since the current version + doesn't require it (LP: #137915) + + -- Sebastien Bacher Fri, 07 Sep 2007 12:33:43 +0200 + +gnome-system-tools (2.19.92-0ubuntu1) gutsy; urgency=low + + * New upstream version + * debian/control.in: + - removed libgnome and libgnomeui requirements + * debian/patches/98_automake.dpatch: + - updated + + -- Sebastien Bacher Tue, 04 Sep 2007 14:54:58 +0200 + +gnome-system-tools (2.19.91-0ubuntu1) gutsy; urgency=low + + * New upstream version + * debian/patches/83_network-locations-apply-button.dpatch: + - updated to fix the build + * debian/patches/98_automake.dpatch: + - updated + * debian/profiles: + - list only on default profile (LP: #132224) + + -- Sebastien Bacher Tue, 28 Aug 2007 15:00:29 +0200 + +gnome-system-tools (2.19.1-0ubuntu3) gutsy; urgency=low + + * debian/patches/83_network-locations-apply-button.dpatch: + - updated to apply correctly + + -- Sebastien Bacher Fri, 10 Aug 2007 22:00:59 +0200 + +gnome-system-tools (2.19.1-0ubuntu2) gutsy; urgency=low + + * debian/patches/04_activate_avahi_option.dpatch: + - not required, avahi is enabled by default now (LP: #131330) + + -- Sebastien Bacher Fri, 10 Aug 2007 17:30:44 +0200 + +gnome-system-tools (2.19.1-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - Common + - remove hardcoded password char from glade interfaces (Loïc Minier) + - Network + - String improvements and spacing more similar to g-c-c capplets (Denis Washington) + - Translations + - de, es, fi, ja, sv + * debian/patches/04_activate_avahi_option.dpatch + - Updated + * debian/patches/98_automake.dpatch + - Updated with aclocal, autoconf and automake + + -- Aron Sisak Mon, 30 Jul 2007 14:25:07 +0200 + +gnome-system-tools (2.19.0-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - Common + - fix gtk-update-icon-cache for uninstall-hook (David Farning) + - Network + - Fix implicit conversion to pointer + - Add WPA/WPA2 PSK descriptions + - Services + - Fix implicit conversion to pointer + - Fix some compiler warnings + - Users + - Fix a compiler warning + * Translations + - be@latin, ca, dz, en_GB, es, et, eu, it, nb, pt_BR, si, th, vi, zh_CN + * debian/control.in + - removed libart build dependency + + -- Aron Sisak Thu, 19 Jul 2007 12:56:26 +0200 + +gnome-system-tools (2.18.1-1ubuntu1) gutsy; urgency=low + + * Resynchronized with Debian, remaining Ubuntu changes: + - debian/rules: i18n magic. + - debian/control.in: Maintainer: Ubuntu Desktop Team + . + - debian/gnome-system-tools.install, debian/profiles: profiles. + - debian/patches/82_gst-packages-time-admin.dpatch: install ntp on demand. + - debian/patches/10_add_missing_services.dpatch: add missing services. + - debian/patches/04_activate_avahi_option.dpatch: activate Avahi. + - debian/patches/80_gst-packages-common.dpatch: install stuff on demand. + - debian/patches/19_drop_extra_g_print.dpatch: drop extra g_print. + - debian/patches/98_automake.dpatch: run automake && rm -r autom4te.cache + - debian/patches/83_network-locations-apply-button.dpatch: Network + Locations -> Apply. + - debian/patches/20_fuse_as_default_group.dpatch: fuse is default group. + - debian/patches/81_gst-packages-shares-admin.dpatch: install + nfs-kernel-server and samba on demand. + + -- Daniel Holbach Fri, 18 May 2007 10:28:17 +0200 + +gnome-system-tools (2.18.1-1) unstable; urgency=low + + [ Niv Sardi ] + * Bug fix: "network-admin command fails with error:The entered password + is invalid Check that you typed it correctly and that you haven't + activated the "caps lock" key although correct passwd", + thanks to Prakash J Kokkatt (Closes: #422360). (Conflict on old STB). + * Updated menu file. + + [ Riccardo Setti ] + * New upstream release. + * Bumped debhelper compatibility to 5. + * Dropped 64_gksu-in-desktop-files.dpatch in favour of + 22_root_only.dpatch. + * Added 18_disable_uid.dpatch. + * Added libboobs build-dep, bumped libgtk2.0 build-dep + according to configure. + * Added libart-2.0-dev, libiw-dev as build-depends. + + [ Sven Arvidsson ] + * Add basic man pages (Closes: #406262) + + [ Loic Minier ] + * Wrap build-deps and deps. + * Cleanups. + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * Conflict with system-tools-backends << 2.2, not >= 2.2. + + -- Loic Minier Sat, 12 May 2007 10:58:55 +0200 + +gnome-system-tools (2.14.0-4) UNRELEASED; urgency=low + + * Build-depend on pkg-config. + * Build-depend on system-tools-backends-dev (<< 1.9.0). + + -- Loic Minier Thu, 11 Jan 2007 09:56:50 +0100 + +gnome-system-tools (2.14.0-3) unstable; urgency=medium + + * Add a get-orig-source target to retrieve the upstream tarball. + * Add missing build-dep: libgtk2.0-dev (>= 2.6.0). + * Bump insufficient build-dep: system-tools-backends-dev (>= 1.3.0). + + -- Loic Minier Wed, 10 Jan 2007 10:22:43 +0100 + +gnome-system-tools (2.14.0-2) unstable; urgency=low + + * Merge diff from 2.14.0-1.1 NMU (Closes: #309932) and ack NMU + (Closes: #365392), thanks Luk Claes. + * Fix watch file. + * Remove more files related to boot-admin such as the documentation and + Glade interface, thanks rkasan. (Closes: #384675) + * Bump up Standards-Version to 3.7.2. + + -- Loic Minier Sat, 26 Aug 2006 09:54:18 +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 (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 (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.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.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.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 (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.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.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.22.2.orig/debian/network-admin.1 +++ gnome-system-tools-2.22.2/debian/network-admin.1 @@ -0,0 +1,60 @@ +.\" Copyright (C) 2007 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This 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., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH network-admin 1 "2007\-05\-08" "GNOME" +.SH NAME +network-admin \- Network Administration Tool +.SH SYNOPSIS +.B network-admin +.RI [ OPTION... ] +.SH DESCRIPTION +.B network-admin +is part of the GNOME system tools, a set of tools to easily access +and manage system configuration. +.P +.B network-admin +allows you to specify the way your system connects to other +computers and to the Internet. +.SH OPTIONS +.TP +.B \-c \-\-configure=INTERFACE +Configure a network interface +.TP +.B \-t \-\-configure\-type=TYPE +Configure the first network interface with a specific type +.TP +.B \-\-display=DISPLAY +X display to use +.P +.B network-admin +also accepts the standard GNOME and GTK options. +.SH AUTHORS +.B network-admin +was written by Carlos Garnacho Parro and +others. +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "services-admin" (1), +.BR "shares-admin" (1), +.BR "time-admin" (1), +.BR "users-admin" (1), +.BR "gtk-options" (7), +.BR "gnome-options" (7) +.P +The online documentation available through the program's +.I Help +menu. --- gnome-system-tools-2.22.2.orig/debian/control +++ gnome-system-tools-2.22.2/debian/control @@ -0,0 +1,74 @@ +Source: gnome-system-tools +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +Uploaders: Debian GNOME Maintainers , Josselin Mouette , + Niv Sardi +Build-Depends: cdbs (>= 0.4.41), + autotools-dev, + intltool (>= 0.35.0), + quilt, + debhelper (>= 5), + liboobs-1-dev (>= 2.21.3), + libgtk2.0-dev (>= 2.11.3), + cracklib2-dev, + libglib2.0-dev (>= 2.15.2), + libgconf2-dev (>= 2.2.0), + libdbus-1-dev (>= 0.32), + libiw-dev, + libnautilus-extension-dev (>= 2.9.3), + gettext, + libxml-parser-perl, + gnome-pkg-tools, + scrollkeeper, + gnome-doc-utils (>= 0.3.2), + libpolkit-dbus-dev (>= 0.5), + pkg-config +Standards-Version: 3.7.3 + +Package: gnome-system-tools +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + perl, + system-tools-backends +Recommends: policykit-gnome +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 + - Services + - Shares + +Package: gnome-network-admin +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + gnome-system-tools +Replaces: gnome-system-tools (<< 2.22.0-1ubuntu1) +Description: GNOME Network Administration Tool + 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. + . + This package provides network-admin, a program to specify the way your + system connects to other computers and to the Internet. + --- gnome-system-tools-2.22.2.orig/debian/gnome-network-admin.menu +++ gnome-system-tools-2.22.2/debian/gnome-network-admin.menu @@ -0,0 +1,4 @@ +?package(gnome-network-admin):needs="X11" section="Applications/System/Administration"\ + hints="Network"\ + title="Network Admin" command="/usr/bin/network-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/network.xpm" --- gnome-system-tools-2.22.2.orig/debian/services-admin.1 +++ gnome-system-tools-2.22.2/debian/services-admin.1 @@ -0,0 +1,49 @@ +.\" Copyright (C) 2007 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This 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., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH services-admin 1 "2007\-05\-08" "GNOME" +.SH NAME +services-admin \- Services Administration Tool +.SH SYNOPSIS +.B services-admin +.RI [ OPTION... ] +.SH DESCRIPTION +.B services-admin +is part of the GNOME system tools, a set of tools to easily access +and manage system configuration. +.P +.B services-admin +allows you to specify which services will be started during the system boot process. +.SH OPTIONS +.B services-admin +accepts the standard GNOME and GTK options. +.SH AUTHORS +.B services-admin +was written by Carlos Garnacho Parro and +others. +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "users-admin" (1), +.BR "network-admin" (1), +.BR "time-admin" (1), +.BR "shares-admin" (1), +.BR "gtk-options" (7), +.BR "gnome-options" (7) +.P +The online documentation available through the program's +.I Help +menu. --- gnome-system-tools-2.22.2.orig/debian/gnome-system-tools.install +++ gnome-system-tools-2.22.2/debian/gnome-system-tools.install @@ -0,0 +1,30 @@ +debian/profiles etc/gnome-system-tools/users/ +debian/pixmaps/boot.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/disks.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/services.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/shares.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/time.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/users.xpm usr/share/gnome-system-tools/pixmaps/ +debian/tmp/etc/gconf +debian/tmp/usr/bin/services-admin +debian/tmp/usr/bin/shares-admin +debian/tmp/usr/bin/time-admin +debian/tmp/usr/bin/users-admin +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/lib/nautilus +debian/tmp/usr/share/locale +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/omf/services-admin +debian/tmp/usr/share/omf/gnome-system-tools +debian/tmp/usr/share/omf/time-admin +debian/tmp/usr/share/omf/users-admin +debian/tmp/usr/share/omf/shares-admin +debian/tmp/usr/share/gnome-system-tools +debian/tmp/usr/share/applications/services.desktop +debian/tmp/usr/share/applications/shares.desktop +debian/tmp/usr/share/applications/time.desktop +debian/tmp/usr/share/applications/users.desktop +debian/tmp/usr/share/gnome/help/services-admin +debian/tmp/usr/share/gnome/help/shares-admin +debian/tmp/usr/share/gnome/help/time-admin +debian/tmp/usr/share/gnome/help/users-admin --- gnome-system-tools-2.22.2.orig/debian/compat +++ gnome-system-tools-2.22.2/debian/compat @@ -0,0 +1 @@ +5 --- gnome-system-tools-2.22.2.orig/debian/copyright +++ gnome-system-tools-2.22.2/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Jose Carlos Garcia Sogo on +Sun, 05 Aug 2001 11:45:14 +0200. + +It was downloaded from: + http://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.22.2.orig/debian/gnome-network-admin.install +++ gnome-system-tools-2.22.2/debian/gnome-network-admin.install @@ -0,0 +1,5 @@ +debian/pixmaps/network.xpm usr/share/gnome-system-tools/pixmaps/ +debian/tmp/usr/bin/network-admin +debian/tmp/usr/share/applications/network.desktop +debian/tmp/usr/share/gnome/help/network-admin +debian/tmp/usr/share/omf/network-admin --- gnome-system-tools-2.22.2.orig/debian/watch +++ gnome-system-tools-2.22.2/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/([\d\.]+)[02468]/ \ + gnome-system-tools-(.*)\.tar\.gz \ + debian uupdate --- gnome-system-tools-2.22.2.orig/debian/shares-admin.1 +++ gnome-system-tools-2.22.2/debian/shares-admin.1 @@ -0,0 +1,50 @@ +.\" Copyright (C) 2007 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This 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., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH shares-admin 1 "2007\-05\-08" "GNOME" +.SH NAME +shares-admin \- Shared Folders Administration Tool +.SH SYNOPSIS +.B shares-admin +.RI [ OPTION... ] +.SH DESCRIPTION +.B shares-admin +is part of the GNOME system tools, a set of tools to easily access +and manage system configuration. +.P +.B shares-admin +allows you to share folders to other computers in your network or in +the internet. +.SH OPTIONS +.B shares-admin +accepts the standard GNOME and GTK options. +.SH AUTHORS +.B shares-admin +was written by Carlos Garnacho Parro and +others. +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "services-admin" (1), +.BR "network-admin" (1), +.BR "time-admin" (1), +.BR "users-admin" (1), +.BR "gtk-options" (7), +.BR "gnome-options" (7) +.P +The online documentation available through the program's +.I Help +menu. --- gnome-system-tools-2.22.2.orig/debian/time-admin.1 +++ gnome-system-tools-2.22.2/debian/time-admin.1 @@ -0,0 +1,50 @@ +.\" Copyright (C) 2007 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This 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., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH time-admin 1 "2007\-05\-08" "GNOME" +.SH NAME +time-admin \- Time Administration Tool +.SH SYNOPSIS +.B time-admin +.RI [ OPTION... ] +.SH DESCRIPTION +.B time-admin +is part of the GNOME system tools, a set of tools to easily access +and manage system configuration. +.P +.B time-admin +allows you to set the time, date and timezone of your system, as well +as setting any time server to synchronize your local time server. +.SH OPTIONS +.B time-admin +accepts the standard GNOME and GTK options. +.SH AUTHORS +.B time-admin +was written by Carlos Garnacho Parro and +others. +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "services-admin" (1), +.BR "shares-admin" (1), +.BR "network-admin" (1), +.BR "users-admin" (1), +.BR "gtk-options" (7), +.BR "gnome-options" (7) +.P +The online documentation available through the program's +.I Help +menu. --- gnome-system-tools-2.22.2.orig/debian/gnome-system-tools.manpages +++ gnome-system-tools-2.22.2/debian/gnome-system-tools.manpages @@ -0,0 +1,5 @@ +debian/network-admin.1 +debian/services-admin.1 +debian/shares-admin.1 +debian/time-admin.1 +debian/users-admin.1 --- gnome-system-tools-2.22.2.orig/debian/users-admin.1 +++ gnome-system-tools-2.22.2/debian/users-admin.1 @@ -0,0 +1,49 @@ +.\" Copyright (C) 2007 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This 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., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH users-admin 1 "2007\-05\-08" "GNOME" +.SH NAME +users-admin \- Users Administration Tool +.SH SYNOPSIS +.B users-admin +.RI [ OPTION... ] +.SH DESCRIPTION +.B users-admin +is part of the GNOME system tools, a set of tools to easily access +and manage system configuration. +.P +.B users-admin +allows you add, delete and modify the existing users and groups in your system. +.SH OPTIONS +.B users-admin +accepts the standard GNOME and GTK options. +.SH AUTHORS +.B users-admin +was written by Carlos Garnacho Parro and +others. +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "services-admin" (1), +.BR "network-admin" (1), +.BR "time-admin" (1), +.BR "shares-admin" (1), +.BR "gtk-options" (7), +.BR "gnome-options" (7) +.P +The online documentation available through the program's +.I Help +menu. --- gnome-system-tools-2.22.2.orig/debian/profiles +++ gnome-system-tools-2.22.2/debian/profiles @@ -0,0 +1,27 @@ +[Unprivileged] +name=Unprivileged +name[es]=Usuario sin privilegios +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,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,sambashare,lpadmin,video + --- gnome-system-tools-2.22.2.orig/debian/gnome-system-tools.menu +++ gnome-system-tools-2.22.2/debian/gnome-system-tools.menu @@ -0,0 +1,20 @@ +?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\ + 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="Applications/System/Administration"\ + hints="Network"\ + title="Shares Admin" command="/usr/bin/shares-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/shares.xpm" + +?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\ + hints="Users"\ + title="User accounts Admin" command="/usr/bin/users-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/users.xpm" + +?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\ + hints="RunLevel"\ + title="Services Admin" command="/usr/bin/services-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/services.xpm" + --- gnome-system-tools-2.22.2.orig/debian/control.in +++ gnome-system-tools-2.22.2/debian/control.in @@ -0,0 +1,74 @@ +Source: gnome-system-tools +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +Uploaders: @GNOME_TEAM@, + Niv Sardi +Build-Depends: cdbs (>= 0.4.41), + autotools-dev, + intltool (>= 0.35.0), + quilt, + debhelper (>= 5), + liboobs-1-dev (>= 2.21.3), + libgtk2.0-dev (>= 2.11.3), + cracklib2-dev, + libglib2.0-dev (>= 2.15.2), + libgconf2-dev (>= 2.2.0), + libdbus-1-dev (>= 0.32), + libiw-dev, + libnautilus-extension-dev (>= 2.9.3), + gettext, + libxml-parser-perl, + gnome-pkg-tools, + scrollkeeper, + gnome-doc-utils (>= 0.3.2), + libpolkit-dbus-dev (>= 0.5), + pkg-config +Standards-Version: 3.7.3 + +Package: gnome-system-tools +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + perl, + system-tools-backends +Recommends: policykit-gnome +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 + - Services + - Shares + +Package: gnome-network-admin +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + gnome-system-tools +Replaces: gnome-system-tools (<< 2.22.0-1ubuntu1) +Description: GNOME Network Administration Tool + 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. + . + This package provides network-admin, a program to specify the way your + system connects to other computers and to the Internet. + --- gnome-system-tools-2.22.2.orig/debian/pixmaps/boot.xpm +++ gnome-system-tools-2.22.2/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.22.2.orig/debian/pixmaps/services.xpm +++ gnome-system-tools-2.22.2/debian/pixmaps/services.xpm @@ -0,0 +1,261 @@ +/* XPM */ +static char *services[] = { +/* columns rows colors chars-per-pixel */ +"32 32 223 2", +" c #000000", +". c #010101", +"X c #020202", +"o c #030303", +"O c #050505", +"+ c #060606", +"@ c #070707", +"# c #080807", +"$ c #080808", +"% c #090908", +"& c #0B0B0A", +"* c #0B0B0B", +"= c #0E0D0D", +"- c #0E0E0E", +"; c #0F0F0E", +": c #131312", +"> 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.22.2.orig/debian/pixmaps/time.xpm +++ gnome-system-tools-2.22.2/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.22.2.orig/debian/pixmaps/disks.xpm +++ gnome-system-tools-2.22.2/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.22.2.orig/debian/pixmaps/users.xpm +++ gnome-system-tools-2.22.2/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.22.2.orig/debian/pixmaps/network.xpm +++ gnome-system-tools-2.22.2/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 #83AE84D47B36", +", c #869589077FCB", +"< c #8B178C5F7AA3", +"1 c #847F847F847F", +"2 c #8C4D8DF481EB", +"3 c #8B7D8B7D8B7D", +"4 c #92E594448297", +"5 c #931094568E4F", +"6 c #9CA49E548CAD", +"7 c #94B995189359", +"8 c #975098AF9377", +"9 c #9A3E9BB892D3", +"0 c #9D1F9E189ADC", +"q c #A0D2A20A9303", +"w c #A2A0A35C9BA3", +"e c #AACCABCF9D73", +"r c #A458A4C8A348", +"t c #A788A875A53B", +"y c #ABACAC79A42A", +"u c #ABCDABECAB6B", +"i c #AF45B032A334", +"p c #B50EB638A5F4", +"a c #B765B88FA68E", +"s c #BB61BC63A72A", +"d c #B250B30AADDF", +"f c #B796B8BBA869", +"g c #BD27BE28AA0E", +"h c #B39BB3C6B32C", +"j c #BE52BF4CB2D2", +"k c #BE8CBEA2BE63", +"l c #BFBDC0BFAC3C", +"z c #BF76C045B1C0", +"x c #C029C0F5BF93", +"c c #C1A1C2A0AE72", +"v c #C3CFC4CBB1DB", +"b c #C7FEC8F4B5F8", +"n c #C977CA70B761", +"m c #C14CC201BF38", +"M c #C7DCC8A5B93D", +"N c #CBDFCCB9BD4D", +"B c #CFE2D0BABEE3", +"V c #D069D160BFCF", +"C c #C30BC36EC28F", +"Z c #CEC7CF46C14E", +"A c #CBDBCBDBCBDB", +"S c #D3B5D468C38A", +"D c #D7CAD883C782", +"F c #DBBDDC52CCB1", +"G c #D31BD382D2B9", +"H c #DB51DB51DB51", +"J c #E169E1EFD1C5", +"K c #E37CE381E36D", +"L c #EDE9EDE9EDF9", +"P c #F3A8F3A6F3A6", +"I c #FFB4FFB4FFB4", +/* pixels */ +"IIILCmmmmmmmmxGIIIIIIIIIIIIIIIII", +"IIIk>222222222,CIIIIIIIIIIIIIIII", +"IIIdjNgggggggzp2GIIIIIIIIIIIIIII", +"IIIhfe66666666ey5tuuuuytttttrtGI", +"IIIhy6444444444qiyyyyyewq6542;8I", +"IIIdy4<<<<<<:&$$%========&%%%#5P", +"IIIde<;;;;;;$6ZSZNNNNMMMbvvvvp5P", +"IIIdw=#####@>DFDDDSSSSSSVBNNNl5L", +"IIIu>;>>>>>2MFvvvvvvvvvvvvvvvf5L", +"IIIw9FJJJJJJJnvvvvvvvvvvvvvvvf5L", +"IIIrNDBBBBBNbvvvvvvvvvvvvvvvva5L", +"IIItZncvvvvvvvvvvvvvvvvvvvvvva5L", +"IIItZnccccccccccccccccccccccca5L", +"IIItZbccccccccccccccccccccccca5L", +"IIItNbccccccccccccccccccccccca5L", +"IIIrMvllllllllllllllllllllllca5L", +"IIIrvvglllllllllllllllllllllla7L", +"IIIrjvggggggggggggggggggggggga7L", +"IIIrgcgggggggggggggggggggggggf7L", +"IIIrfcgggggggggggggggggggggggf8L", +"IIIrfcssssssssssssssssssssssgs8L", +"IIIrpgssssssssssssssssssssssss8L", +"IIIrpgsssssssssssssssssssssssg8L", +"IIIt9appppppppffffffpppppppppe8P", +"IIIKw000000000-.o+O>0000000000CI", +"IIIIIIIIIIIIII0*--+uIIIIIIIIIIII", +"IIIIIIIIIIILht*11-+-uAIIIIIIIIII", +"IIIIIKkutrr1177rrr087*8rrtuCLIII", +"IIIIIKAkhur*7thkkkkkh*7ruhCGKIII", +"IIIIIKACh07oO******** 170ukGLIII", +"IIIIIHu7331+X++++++++ -1137hKIII", +"IIIIIIPLLLLHurrrrrrrrkLLLLLPIIII" +}; --- gnome-system-tools-2.22.2.orig/debian/patches/10_add_missing_services.patch +++ gnome-system-tools-2.22.2/debian/patches/10_add_missing_services.patch @@ -0,0 +1,44 @@ +Index: ubuntu/src/common/gst-service-role.c +=================================================================== +--- ubuntu.orig/src/common/gst-service-role.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/common/gst-service-role.c 2008-06-24 17:04:49.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 }, +Index: ubuntu/src/common/gst-service-role.h +=================================================================== +--- ubuntu.orig/src/common/gst-service-role.h 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/common/gst-service-role.h 2008-06-24 17:04:49.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 + }; + +Index: ubuntu/src/services/service.c +=================================================================== +--- ubuntu.orig/src/services/service.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/services/service.c 2008-06-24 17:04:49.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.22.2.orig/debian/patches/23_users_update_model.patch +++ gnome-system-tools-2.22.2/debian/patches/23_users_update_model.patch @@ -0,0 +1,59 @@ +Index: ubuntu/src/users/callbacks.c +=================================================================== +--- ubuntu.orig/src/users/callbacks.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/callbacks.c 2008-06-24 17:07:09.000000000 +0100 +@@ -286,6 +286,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); + } + } + +@@ -373,6 +376,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 +@@ -416,6 +423,9 @@ + + groups_table_add_group (group, &list_iter); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + } + +@@ -455,7 +465,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); +@@ -483,7 +497,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 */ --- gnome-system-tools-2.22.2.orig/debian/patches/25_sambashare_group_definition.patch +++ gnome-system-tools-2.22.2/debian/patches/25_sambashare_group_definition.patch @@ -0,0 +1,12 @@ +Index: ubuntu/src/users/privileges-table.c +=================================================================== +--- ubuntu.orig/src/users/privileges-table.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/privileges-table.c 2008-06-24 17:07:23.000000000 +0100 +@@ -55,6 +55,7 @@ + { "fax", N_("Send and receive faxes") }, + { "floppy", N_("Use floppy drives") }, + { "plugdev", N_("Access external storage devices automatically") }, ++ { "sambashare", N_("Share files with the local network") }, + { "scanner", N_("Use scanners") }, + { "tape", N_("Use tape drives") }, + { "wheel", N_("Be able to get administrator privileges") }, --- gnome-system-tools-2.22.2.orig/debian/patches/84_translate_extra_strings.patch +++ gnome-system-tools-2.22.2/debian/patches/84_translate_extra_strings.patch @@ -0,0 +1,34 @@ +Index: ubuntu/interfaces/shares.ui +=================================================================== +--- ubuntu.orig/interfaces/shares.ui 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/interfaces/shares.ui 2008-06-24 17:06:51.000000000 +0100 +@@ -47,7 +47,7 @@ + True + True + True +- Share ++ Share + True + GTK_RELIEF_NORMAL + True +Index: ubuntu/src/shares/share-settings.c +=================================================================== +--- ubuntu.orig/src/shares/share-settings.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/shares/share-settings.c 2008-06-24 17:06:51.000000000 +0100 +@@ -459,14 +459,14 @@ + share = table_get_share_at_iter (iter, &list_iter); + share_settings_set_share (share); + +- title = g_strdup_printf ("Settings for folder '%s'", ++ title = g_strdup_printf (_("Settings for folder '%s'"), + oobs_share_get_path (share)); + gtk_window_set_title (GTK_WINDOW (dialog), title); + g_free (title); + } else { + name_entry = gst_dialog_get_widget (tool->main_dialog, "share_smb_name"); + g_object_set_data (G_OBJECT (name_entry), "modified", GINT_TO_POINTER (FALSE)); +- gtk_window_set_title (GTK_WINDOW (dialog), "Share Folder"); ++ gtk_window_set_title (GTK_WINDOW (dialog), _("Share Folder")); + + if (!path) { + /* make sure the path entry gets filled in */ --- gnome-system-tools-2.22.2.orig/debian/patches/40_more-groups.patch +++ gnome-system-tools-2.22.2/debian/patches/40_more-groups.patch @@ -0,0 +1,22 @@ +Index: ubuntu/src/users/privileges-table.c +=================================================================== +--- ubuntu.orig/src/users/privileges-table.c 2008-06-24 17:04:49.000000000 +0100 ++++ ubuntu/src/users/privileges-table.c 2008-06-24 17:06:30.000000000 +0100 +@@ -53,11 +53,17 @@ + { "dialout", N_("Use modems") }, + { "dip", N_("Connect to Internet using a modem") }, + { "fax", N_("Send and receive faxes") }, ++ { "fuse", N_("Mount user-space filesystems (FUSE)") }, + { "floppy", N_("Use floppy drives") }, ++ { "lpadmin", N_("Configure printers") }, ++ { "netdev", N_("Connect to wireless and ethernet networks") }, + { "plugdev", N_("Access external storage devices automatically") }, ++ { "powerdev", N_("Suspend and hibernate the computer") }, + { "sambashare", N_("Share files with the local network") }, + { "scanner", N_("Use scanners") }, + { "tape", N_("Use tape drives") }, ++ { "vboxusers", N_("Use VirtualBox"), }, ++ { "video", N_("Capture video from TV or Webcams, and use 3d acceleration"), }, + { "wheel", N_("Be able to get administrator privileges") }, + }; + --- gnome-system-tools-2.22.2.orig/debian/patches/98_automake.patch +++ gnome-system-tools-2.22.2/debian/patches/98_automake.patch @@ -0,0 +1,6163 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 98_automake.dpatch by Emilio Pozuelo Monfort +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. +## Update for 2.22.2 release Pedro Fragoso + +@DPATCH@ +diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/aclocal.m4 gnome-system-tools-2.22.2.new/aclocal.m4 +--- gnome-system-tools-2.22.2/aclocal.m4 2009-03-17 15:27:39.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/aclocal.m4 2009-03-17 16:19:55.000000000 +0000 +@@ -19,960 +19,743 @@ + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl + +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-# (This private macro should not be called outside this file.) +-AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.10' +-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +-dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.10.1], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +-]) ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi + +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) ++ AC_ARG_WITH([gconf-source], ++ AC_HELP_STRING([--with-gconf-source=sourceaddress], ++ [Config database for installing schema files.]), ++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) + +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.10.1])dnl +-m4_ifndef([AC_AUTOCONF_VERSION], +- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +- +-# 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` +-]) ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi + +-# 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]) ++ AC_ARG_WITH([gconf-schema-file-dir], ++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], ++ [Directory for installing schema files.]), ++ [GCONF_SCHEMA_FILE_DIR="$withval"],) + +-# AM_CONDITIONAL -*- Autoconf -*- ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 8 +- +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl +-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])]) ++ AC_ARG_ENABLE(schemas-install, ++ [ --disable-schemas-install Disable the schemas installation], ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +-# Free Software Foundation, Inc. ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 9 +- +-# 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... ++# 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 + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], UPC, [depcc="$UPC" am_compiler_list=], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) +- +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- 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 ++# 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]) + +- 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 ++# 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 +- ;; +- 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/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +- 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 ++ 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 +- am_cv_$1_dependencies_compiler_type=none ++ AC_MSG_RESULT(no) + 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]) ++AC_SUBST($1)dnl + ]) + ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [USE_NLS=yes ++ AC_SUBST(USE_NLS) + +-# 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 +-]) ++ gt_cv_have_gettext=no + ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +-]) ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++ # ++ # 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 + +-# 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. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)])]) + ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv)], ++ :,-liconv) ++ fi + +-# AM_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"]) +-]) ++ # ++ # 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" + +-# 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, 2006, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 13 +- +-# 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.60])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- fi +-fi ++ 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 + +-# 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]) ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ]) + +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +- +-_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 +-AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +-]) +-]) ++ 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 + +-# 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_arg=$1 +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $_am_arg | $_am_arg:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) ++ # We need to process the po/ directory. ++ POSUB=po + +-# 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. ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"\$(SHELL) $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])]) ++ 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 + +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++ 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) ++ ]) + +-# 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. ++# 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 + +-# serial 3 ++ 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 + +-# 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 ++ 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 +-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, 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 5 + +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++ dnl 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_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl +-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 " ++# 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 +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) ++ 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]) + ]) + +-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_MKDIR_P +-# --------------- +-# Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +-]) +- +-# 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_]], [_])]) ++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 + +-# _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)]) ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +-# _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])]) ++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"]) + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- ++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ++]) + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. ++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 4 ++AC_DEFUN([GNOME_DOC_INIT], ++[ ++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) + +-# 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 ++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], ++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : ++if test "$gdu_cv_have_gdu" = "yes"; then ++ ifelse([$2],,[:],[$2]) + else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) ++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) + 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. ++GNOME_DOC_DEFINES ++]) + +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) +- +-# Copyright (C) 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. + +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) ++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 36 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 + +-# Check how to create a tarball. -*- Autoconf -*- ++if test -n "$1"; then ++ AC_MSG_CHECKING([for intltool >= $1]) + +-# 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. ++ 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 $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.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 $< [$]@' ++ ++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) ++AC_SUBST(INTLTOOL_POLICY_RULE) ++ ++# Check the gettext tools to make sure they are GNU ++AC_PATH_PROG(XGETTEXT, xgettext) ++AC_PATH_PROG(MSGMERGE, msgmerge) ++AC_PATH_PROG(MSGFMT, msgfmt) ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++ ++# 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 + +-# serial 2 ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) + +-# _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 ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[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]) + ;; +- 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 ++ *) ++ [DATADIRNAME=lib] ++ ;; ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) + +-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 ++IT_PO_SUBDIR([po]) + +-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 +-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +-dnl you should install foo.schemas files ++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_DEFUN([AM_GCONF_SOURCE_2], +-[ +- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then +- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++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_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 +- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ mv -f ${file}.out ${file} + fi ++ chmod ugo+x ${file} ++ chmod u+w ${file} ++done + +- AC_ARG_WITH([gconf-source], +- AC_HELP_STRING([--with-gconf-source=sourceaddress], +- [Config database for installing schema files.]), +- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) ++], ++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' ++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++]) + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +- fi + +- AC_ARG_WITH([gconf-schema-file-dir], +- AC_HELP_STRING([--with-gconf-schema-file-dir=dir], +- [Directory for installing schema files.]), +- [GCONF_SCHEMA_FILE_DIR="$withval"],) ++# 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 ++]) + +- AC_SUBST(GCONF_SCHEMA_FILE_DIR) +- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) + +- AC_ARG_ENABLE(schemas-install, +- [ --disable-schemas-install Disable the schemas installation], +- [case ${enableval} in +- yes|no) ;; +- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; +- esac]) +- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +-]) ++# 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], ...) ++ + + # Copyright (C) 1995-2002 Free Software Foundation, Inc. + # Copyright (C) 2001-2003,2004 Red Hat, Inc. +diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/aclocal.m4.rej gnome-system-tools-2.22.2.new/aclocal.m4.rej +--- gnome-system-tools-2.22.2/aclocal.m4.rej 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-system-tools-2.22.2.new/aclocal.m4.rej 2009-03-17 16:19:55.000000000 +0000 +@@ -0,0 +1,4031 @@ ++*************** ++*** 6649,8206 **** ++ *) ++ ;; ++ esac ++- ;; ++- tandem*) ++- case $cc_basename in ++- NCC*) ++- # NonStop-UX NCC 3.20 ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- ;; ++- *) ++- ;; ++ esac ++- ;; ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++ esac ++- ;; ++- vxworks*) ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++- fi ++- ], ++- [ ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ++- case $host_os in ++- aix*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++- amigaos*) ++- # FIXME: we need at least 68020 code to build shared libraries, but ++- # adding the `-m68020' flag to GCC prevents building anything better, ++- # like `-m68040'. ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ ++- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++- # PIC is the default for these OSes. ++ ;; ++ ++- mingw* | cygwin* | pw32* | os2*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- # Although the cygwin gcc ignores -fPIC, still need this for old-style ++- # (--disable-auto-import) libraries ++- m4_if([$1], [GCJ], [], ++- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; ++ ++- darwin* | rhapsody*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ ++- interix[[3-9]]*) ++- # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++- # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++- msdosdjgpp*) ++- # Just because we use GCC doesn't mean we suddenly get shared libraries ++- # on systems that don't support them. ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- enable_shared=no ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; ++ ++- hpux*) ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- ;; ++ ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- else ++- # PORTME Check for flag to pass linker flags through the system compiler. ++- case $host_os in ++- aix*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++- darwin*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- case $cc_basename in ++- xlc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- ;; ++- esac ++- ;; ++ ++- mingw* | cygwin* | pw32* | os2*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- m4_if([$1], [GCJ], [], ++- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; ++ ++- hpux9* | hpux10* | hpux11*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- ;; ++- esac ++- # Is there a better lt_prog_compiler_static that works with the bundled CC? ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ ;; ++ ++- irix5* | irix6* | nonstopux*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC (with -KPIC) is the default. ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++- newsos6) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++- linux* | k*bsd*-gnu) ++- case $cc_basename in ++- icc* | ecc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- pgcc* | pgf77* | pgf90* | pgf95*) ++- # Portland Group compilers (*not* the Pentium gcc compiler, ++- # which looks to be a dead project) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ccc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All Alpha code is PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- *) ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) ++- # Sun C 5.9 ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- ;; ++- *Sun\ F*) ++- # Sun Fortran 8.3 passes all unrecognized flags to the linker ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' ++- ;; ++- esac ++- ;; ++- esac ++ ;; ++ ++- osf3* | osf4* | osf5*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All OSF/1 code is PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++ ++- rdos*) ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++ ++- solaris*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- case $cc_basename in ++- f77* | f90* | f95*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++- esac ++- ;; ++ ++- sunos4*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++ ++- sysv4 | sysv4.2uw2* | sysv4.3*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++ ++- sysv4*MP*) ++- if test -d /usr/nec ;then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++ ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++ ++- unicos*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++ ++- uts4*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++ ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++ fi ++ ]) ++- AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++ ++ # ++- # Check to make sure the PIC flag actually works. ++ # ++- if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then ++- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], ++- _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), ++- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], ++- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in ++- "" | " "*) ;; ++- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++- esac], ++- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++ fi ++- case $host_os in ++- # For platforms which do not support PIC, -DPIC is meaningless: ++- *djgpp*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++- ;; ++- esac ++ ++ # ++- # Check to make sure the static flag actually works. ++ # ++- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" ++- AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++- _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), ++- $lt_tmp_static_flag, ++- [], ++- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++- ]) ++ ++ ++- # AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) ++- # ------------------------------------ ++- # See if the linker supports building shared libraries. ++- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], ++- [AC_REQUIRE([LT_AC_PROG_SED])dnl ++- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++- ifelse([$1],[CXX],[ ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- case $host_os in ++- aix[[4-9]]*) ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- fi ++- ;; ++- pw32*) ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++- ;; ++- 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' ++- ;; ++- *) ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- ;; ++- esac ++- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++- ],[ ++- runpath_var= ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- _LT_AC_TAGVAR(archive_cmds, $1)= ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= ++- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++- _LT_AC_TAGVAR(hardcode_automatic, $1)=no ++- _LT_AC_TAGVAR(module_cmds, $1)= ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- # include_expsyms should be a list of space-separated symbols to be *always* ++- # included in the symbol list ++- _LT_AC_TAGVAR(include_expsyms, $1)= ++- # exclude_expsyms can be an extended regexp of symbols to exclude ++- # it will be wrapped by ` (' and `)$', so one must not match beginning or ++- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++- # as well as any symbol that contains `d'. ++- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++- # platforms (ab)use it in PIC code, but their linkers get confused if ++- # the symbol is explicitly referenced. Since portable code cannot ++- # rely on this symbol name, it's probably fine to never include it in ++- # preloaded symbol tables. ++- # Exclude shared library initialization/finalization symbols. ++- dnl Note also adjust exclude_expsyms for C++ above. ++- extract_expsyms_cmds= ++- # Just being paranoid about ensuring that cc_basename is set. ++- _LT_CC_BASENAME([$compiler]) ++- case $host_os in ++- cygwin* | mingw* | pw32*) ++- # FIXME: the MSVC++ port hasn't been tested in a loooong time ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- if test "$GCC" != yes; then ++- with_gnu_ld=no ++- fi ++- ;; ++- interix*) ++- # we just hope/assume this is gcc and not c89 (= MSVC++) ++- with_gnu_ld=yes ++- ;; ++- openbsd*) ++- with_gnu_ld=no ++- ;; ++- esac ++ ++- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++- if test "$with_gnu_ld" = yes; then ++- # If archive_cmds runs LD, not CC, wlarc should be empty ++- wlarc='${wl}' ++ ++- # Set some defaults for GNU ld with shared library support. These ++- # are reset later if shared libraries are not supported. Putting them ++- # here allows them to be overridden if necessary. ++- runpath_var=LD_RUN_PATH ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- # ancient GNU ld didn't support --whole-archive et. al. ++- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- else ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- supports_anon_versioning=no ++- case `$LD -v 2>/dev/null` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++- *\ 2.11.*) ;; # other 2.11 versions ++- *) supports_anon_versioning=yes ;; ++- esac ++ ++- # See if GNU ld supports shared libraries. ++- case $host_os in ++- aix[[3-9]]*) ++- # On AIX/PPC, the GNU linker is very broken ++- if test "$host_cpu" != ia64; then ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- cat <&2 ++ ++- *** Warning: the GNU linker, at least up to release 2.9.1, is reported ++- *** to be unable to reliably create shared libraries on AIX. ++- *** Therefore, libtool is disabling shared libraries support. If you ++- *** really care for shared libraries, you may want to modify your PATH ++- *** so that a non-GNU linker is found, and then restart. ++ ++- EOF ++- fi ++- ;; ++ ++- amigaos*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ++- # Samuel A. Falvo II reports ++- # that the semantics of dynamic libraries on AmigaOS, at least up ++- # to version 4, is to share data among multiple programs linked ++- # with the same dynamic library. Since this doesn't match the ++- # behavior of shared libraries on other platforms, we can't use ++- # them. ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++ ++- beos*) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Joseph Beckenbach says some releases of gcc ++- # support --undefined. This deserves some investigation. FIXME ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++ ++- cygwin* | mingw* | pw32*) ++- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++- # as there is no search path for DLLs. ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ ++- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- # If the export-symbols file already is a .def file (1st line ++- # is EXPORTS), use it as is; otherwise, prepend... ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++- cp $export_symbols $output_objdir/$soname.def; ++- else ++- echo EXPORTS > $output_objdir/$soname.def; ++- cat $export_symbols >> $output_objdir/$soname.def; ++- fi~ ++- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++ ++- interix[[3-9]]*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++- # Instead, shared libraries are loaded at an image base (0x10000000 by ++- # default) and relocated if they conflict, which is a slow very memory ++- # consuming and fragmenting process. To avoid this, we pick a random, ++- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++- # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- _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' ++- ;; ++ ++- gnu* | linux* | k*bsd*-gnu) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- tmp_addflag= ++- case $cc_basename,$host_cpu in ++- pgcc*) # Portland Group C compiler ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag' ++- ;; ++- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag -Mnomain' ;; ++- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++- tmp_addflag=' -i_dynamic' ;; ++- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++- tmp_addflag=' -i_dynamic -nofor_main' ;; ++- ifc* | ifort*) # Intel Fortran compiler ++- tmp_addflag=' -nofor_main' ;; ++- esac ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) # Sun C 5.9 ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_sharedflag='-G' ;; ++- *Sun\ F*) # Sun Fortran 8.3 ++- tmp_sharedflag='-G' ;; ++- *) ++- tmp_sharedflag='-shared' ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++- if test $supports_anon_versioning = yes; then ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ ++- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++- $echo "local: *; };" >> $output_objdir/$libname.ver~ ++- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++- fi ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++ ++- netbsd*) ++- 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= ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- fi ++- ;; ++ ++- solaris*) ++- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- cat <&2 ++ ++- *** Warning: The releases 2.8.* of the GNU linker cannot reliably ++- *** create shared libraries on Solaris systems. Therefore, libtool ++- *** is disabling shared libraries support. We urge you to upgrade GNU ++- *** binutils to release 2.9.1 or newer. Another option is to modify ++- *** your PATH or compiler configuration so that the native linker is ++- *** used, and then restart. ++ ++- EOF ++- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++ ++- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++- case `$LD -v 2>&1` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- cat <<_LT_EOF 1>&2 ++ ++- *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++- *** reliably create shared libraries on SCO systems. Therefore, libtool ++- *** is disabling shared libraries support. We urge you to upgrade GNU ++- *** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++- *** your PATH or compiler configuration so that the native linker is ++- *** used, and then restart. ++ ++- _LT_EOF ++- ;; ++- *) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++ ++- sunos4*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- wlarc= ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- *) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++ ++- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++- runpath_var= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- else ++- # PORTME fill in a description of your system's linker (not GNU ld) ++- case $host_os in ++- aix3*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++- # Note: this linker hardcodes the directories in LIBPATH if there ++- # are no directories specified by -L. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++- # Neither direct hardcoding nor static linking is supported with a ++- # broken collect2. ++- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++- fi ++- ;; ++ ++- aix[[4-9]]*) ++- if test "$host_cpu" = ia64; then ++- # On IA64, the linker does run time linking by default, so we don't ++- # have to do anything special. ++- aix_use_runtimelinking=no ++- exp_sym_flag='-Bexport' ++- no_entry_flag="" ++- else ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- fi ++- aix_use_runtimelinking=no ++ ++- # Test if we are trying to use run time linking or normal ++- # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++- # need to do runtime linking. ++- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++- for ld_flag in $LDFLAGS; do ++- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++- aix_use_runtimelinking=yes ++- break ++- fi ++- done ++- ;; ++- esac ++ ++- exp_sym_flag='-bexport' ++- no_entry_flag='-bnoentry' ++- fi ++ ++- # When large executables or shared objects are built, AIX ld can ++- # have problems creating the table of contents. If linking a library ++- # or program results in "error TOC overflow" add -mminimal-toc to ++- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++- _LT_AC_TAGVAR(archive_cmds, $1)='' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ++- if test "$GCC" = yes; then ++- case $host_os in aix4.[[012]]|aix4.[[012]].*) ++- # We only want to do this on AIX 4.2 and lower, the check ++- # below for broken collect2 doesn't work under 4.3+ ++- collect2name=`${CC} -print-prog-name=collect2` ++- if test -f "$collect2name" && \ ++- strings "$collect2name" | grep resolve_lib_name >/dev/null ++- then ++- # We have reworked collect2 ++- : ++- else ++- # We have old collect2 ++- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++- # It fails to find uninstalled libraries when the uninstalled ++- # path is not listed in the libpath. Setting hardcode_minus_L ++- # to unsupported forces relinking ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++- fi ++- ;; ++- esac ++- shared_flag='-shared' ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag="$shared_flag "'${wl}-G' ++- fi ++- else ++- # not using gcc ++- if test "$host_cpu" = ia64; then ++- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++- # chokes on -Wl,-G. The following line is correct: ++- shared_flag='-G' ++- else ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag='${wl}-G' ++- else ++- shared_flag='${wl}-bM:SRE' ++- fi ++- fi ++- fi ++ ++- # It seems that -bexpall does not export symbols beginning with ++- # underscore (_), so it is better to generate a list of symbols to export. ++- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++- if test "$aix_use_runtimelinking" = yes; then ++- # Warning - without using the other runtime loading flags (-brtl), ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++- else ++- if test "$host_cpu" = ia64; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++- else ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- # Warning - without using the other run time loading flags, ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++- # Exported symbols can be pulled into shared objects from archives ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- # This is similar to how AIX traditionally builds its shared libraries. ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++- fi ++- fi ++- ;; ++ ++- amigaos*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- # see comment about different semantics on the GNU ld section ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++ ++- bsdi[[45]]*) ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++- ;; ++ ++- cygwin* | mingw* | pw32*) ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- # hardcode_libdir_flag_spec is actually meaningless, as there is ++- # no search path for DLLs. ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Tell ltmain to make .lib files, not .a files. ++- libext=lib ++- # Tell ltmain to make .dll files, not .so files. ++- shrext_cmds=".dll" ++- # FIXME: Setting linknames here is a bad hack. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++- # The linker will automatically build a .lib file if we build a DLL. ++- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' ++- # FIXME: Should let the user specify the lib program. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- ;; ++ ++- darwin* | rhapsody*) ++- case $host_os in ++- rhapsody* | darwin1.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++- ;; ++- *) # Darwin 1.3 on ++- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- else ++- case ${MACOSX_DEPLOYMENT_TARGET} in ++- 10.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- ;; ++- 10.*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++- ;; ++- esac ++- fi ++- ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- if test "$GCC" = yes ; then ++- output_verbose_link_cmd='echo' ++- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++- else ++- case $cc_basename in ++- xlc*) ++- output_verbose_link_cmd='echo' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' ++- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- ;; ++- *) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- fi ++- ;; ++ ++- dgux*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- freebsd1*) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++- # support. Future versions do this automatically, but an explicit c++rt0.o ++- # does not break anything, and helps significantly (at the cost of a little ++- # extra space). ++- freebsd2.2*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++- freebsd2*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++- 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 ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- hpux9*) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ;; ++ ++- hpux10*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- fi ++- ;; ++ ++- hpux11*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- else ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- *) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- ;; ++- esac ++- fi ++- ;; ++ ++- irix5* | irix6* | nonstopux*) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++ ++- netbsd*) ++- 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 ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- newsos6) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- openbsd*) ++- if test -f /usr/libexec/ld.so; then ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- else ++- case $host_os in ++- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- ;; ++- esac ++- fi ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++ ++- os2*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++- ;; ++ ++- osf3*) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++ ++- osf4* | osf5*) # as osf3* with the addition of -msym flag ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- else ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++ ++- # Both c and cxx compiler support -rpath directly ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++ ++- solaris*) ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++- if test "$GCC" = yes; then ++- wlarc='${wl}' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++- else ++- wlarc='' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- # The compiler driver will combine and reorder linker options, ++- # but understands `-z linker_flag'. GCC discards it without `$wl', ++- # but is careful enough not to reorder. ++- # Supported since Solaris 2.6 (maybe 2.5.1?) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++- else ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++- fi ++- ;; ++- esac ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++ ++- sunos4*) ++- if test "x$host_vendor" = xsequent; then ++- # Use $CC to link under sequent, because it throws in some extra .o ++- # files that make .init and .fini sections work. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- sysv4) ++- case $host_vendor in ++- sni) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++- ;; ++- siemens) ++- ## LD is ld it makes a PLAMLIB ++- ## CC just makes a GrossModule. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- ;; ++- motorola) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++- ;; ++- esac ++- runpath_var='LD_RUN_PATH' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- sysv4.3*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++- ;; ++ ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var=LD_RUN_PATH ++- hardcode_runpath_var=yes ++- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++- fi ++- ;; ++ ++- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var='LD_RUN_PATH' ++ ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++ ++- sysv5* | sco3.2v5* | sco5v6*) ++- # Note: We can NOT use -z defs as we might desire, because we do not ++- # link with -lc, and that would cause any symbols used from libc to ++- # always be unresolved, which means just about no library would ++- # ever link correctly. If we're not using GNU ld we use -z text ++- # though, which does catch some bad symbols but isn't as heavy-handed ++- # as -z defs. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++- runpath_var='LD_RUN_PATH' ++ ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++ ++- uts4*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++ ++- *) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- fi ++- ]) ++- AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++- test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++ # ++- # Do we need to explicitly link libc? ++- # ++- case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++- x|xyes) ++- # Assume -lc should be added ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ ++- if test "$enable_shared" = yes && test "$GCC" = yes; then ++- case $_LT_AC_TAGVAR(archive_cmds, $1) in ++- *'~'*) ++- # FIXME: we may have to deal with multi-command sequences. ++- ;; ++- '$CC '*) ++- # Test whether the compiler implicitly links with -lc since on some ++- # systems, -lgcc has to come before -lc. If gcc already passes -lc ++- # to ld, don't add -lc before -lgcc. ++- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++- $rm conftest* ++- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++- soname=conftest ++- lib=conftest ++- libobjs=conftest.$ac_objext ++- deplibs= ++- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++- compiler_flags=-v ++- linker_flags=-v ++- verstring= ++- output_objdir=. ++- libname=conftest ++- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++- then ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- else ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- fi ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++- else ++- cat conftest.err 1>&5 ++- fi ++- $rm conftest* ++- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++- ;; ++- esac ++- fi ++- ;; ++- esac ++- ])# AC_LIBTOOL_PROG_LD_SHLIBS ++ ++ ++- # _LT_AC_FILE_LTDLL_C ++- # ------------------- ++- # Be careful that the start marker always follows a newline. ++- AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ ++- # /* ltdll.c starts here */ ++- # #define WIN32_LEAN_AND_MEAN ++- # #include ++- # #undef WIN32_LEAN_AND_MEAN ++- # #include ++- # ++- # #ifndef __CYGWIN__ ++- # # ifdef __CYGWIN32__ ++- # # define __CYGWIN__ __CYGWIN32__ ++- # # endif ++- # #endif ++- # ++- # #ifdef __cplusplus ++- # extern "C" { ++- # #endif ++- # BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ++- # #ifdef __cplusplus ++- # } ++- # #endif ++- # ++- # #ifdef __CYGWIN__ ++- # #include ++- # DECLARE_CYGWIN_DLL( DllMain ); ++- # #endif ++- # HINSTANCE __hDllInstance_base; ++ # ++- # BOOL APIENTRY ++- # DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) ++- # { ++- # __hDllInstance_base = hInst; ++- # return TRUE; ++- # } ++- # /* ltdll.c ends here */ ++- ])# _LT_AC_FILE_LTDLL_C ++ ++ ++- # _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++- # --------------------------------- ++- AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++ ++ ++- # old names ++- AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++- AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++- AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++- AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++- AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++- AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++- AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++ ++- # This is just to silence aclocal about the macro not being used ++- ifelse([AC_DISABLE_FAST_INSTALL]) ++ ++- AC_DEFUN([LT_AC_PROG_GCJ], ++- [AC_CHECK_TOOL(GCJ, gcj, no) ++- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++- AC_SUBST(GCJFLAGS) ++ ]) ++ ++- AC_DEFUN([LT_AC_PROG_RC], ++- [AC_CHECK_TOOL(RC, windres, no) ++- ]) ++ ++ ++- # Cheap backport of AS_EXECUTABLE_P and required macros ++- # from Autoconf 2.59; we should not use $as_executable_p directly. ++ ++- # _AS_TEST_PREPARE ++- # ---------------- ++- m4_ifndef([_AS_TEST_PREPARE], ++- [m4_defun([_AS_TEST_PREPARE], ++- [if test -x / >/dev/null 2>&1; then ++- as_executable_p='test -x' ++- else ++- as_executable_p='test -f' ++- fi ++- ])])# _AS_TEST_PREPARE ++ ++- # AS_EXECUTABLE_P ++- # --------------- ++- # Check whether a file is executable. ++- m4_ifndef([AS_EXECUTABLE_P], ++- [m4_defun([AS_EXECUTABLE_P], ++- [AS_REQUIRE([_AS_TEST_PREPARE])dnl ++- $as_executable_p $1[]dnl ++- ])])# AS_EXECUTABLE_P ++ ++- # NOTE: This macro has been submitted for inclusion into # ++- # GNU Autoconf as AC_PROG_SED. When it is available in # ++- # a released version of Autoconf we should remove this # ++- # macro and use it instead. # ++- # LT_AC_PROG_SED ++- # -------------- ++- # Check for a fully-functional sed program, that truncates ++- # as few characters as possible. Prefer GNU sed if found. ++- AC_DEFUN([LT_AC_PROG_SED], ++- [AC_MSG_CHECKING([for a sed that does not truncate output]) ++- AC_CACHE_VAL(lt_cv_path_SED, ++- [# Loop through the user's path and test for sed and gsed. ++- # Then use that list of sed's as ones to test for truncation. ++- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++- for as_dir in $PATH ++- do ++- IFS=$as_save_IFS ++- test -z "$as_dir" && as_dir=. ++- for lt_ac_prog in sed gsed; do ++- for ac_exec_ext in '' $ac_executable_extensions; do ++- if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then ++- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++- fi ++- done ++- done ++- done ++- IFS=$as_save_IFS ++- lt_ac_max=0 ++- lt_ac_count=0 ++- # Add /usr/xpg4/bin/sed as it is typically found on Solaris ++- # along with /bin/sed that truncates output. ++- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++- test ! -f $lt_ac_sed && continue ++- cat /dev/null > conftest.in ++- lt_ac_count=0 ++- echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++- # Check for GNU sed and select it if it is found. ++- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++- lt_cv_path_SED=$lt_ac_sed ++- break ++- fi ++- while true; do ++- cat conftest.in conftest.in >conftest.tmp ++- mv conftest.tmp conftest.in ++- cp conftest.in conftest.nl ++- echo >>conftest.nl ++- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++- cmp -s conftest.out conftest.nl || break ++- # 10000 chars as input seems more than enough ++- test $lt_ac_count -gt 10 && break ++- lt_ac_count=`expr $lt_ac_count + 1` ++- if test $lt_ac_count -gt $lt_ac_max; then ++- lt_ac_max=$lt_ac_count ++- lt_cv_path_SED=$lt_ac_sed ++- fi ++- done ++- done ++- ]) ++- SED=$lt_cv_path_SED ++- AC_SUBST([SED]) ++- AC_MSG_RESULT([$SED]) ++- ]) ++ ++- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++- # ++- # Copyright © 2004 Scott James Remnant . ++- # ++- # This program is free software; you can redistribute it and/or modify ++- # it under the terms of the GNU General Public License as published by ++- # the Free Software Foundation; either version 2 of the License, or ++- # (at your option) any later version. ++- # ++- # This program is distributed in the hope that it will be useful, but ++- # WITHOUT ANY WARRANTY; without even the implied warranty of ++- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++- # General Public License for more details. ++- # ++- # You should have received a copy of the GNU General Public License ++- # along with this program; if not, write to the Free Software ++- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++- # ++- # As a special exception to the GNU General Public License, if you ++- # distribute this file as part of a program that contains a ++- # configuration script generated by Autoconf, you may include it under ++- # the same distribution terms that you use for the rest of that program. ++ ++- # PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++ # ---------------------------------- ++- AC_DEFUN([PKG_PROG_PKG_CONFIG], ++- [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++- AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++- fi ++- if test -n "$PKG_CONFIG"; then ++- _pkg_min_version=m4_default([$1], [0.9.0]) ++- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++- AC_MSG_RESULT([yes]) ++- else ++- AC_MSG_RESULT([no]) ++- PKG_CONFIG="" ++- fi ++- ++- fi[]dnl ++- ])# PKG_PROG_PKG_CONFIG ++ ++- # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++- # ++- # Check to see whether a particular set of modules exists. Similar ++- # to PKG_CHECK_MODULES(), but does not set variables or print errors. ++- # ++ # ++- # Similar to PKG_CHECK_MODULES, make sure that the first instance of ++- # this or PKG_CHECK_MODULES is called, or make sure to call ++- # PKG_CHECK_EXISTS manually ++- # -------------------------------------------------------------- ++- AC_DEFUN([PKG_CHECK_EXISTS], ++- [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++- if test -n "$PKG_CONFIG" && \ ++- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++- m4_ifval([$2], [$2], [:]) ++- m4_ifvaln([$3], [else ++- $3])dnl ++- fi]) ++ ++ ++- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++- # --------------------------------------------- ++- m4_define([_PKG_CONFIG], ++- [if test -n "$$1"; then ++- pkg_cv_[]$1="$$1" ++- elif test -n "$PKG_CONFIG"; then ++- PKG_CHECK_EXISTS([$3], ++- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++- [pkg_failed=yes]) ++- else ++- pkg_failed=untried ++- fi[]dnl ++- ])# _PKG_CONFIG ++ ++- # _PKG_SHORT_ERRORS_SUPPORTED ++- # ----------------------------- ++- AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++- [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++- _pkg_short_errors_supported=yes ++- else ++- _pkg_short_errors_supported=no ++- fi[]dnl ++- ])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ ++- # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++- # [ACTION-IF-NOT-FOUND]) ++- # ++- # ++- # Note that if there is a possibility the first call to ++- # PKG_CHECK_MODULES might not happen, you should be sure to include an ++- # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++- # ++ # ++- # -------------------------------------------------------------- ++- AC_DEFUN([PKG_CHECK_MODULES], ++- [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++- AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++- AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++- pkg_failed=no ++- AC_MSG_CHECKING([for $1]) ++ ++- _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++- _PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++- m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++- and $1[]_LIBS to avoid the need to call pkg-config. ++- See the pkg-config man page for more details.]) ++ ++- if test $pkg_failed = yes; then ++- _PKG_SHORT_ERRORS_SUPPORTED ++- if test $_pkg_short_errors_supported = yes; then ++- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++- else ++- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++- fi ++- # Put the nasty error message in config.log where it belongs ++- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++- ifelse([$4], , [AC_MSG_ERROR(dnl ++- [Package requirements ($2) were not met: ++ ++- $$1_PKG_ERRORS ++ ++- Consider adjusting the PKG_CONFIG_PATH environment variable if you ++- installed software in a non-standard prefix. ++ ++- _PKG_TEXT ++- ])], ++- [AC_MSG_RESULT([no]) ++- $4]) ++- elif test $pkg_failed = untried; then ++- ifelse([$4], , [AC_MSG_FAILURE(dnl ++- [The pkg-config script could not be found or is too old. Make sure it ++- is in your PATH or set the PKG_CONFIG environment variable to the full ++- path to pkg-config. ++ ++- _PKG_TEXT ++ ++- To get pkg-config, see .])], ++- [$4]) ++- else ++- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++- AC_MSG_RESULT([yes]) ++- ifelse([$3], , :, [$3]) ++- fi[]dnl ++- ])# PKG_CHECK_MODULES ++ ++- m4_include([m4/gnome-doc-utils.m4]) ++- m4_include([m4/intltool.m4]) ++--- 6432,8901 ---- ++ *) ++ ;; ++ esac +++ ;; +++ tandem*) +++ case $cc_basename in +++ NCC*) +++ # NonStop-UX NCC 3.20 +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +++ ;; +++ *) +++ ;; +++ esac +++ ;; +++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +++ case $cc_basename in +++ CC*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ ;; +++ esac +++ ;; +++ vxworks*) +++ ;; +++ *) +++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +++ ;; +++ esac +++ fi +++ ], +++ [ +++ if test "$GCC" = yes; then +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +++ +++ case $host_os in +++ aix*) +++ # All AIX code is PIC. +++ if test "$host_cpu" = ia64; then +++ # AIX 5 now supports IA64 processor +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ fi +++ ;; +++ +++ amigaos*) +++ # FIXME: we need at least 68020 code to build shared libraries, but +++ # adding the `-m68020' flag to GCC prevents building anything better, +++ # like `-m68040'. +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' +++ ;; +++ +++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +++ # PIC is the default for these OSes. +++ ;; +++ +++ mingw* | cygwin* | pw32* | os2*) +++ # This hack is so that the source file can tell whether it is being +++ # built for inclusion in a dll (and should export symbols for example). +++ # Although the cygwin gcc ignores -fPIC, still need this for old-style +++ # (--disable-auto-import) libraries +++ m4_if([$1], [GCJ], [], +++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) +++ ;; +++ +++ darwin* | rhapsody*) +++ # PIC is the default on this platform +++ # Common symbols not allowed in MH_DYLIB files +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' +++ ;; +++ +++ interix[[3-9]]*) +++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. +++ # Instead, we relocate shared libraries at runtime. +++ ;; +++ +++ msdosdjgpp*) +++ # Just because we use GCC doesn't mean we suddenly get shared libraries +++ # on systems that don't support them. +++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +++ enable_shared=no +++ ;; +++ +++ sysv4*MP*) +++ if test -d /usr/nec; then +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +++ fi +++ ;; +++ +++ hpux*) +++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +++ # not for PA HP-UX. +++ case $host_cpu in +++ hppa*64*|ia64*) +++ # +Z the default +++ ;; +++ *) +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +++ ;; +++ esac +++ ;; +++ +++ *) +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +++ ;; +++ esac +++ else +++ # PORTME Check for flag to pass linker flags through the system compiler. +++ case $host_os in +++ aix*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ if test "$host_cpu" = ia64; then +++ # AIX 5 now supports IA64 processor +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ else +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' +++ fi +++ ;; +++ darwin*) +++ # PIC is the default on this platform +++ # Common symbols not allowed in MH_DYLIB files +++ case $cc_basename in +++ xlc*) +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ ;; +++ esac +++ ;; +++ +++ mingw* | cygwin* | pw32* | os2*) +++ # This hack is so that the source file can tell whether it is being +++ # built for inclusion in a dll (and should export symbols for example). +++ m4_if([$1], [GCJ], [], +++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) +++ ;; +++ +++ hpux9* | hpux10* | hpux11*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +++ # not for PA HP-UX. +++ case $host_cpu in +++ hppa*64*|ia64*) +++ # +Z the default +++ ;; +++ *) +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +++ ;; +++ esac +++ # Is there a better lt_prog_compiler_static that works with the bundled CC? +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +++ ;; +++ +++ irix5* | irix6* | nonstopux*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ # PIC (with -KPIC) is the default. +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +++ ;; +++ +++ newsos6) +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ ;; +++ +++ linux* | k*bsd*-gnu) +++ case $cc_basename in +++ icc* | ecc*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +++ ;; +++ pgcc* | pgf77* | pgf90* | pgf95*) +++ # Portland Group compilers (*not* the Pentium gcc compiler, +++ # which looks to be a dead project) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ ;; +++ ccc*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ # All Alpha code is PIC. +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +++ ;; +++ *) +++ case `$CC -V 2>&1 | sed 5q` in +++ *Sun\ C*) +++ # Sun C 5.9 +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ ;; +++ *Sun\ F*) +++ # Sun Fortran 8.3 passes all unrecognized flags to the linker +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' +++ ;; +++ esac +++ ;; +++ esac +++ ;; +++ +++ osf3* | osf4* | osf5*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ # All OSF/1 code is PIC. +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +++ ;; +++ +++ rdos*) +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +++ ;; +++ +++ solaris*) +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ case $cc_basename in +++ f77* | f90* | f95*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; +++ *) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +++ esac +++ ;; +++ +++ sunos4*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ ;; +++ +++ sysv4 | sysv4.2uw2* | sysv4.3*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ ;; +++ +++ sysv4*MP*) +++ if test -d /usr/nec ;then +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ fi +++ ;; +++ +++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ ;; +++ +++ unicos*) +++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +++ ;; +++ +++ uts4*) +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +++ ;; +++ +++ *) +++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +++ ;; +++ esac +++ fi +++ ]) +++ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) +++ +++ # +++ # Check to make sure the PIC flag actually works. +++ # +++ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then +++ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), +++ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], +++ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in +++ "" | " "*) ;; +++ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; +++ esac], +++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +++ fi +++ case $host_os in +++ # For platforms which do not support PIC, -DPIC is meaningless: +++ *djgpp*) +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +++ ;; +++ *) +++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" +++ ;; +++ esac +++ +++ # +++ # Check to make sure the static flag actually works. +++ # +++ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +++ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), +++ $lt_tmp_static_flag, +++ [], +++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +++ ]) +++ +++ +++ # AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +++ # ------------------------------------ +++ # See if the linker supports building shared libraries. +++ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +++ [AC_REQUIRE([LT_AC_PROG_SED])dnl +++ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +++ ifelse([$1],[CXX],[ +++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +++ case $host_os in +++ aix[[4-9]]*) +++ # If we're using GNU nm, then we don't want the "-C" option. +++ # -C means demangle to AIX nm, but means don't demangle with GNU nm +++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +++ else +++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +++ fi +++ ;; +++ pw32*) +++ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +++ ;; +++ 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' +++ ;; +++ *) +++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +++ ;; +++ esac +++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +++ ],[ +++ runpath_var= +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= +++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +++ _LT_AC_TAGVAR(archive_cmds, $1)= +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= +++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= +++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +++ _LT_AC_TAGVAR(hardcode_direct, $1)=no +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +++ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +++ _LT_AC_TAGVAR(hardcode_automatic, $1)=no +++ _LT_AC_TAGVAR(module_cmds, $1)= +++ _LT_AC_TAGVAR(module_expsym_cmds, $1)= +++ _LT_AC_TAGVAR(always_export_symbols, $1)=no +++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +++ # include_expsyms should be a list of space-separated symbols to be *always* +++ # included in the symbol list +++ _LT_AC_TAGVAR(include_expsyms, $1)= +++ # exclude_expsyms can be an extended regexp of symbols to exclude +++ # it will be wrapped by ` (' and `)$', so one must not match beginning or +++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +++ # as well as any symbol that contains `d'. +++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +++ # platforms (ab)use it in PIC code, but their linkers get confused if +++ # the symbol is explicitly referenced. Since portable code cannot +++ # rely on this symbol name, it's probably fine to never include it in +++ # preloaded symbol tables. +++ # Exclude shared library initialization/finalization symbols. +++ dnl Note also adjust exclude_expsyms for C++ above. +++ extract_expsyms_cmds= +++ # Just being paranoid about ensuring that cc_basename is set. +++ _LT_CC_BASENAME([$compiler]) +++ case $host_os in +++ cygwin* | mingw* | pw32*) +++ # FIXME: the MSVC++ port hasn't been tested in a loooong time +++ # When not using gcc, we currently assume that we are using +++ # Microsoft Visual C++. +++ if test "$GCC" != yes; then +++ with_gnu_ld=no +++ fi +++ ;; +++ interix*) +++ # we just hope/assume this is gcc and not c89 (= MSVC++) +++ with_gnu_ld=yes +++ ;; +++ openbsd*) +++ with_gnu_ld=no +++ ;; +++ esac +++ +++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes +++ if test "$with_gnu_ld" = yes; then +++ # If archive_cmds runs LD, not CC, wlarc should be empty +++ wlarc='${wl}' +++ +++ # Set some defaults for GNU ld with shared library support. These +++ # are reset later if shared libraries are not supported. Putting them +++ # here allows them to be overridden if necessary. +++ runpath_var=LD_RUN_PATH +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +++ # ancient GNU ld didn't support --whole-archive et. al. +++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +++ else +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +++ fi +++ supports_anon_versioning=no +++ case `$LD -v 2>/dev/null` in +++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 +++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +++ *\ 2.11.*) ;; # other 2.11 versions +++ *) supports_anon_versioning=yes ;; +++ esac +++ +++ # See if GNU ld supports shared libraries. +++ case $host_os in +++ aix[[3-9]]*) +++ # On AIX/PPC, the GNU linker is very broken +++ if test "$host_cpu" != ia64; then +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ cat <&2 +++ +++ *** Warning: the GNU linker, at least up to release 2.9.1, is reported +++ *** to be unable to reliably create shared libraries on AIX. +++ *** Therefore, libtool is disabling shared libraries support. If you +++ *** really care for shared libraries, you may want to modify your PATH +++ *** so that a non-GNU linker is found, and then restart. +++ +++ EOF +++ fi +++ ;; +++ +++ amigaos*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ +++ # Samuel A. Falvo II reports +++ # that the semantics of dynamic libraries on AmigaOS, at least up +++ # to version 4, is to share data among multiple programs linked +++ # with the same dynamic library. Since this doesn't match the +++ # behavior of shared libraries on other platforms, we can't use +++ # them. +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ ;; +++ +++ beos*) +++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +++ # Joseph Beckenbach says some releases of gcc +++ # support --undefined. This deserves some investigation. FIXME +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +++ else +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ fi +++ ;; +++ +++ cygwin* | mingw* | pw32*) +++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +++ # as there is no search path for DLLs. +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +++ _LT_AC_TAGVAR(always_export_symbols, $1)=no +++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' +++ +++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +++ # If the export-symbols file already is a .def file (1st line +++ # is EXPORTS), use it as is; otherwise, prepend... +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +++ cp $export_symbols $output_objdir/$soname.def; +++ else +++ echo EXPORTS > $output_objdir/$soname.def; +++ cat $export_symbols >> $output_objdir/$soname.def; +++ fi~ +++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +++ else +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ fi +++ ;; +++ +++ interix[[3-9]]*) +++ _LT_AC_TAGVAR(hardcode_direct, $1)=no +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +++ # Instead, shared libraries are loaded at an image base (0x10000000 by +++ # default) and relocated if they conflict, which is a slow very memory +++ # consuming and fragmenting process. To avoid this, we pick a random, +++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +++ _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' +++ ;; +++ +++ gnu* | linux* | k*bsd*-gnu) +++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +++ tmp_addflag= +++ case $cc_basename,$host_cpu in +++ pgcc*) # Portland Group C compiler +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +++ tmp_addflag=' $pic_flag' +++ ;; +++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +++ tmp_addflag=' $pic_flag -Mnomain' ;; +++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +++ tmp_addflag=' -i_dynamic' ;; +++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 +++ tmp_addflag=' -i_dynamic -nofor_main' ;; +++ ifc* | ifort*) # Intel Fortran compiler +++ tmp_addflag=' -nofor_main' ;; +++ esac +++ case `$CC -V 2>&1 | sed 5q` in +++ *Sun\ C*) # Sun C 5.9 +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +++ tmp_sharedflag='-G' ;; +++ *Sun\ F*) # Sun Fortran 8.3 +++ tmp_sharedflag='-G' ;; +++ *) +++ tmp_sharedflag='-shared' ;; +++ esac +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +++ +++ if test $supports_anon_versioning = yes; then +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +++ $echo "local: *; };" >> $output_objdir/$libname.ver~ +++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +++ fi +++ else +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ fi +++ ;; +++ +++ netbsd*) +++ 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= +++ else +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +++ fi +++ ;; +++ +++ solaris*) +++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ cat <&2 +++ +++ *** Warning: The releases 2.8.* of the GNU linker cannot reliably +++ *** create shared libraries on Solaris systems. Therefore, libtool +++ *** is disabling shared libraries support. We urge you to upgrade GNU +++ *** binutils to release 2.9.1 or newer. Another option is to modify +++ *** your PATH or compiler configuration so that the native linker is +++ *** used, and then restart. +++ +++ EOF +++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +++ else +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ fi +++ ;; +++ +++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +++ case `$LD -v 2>&1` in +++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ cat <<_LT_EOF 1>&2 +++ +++ *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +++ *** reliably create shared libraries on SCO systems. Therefore, libtool +++ *** is disabling shared libraries support. We urge you to upgrade GNU +++ *** binutils to release 2.16.91.0.3 or newer. Another option is to modify +++ *** your PATH or compiler configuration so that the native linker is +++ *** used, and then restart. +++ +++ _LT_EOF +++ ;; +++ *) +++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' +++ else +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ fi +++ ;; +++ esac +++ ;; +++ +++ sunos4*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +++ wlarc= +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ ;; +++ +++ *) +++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +++ else +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ fi +++ ;; +++ esac +++ +++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then +++ runpath_var= +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +++ fi +++ else +++ # PORTME fill in a description of your system's linker (not GNU ld) +++ case $host_os in +++ aix3*) +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +++ # Note: this linker hardcodes the directories in LIBPATH if there +++ # are no directories specified by -L. +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then +++ # Neither direct hardcoding nor static linking is supported with a +++ # broken collect2. +++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +++ fi +++ ;; +++ +++ aix[[4-9]]*) +++ if test "$host_cpu" = ia64; then +++ # On IA64, the linker does run time linking by default, so we don't +++ # have to do anything special. +++ aix_use_runtimelinking=no +++ exp_sym_flag='-Bexport' +++ no_entry_flag="" +++ else +++ # If we're using GNU nm, then we don't want the "-C" option. +++ # -C means demangle to AIX nm, but means don't demangle with GNU nm +++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +++ else +++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +++ fi +++ aix_use_runtimelinking=no +++ +++ # Test if we are trying to use run time linking or normal +++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we +++ # need to do runtime linking. +++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) +++ for ld_flag in $LDFLAGS; do +++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +++ aix_use_runtimelinking=yes +++ break +++ fi +++ done +++ ;; +++ esac +++ +++ exp_sym_flag='-bexport' +++ no_entry_flag='-bnoentry' +++ fi +++ +++ # When large executables or shared objects are built, AIX ld can +++ # have problems creating the table of contents. If linking a library +++ # or program results in "error TOC overflow" add -mminimal-toc to +++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +++ +++ _LT_AC_TAGVAR(archive_cmds, $1)='' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +++ +++ if test "$GCC" = yes; then +++ case $host_os in aix4.[[012]]|aix4.[[012]].*) +++ # We only want to do this on AIX 4.2 and lower, the check +++ # below for broken collect2 doesn't work under 4.3+ +++ collect2name=`${CC} -print-prog-name=collect2` +++ if test -f "$collect2name" && \ +++ strings "$collect2name" | grep resolve_lib_name >/dev/null +++ then +++ # We have reworked collect2 +++ : +++ else +++ # We have old collect2 +++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +++ # It fails to find uninstalled libraries when the uninstalled +++ # path is not listed in the libpath. Setting hardcode_minus_L +++ # to unsupported forces relinking +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +++ fi +++ ;; +++ esac +++ shared_flag='-shared' +++ if test "$aix_use_runtimelinking" = yes; then +++ shared_flag="$shared_flag "'${wl}-G' +++ fi +++ else +++ # not using gcc +++ if test "$host_cpu" = ia64; then +++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +++ # chokes on -Wl,-G. The following line is correct: +++ shared_flag='-G' +++ else +++ if test "$aix_use_runtimelinking" = yes; then +++ shared_flag='${wl}-G' +++ else +++ shared_flag='${wl}-bM:SRE' +++ fi +++ fi +++ fi +++ +++ # It seems that -bexpall does not export symbols beginning with +++ # underscore (_), so it is better to generate a list of symbols to export. +++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes +++ if test "$aix_use_runtimelinking" = yes; then +++ # Warning - without using the other runtime loading flags (-brtl), +++ # -berok will link without error, but may produce a broken library. +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +++ # Determine the default libpath from the value encoded in an empty executable. +++ _LT_AC_SYS_LIBPATH_AIX +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +++ else +++ if test "$host_cpu" = ia64; then +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +++ else +++ # Determine the default libpath from the value encoded in an empty executable. +++ _LT_AC_SYS_LIBPATH_AIX +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +++ # Warning - without using the other run time loading flags, +++ # -berok will link without error, but may produce a broken library. +++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +++ # Exported symbols can be pulled into shared objects from archives +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +++ # This is similar to how AIX traditionally builds its shared libraries. +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +++ fi +++ fi +++ ;; +++ +++ amigaos*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ # see comment about different semantics on the GNU ld section +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ ;; +++ +++ bsdi[[45]]*) +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic +++ ;; +++ +++ cygwin* | mingw* | pw32*) +++ # When not using gcc, we currently assume that we are using +++ # Microsoft Visual C++. +++ # hardcode_libdir_flag_spec is actually meaningless, as there is +++ # no search path for DLLs. +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +++ # Tell ltmain to make .lib files, not .a files. +++ libext=lib +++ # Tell ltmain to make .dll files, not .so files. +++ shrext_cmds=".dll" +++ # FIXME: Setting linknames here is a bad hack. +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +++ # The linker will automatically build a .lib file if we build a DLL. +++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' +++ # FIXME: Should let the user specify the lib program. +++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +++ ;; +++ +++ darwin* | rhapsody*) +++ case $host_os in +++ rhapsody* | darwin1.[[012]]) +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +++ ;; +++ *) # Darwin 1.3 on +++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +++ else +++ case ${MACOSX_DEPLOYMENT_TARGET} in +++ 10.[[012]]) +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +++ ;; +++ 10.*) +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +++ ;; +++ esac +++ fi +++ ;; +++ esac +++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +++ _LT_AC_TAGVAR(hardcode_direct, $1)=no +++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +++ if test "$GCC" = yes ; then +++ output_verbose_link_cmd='echo' +++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +++ else +++ case $cc_basename in +++ xlc*) +++ output_verbose_link_cmd='echo' +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' +++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +++ ;; +++ *) +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ ;; +++ esac +++ fi +++ ;; +++ +++ dgux*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ ;; +++ +++ freebsd1*) +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ ;; +++ +++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +++ # support. Future versions do this automatically, but an explicit c++rt0.o +++ # does not break anything, and helps significantly (at the cost of a little +++ # extra space). +++ freebsd2.2*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ ;; +++ +++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. +++ freebsd2*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ ;; +++ +++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +++ 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 +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ ;; +++ +++ hpux9*) +++ if test "$GCC" = yes; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +++ else +++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +++ fi +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ +++ # hardcode_minus_L: Not really in the search PATH, +++ # but as the default location of the library. +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +++ ;; +++ +++ hpux10*) +++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +++ else +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +++ fi +++ if test "$with_gnu_ld" = no; then +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +++ +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +++ +++ # hardcode_minus_L: Not really in the search PATH, +++ # but as the default location of the library. +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ fi +++ ;; +++ +++ hpux11*) +++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then +++ case $host_cpu in +++ hppa*64*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +++ ;; +++ ia64*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +++ ;; +++ *) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +++ ;; +++ esac +++ else +++ case $host_cpu in +++ hppa*64*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +++ ;; +++ ia64*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +++ ;; +++ *) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +++ ;; ++ esac +++ fi +++ if test "$with_gnu_ld" = no; then +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +++ +++ case $host_cpu in +++ hppa*64*|ia64*) +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=no +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ ;; +++ *) +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +++ +++ # hardcode_minus_L: Not really in the search PATH, +++ # but as the default location of the library. +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ ;; ++ esac +++ fi +++ ;; ++ +++ irix5* | irix6* | nonstopux*) +++ if test "$GCC" = yes; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +++ else +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ fi +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ +++ netbsd*) +++ 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 +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +++ fi +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ +++ newsos6) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ +++ openbsd*) +++ if test -f /usr/libexec/ld.so; then +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +++ else +++ case $host_os in +++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +++ ;; +++ *) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +++ ;; +++ esac +++ fi +++ else +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no +++ fi ++ ;; ++ +++ os2*) +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +++ ;; +++ +++ osf3*) +++ if test "$GCC" = yes; then +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +++ else +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +++ fi +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +++ ;; +++ +++ osf4* | osf5*) # as osf3* with the addition of -msym flag +++ if test "$GCC" = yes; then +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +++ else +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' +++ +++ # Both c and cxx compiler support -rpath directly +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +++ fi +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +++ ;; +++ +++ solaris*) +++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' +++ if test "$GCC" = yes; then +++ wlarc='${wl}' +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' +++ else +++ wlarc='' +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +++ fi +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ case $host_os in +++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +++ *) +++ # The compiler driver will combine and reorder linker options, +++ # but understands `-z linker_flag'. GCC discards it without `$wl', +++ # but is careful enough not to reorder. +++ # Supported since Solaris 2.6 (maybe 2.5.1?) +++ if test "$GCC" = yes; then +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' +++ else +++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' +++ fi +++ ;; +++ esac +++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +++ ;; +++ +++ sunos4*) +++ if test "x$host_vendor" = xsequent; then +++ # Use $CC to link under sequent, because it throws in some extra .o +++ # files that make .init and .fini sections work. +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +++ else +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +++ fi +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes +++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ +++ sysv4) +++ case $host_vendor in +++ sni) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? +++ ;; +++ siemens) +++ ## LD is ld it makes a PLAMLIB +++ ## CC just makes a GrossModule. +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=no +++ ;; +++ motorola) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie +++ ;; +++ esac +++ runpath_var='LD_RUN_PATH' +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ +++ sysv4.3*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ runpath_var=LD_RUN_PATH +++ hardcode_runpath_var=yes +++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ fi ++ ;; ++ +++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ runpath_var='LD_RUN_PATH' ++ +++ if test "$GCC" = yes; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ +++ sysv5* | sco3.2v5* | sco5v6*) +++ # Note: We can NOT use -z defs as we might desire, because we do not +++ # link with -lc, and that would cause any symbols used from libc to +++ # always be unresolved, which means just about no library would +++ # ever link correctly. If we're not using GNU ld we use -z text +++ # though, which does catch some bad symbols but isn't as heavy-handed +++ # as -z defs. +++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +++ runpath_var='LD_RUN_PATH' +++ +++ if test "$GCC" = yes; then +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +++ else +++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +++ fi ++ ;; ++ +++ uts4*) +++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ +++ *) +++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; +++ esac +++ fi +++ ]) +++ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +++ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ +++ # +++ # Do we need to explicitly link libc? +++ # +++ case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in +++ x|xyes) +++ # Assume -lc should be added +++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +++ +++ if test "$enable_shared" = yes && test "$GCC" = yes; then +++ case $_LT_AC_TAGVAR(archive_cmds, $1) in +++ *'~'*) +++ # FIXME: we may have to deal with multi-command sequences. ++ ;; +++ '$CC '*) +++ # Test whether the compiler implicitly links with -lc since on some +++ # systems, -lgcc has to come before -lc. If gcc already passes -lc +++ # to ld, don't add -lc before -lgcc. +++ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +++ $rm conftest* +++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ +++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then +++ soname=conftest +++ lib=conftest +++ libobjs=conftest.$ac_objext +++ deplibs= +++ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +++ compiler_flags=-v +++ linker_flags=-v +++ verstring= +++ output_objdir=. +++ libname=conftest +++ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= +++ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) +++ then +++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +++ else +++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +++ fi +++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag +++ else +++ cat conftest.err 1>&5 +++ fi +++ $rm conftest* +++ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++ ;; +++ esac +++ fi +++ ;; +++ esac +++ ])# AC_LIBTOOL_PROG_LD_SHLIBS +++ +++ +++ # _LT_AC_FILE_LTDLL_C +++ # ------------------- +++ # Be careful that the start marker always follows a newline. +++ AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ +++ # /* ltdll.c starts here */ +++ # #define WIN32_LEAN_AND_MEAN +++ # #include +++ # #undef WIN32_LEAN_AND_MEAN +++ # #include +++ # +++ # #ifndef __CYGWIN__ +++ # # ifdef __CYGWIN32__ +++ # # define __CYGWIN__ __CYGWIN32__ +++ # # endif +++ # #endif +++ # +++ # #ifdef __cplusplus +++ # extern "C" { +++ # #endif +++ # BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +++ # #ifdef __cplusplus +++ # } +++ # #endif +++ # +++ # #ifdef __CYGWIN__ +++ # #include +++ # DECLARE_CYGWIN_DLL( DllMain ); +++ # #endif +++ # HINSTANCE __hDllInstance_base; +++ # +++ # BOOL APIENTRY +++ # DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +++ # { +++ # __hDllInstance_base = hInst; +++ # return TRUE; +++ # } +++ # /* ltdll.c ends here */ +++ ])# _LT_AC_FILE_LTDLL_C ++ ++ +++ # _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +++ # --------------------------------- +++ AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++ ++ +++ # old names +++ AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +++ AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +++ AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +++ AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +++ AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +++ AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +++ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++ +++ # This is just to silence aclocal about the macro not being used +++ ifelse([AC_DISABLE_FAST_INSTALL]) ++ +++ AC_DEFUN([LT_AC_PROG_GCJ], +++ [AC_CHECK_TOOL(GCJ, gcj, no) +++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +++ AC_SUBST(GCJFLAGS) +++ ]) ++ +++ AC_DEFUN([LT_AC_PROG_RC], +++ [AC_CHECK_TOOL(RC, windres, no) +++ ]) ++ ++ +++ # Cheap backport of AS_EXECUTABLE_P and required macros +++ # from Autoconf 2.59; we should not use $as_executable_p directly. ++ +++ # _AS_TEST_PREPARE +++ # ---------------- +++ m4_ifndef([_AS_TEST_PREPARE], +++ [m4_defun([_AS_TEST_PREPARE], +++ [if test -x / >/dev/null 2>&1; then +++ as_executable_p='test -x' +++ else +++ as_executable_p='test -f' +++ fi +++ ])])# _AS_TEST_PREPARE +++ +++ # AS_EXECUTABLE_P +++ # --------------- +++ # Check whether a file is executable. +++ m4_ifndef([AS_EXECUTABLE_P], +++ [m4_defun([AS_EXECUTABLE_P], +++ [AS_REQUIRE([_AS_TEST_PREPARE])dnl +++ $as_executable_p $1[]dnl +++ ])])# AS_EXECUTABLE_P +++ +++ # NOTE: This macro has been submitted for inclusion into # +++ # GNU Autoconf as AC_PROG_SED. When it is available in # +++ # a released version of Autoconf we should remove this # +++ # macro and use it instead. # +++ # LT_AC_PROG_SED +++ # -------------- +++ # Check for a fully-functional sed program, that truncates +++ # as few characters as possible. Prefer GNU sed if found. +++ AC_DEFUN([LT_AC_PROG_SED], +++ [AC_MSG_CHECKING([for a sed that does not truncate output]) +++ AC_CACHE_VAL(lt_cv_path_SED, +++ [# Loop through the user's path and test for sed and gsed. +++ # Then use that list of sed's as ones to test for truncation. +++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++ for as_dir in $PATH +++ do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ for lt_ac_prog in sed gsed; do +++ for ac_exec_ext in '' $ac_executable_extensions; do +++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then +++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" +++ fi +++ done +++ done +++ done +++ IFS=$as_save_IFS +++ lt_ac_max=0 +++ lt_ac_count=0 +++ # Add /usr/xpg4/bin/sed as it is typically found on Solaris +++ # along with /bin/sed that truncates output. +++ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +++ test ! -f $lt_ac_sed && continue +++ cat /dev/null > conftest.in +++ lt_ac_count=0 +++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in +++ # Check for GNU sed and select it if it is found. +++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +++ lt_cv_path_SED=$lt_ac_sed +++ break ++ fi +++ while true; do +++ cat conftest.in conftest.in >conftest.tmp +++ mv conftest.tmp conftest.in +++ cp conftest.in conftest.nl +++ echo >>conftest.nl +++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +++ cmp -s conftest.out conftest.nl || break +++ # 10000 chars as input seems more than enough +++ test $lt_ac_count -gt 10 && break +++ lt_ac_count=`expr $lt_ac_count + 1` +++ if test $lt_ac_count -gt $lt_ac_max; then +++ lt_ac_max=$lt_ac_count +++ lt_cv_path_SED=$lt_ac_sed +++ fi +++ done +++ done +++ ]) +++ SED=$lt_cv_path_SED +++ AC_SUBST([SED]) +++ AC_MSG_RESULT([$SED]) ++ ]) ++ +++ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +++ # +++ # Copyright © 2004 Scott James Remnant . ++ # +++ # This program is free software; you can redistribute it and/or modify +++ # it under the terms of the GNU General Public License as published by +++ # the Free Software Foundation; either version 2 of the License, or +++ # (at your option) any later version. ++ # +++ # This program is distributed in the hope that it will be useful, but +++ # WITHOUT ANY WARRANTY; without even the implied warranty of +++ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +++ # General Public License for more details. +++ # +++ # You should have received a copy of the GNU General Public License +++ # along with this program; if not, write to the Free Software +++ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +++ # +++ # As a special exception to the GNU General Public License, if you +++ # distribute this file as part of a program that contains a +++ # configuration script generated by Autoconf, you may include it under +++ # the same distribution terms that you use for the rest of that program. +++ +++ # PKG_PROG_PKG_CONFIG([MIN-VERSION]) +++ # ---------------------------------- +++ AC_DEFUN([PKG_PROG_PKG_CONFIG], +++ [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +++ m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +++ AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +++ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++ fi +++ if test -n "$PKG_CONFIG"; then +++ _pkg_min_version=m4_default([$1], [0.9.0]) +++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) +++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +++ AC_MSG_RESULT([yes]) +++ else +++ AC_MSG_RESULT([no]) +++ PKG_CONFIG="" +++ fi +++ +++ fi[]dnl +++ ])# PKG_PROG_PKG_CONFIG ++ +++ # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++ # +++ # Check to see whether a particular set of modules exists. Similar +++ # to PKG_CHECK_MODULES(), but does not set variables or print errors. ++ # +++ # +++ # Similar to PKG_CHECK_MODULES, make sure that the first instance of +++ # this or PKG_CHECK_MODULES is called, or make sure to call +++ # PKG_CHECK_EXISTS manually +++ # -------------------------------------------------------------- +++ AC_DEFUN([PKG_CHECK_EXISTS], +++ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +++ if test -n "$PKG_CONFIG" && \ +++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +++ m4_ifval([$2], [$2], [:]) +++ m4_ifvaln([$3], [else +++ $3])dnl +++ fi]) ++ ++ +++ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +++ # --------------------------------------------- +++ m4_define([_PKG_CONFIG], +++ [if test -n "$$1"; then +++ pkg_cv_[]$1="$$1" +++ elif test -n "$PKG_CONFIG"; then +++ PKG_CHECK_EXISTS([$3], +++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +++ [pkg_failed=yes]) +++ else +++ pkg_failed=untried +++ fi[]dnl +++ ])# _PKG_CONFIG ++ +++ # _PKG_SHORT_ERRORS_SUPPORTED +++ # ----------------------------- +++ AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +++ [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +++ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +++ _pkg_short_errors_supported=yes +++ else +++ _pkg_short_errors_supported=no +++ fi[]dnl +++ ])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ +++ # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +++ # [ACTION-IF-NOT-FOUND]) +++ # +++ # +++ # Note that if there is a possibility the first call to +++ # PKG_CHECK_MODULES might not happen, you should be sure to include an +++ # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +++ # +++ # +++ # -------------------------------------------------------------- +++ AC_DEFUN([PKG_CHECK_MODULES], +++ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +++ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +++ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ +++ pkg_failed=no +++ AC_MSG_CHECKING([for $1]) ++ +++ _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +++ _PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ +++ m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +++ and $1[]_LIBS to avoid the need to call pkg-config. +++ See the pkg-config man page for more details.]) ++ +++ if test $pkg_failed = yes; then +++ _PKG_SHORT_ERRORS_SUPPORTED +++ if test $_pkg_short_errors_supported = yes; then +++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` +++ else +++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` +++ fi +++ # Put the nasty error message in config.log where it belongs +++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ +++ ifelse([$4], , [AC_MSG_ERROR(dnl +++ [Package requirements ($2) were not met: ++ +++ $$1_PKG_ERRORS ++ +++ Consider adjusting the PKG_CONFIG_PATH environment variable if you +++ installed software in a non-standard prefix. ++ +++ _PKG_TEXT +++ ])], +++ [AC_MSG_RESULT([no]) +++ $4]) +++ elif test $pkg_failed = untried; then +++ ifelse([$4], , [AC_MSG_FAILURE(dnl +++ [The pkg-config script could not be found or is too old. Make sure it +++ is in your PATH or set the PKG_CONFIG environment variable to the full +++ path to pkg-config. ++ +++ _PKG_TEXT ++ +++ To get pkg-config, see .])], +++ [$4]) +++ else +++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS +++ AC_MSG_RESULT([yes]) +++ ifelse([$3], , :, [$3]) +++ fi[]dnl +++ ])# PKG_CHECK_MODULES ++ +++ m4_include([m4/gnome-doc-utils.m4]) +++ m4_include([m4/intltool.m4]) ++ +++ # Copyright (C) 2002, 2003, 2005, 2006, 2007 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. +++ # (This private macro should not be called outside this file.) +++ AC_DEFUN([AM_AUTOMAKE_VERSION], +++ [am__api_version='1.10' +++ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +++ dnl require some minimum version. Point them to the right macro. +++ m4_if([$1], [1.10.1], [], +++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +++ ]) ++ +++ # _AM_AUTOCONF_VERSION(VERSION) +++ # ----------------------------- +++ # aclocal traces this macro to find the Autoconf version. +++ # This is a private macro too. Using m4_define simplifies +++ # the logic in aclocal, which can simply ignore this definition. +++ m4_define([_AM_AUTOCONF_VERSION], []) ++ +++ # AM_SET_CURRENT_AUTOMAKE_VERSION +++ # ------------------------------- +++ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +++ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +++ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +++ [AM_AUTOMAKE_VERSION([1.10.1])dnl +++ m4_ifndef([AC_AUTOCONF_VERSION], +++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +++ _AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) ++ +++ # 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, 2006 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. ++ +++ # serial 8 ++ +++ # AM_CONDITIONAL(NAME, SHELL-CONDITION) +++ # ------------------------------------- +++ # Define a conditional. +++ AC_DEFUN([AM_CONDITIONAL], +++ [AC_PREREQ(2.52)dnl +++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +++ AC_SUBST([$1_TRUE])dnl +++ AC_SUBST([$1_FALSE])dnl +++ _AM_SUBST_NOTMAKE([$1_TRUE])dnl +++ _AM_SUBST_NOTMAKE([$1_FALSE])dnl +++ 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, 2006 +++ # Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. ++ +++ # serial 9 ++ +++ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +++ # written in clear, in which case automake, when reading aclocal.m4, +++ # will think it sees a *use*, and therefore will trigger all it's +++ # C support machinery. Also note that it means that autoscan, seeing +++ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ ++ +++ # _AM_DEPENDENCIES(NAME) +++ # ---------------------- +++ # See how the compiler implements dependency checking. +++ # NAME is "CC", "CXX", "GCJ", or "OBJC". +++ # We try a few techniques and use that to set a single cache variable. +++ # +++ # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +++ # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +++ # dependency, and given that the user is not expected to run this macro, +++ # just rely on AC_PROG_CC. +++ AC_DEFUN([_AM_DEPENDENCIES], +++ [AC_REQUIRE([AM_SET_DEPDIR])dnl +++ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +++ AC_REQUIRE([AM_MAKE_INCLUDE])dnl +++ AC_REQUIRE([AM_DEP_TRACK])dnl ++ +++ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +++ [$1], CXX, [depcc="$CXX" am_compiler_list=], +++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +++ [$1], UPC, [depcc="$UPC" am_compiler_list=], +++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +++ [depcc="$$1" am_compiler_list=]) +++ +++ AC_CACHE_CHECK([dependency style of $depcc], +++ [am_cv_$1_dependencies_compiler_type], +++ [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +++ # We make a subdir and do the tests there. Otherwise we can end up +++ # making bogus files that we don't know about and never remove. For +++ # instance it was reported that on HP-UX the gcc test will end up +++ # making a dummy file named `D' -- because `-MD' means `put the output +++ # in D'. +++ mkdir conftest.dir +++ # Copy depcomp to subdir because otherwise we won't find it if we're +++ # using a relative directory. +++ cp "$am_depcomp" conftest.dir +++ cd conftest.dir +++ # We will build objects and dependencies in a subdirectory because +++ # it helps to detect inapplicable dependency modes. For instance +++ # both Tru64's cc and ICC support -MD to output dependencies as a +++ # side effect of compilation, but ICC will put the dependencies in +++ # the current directory while Tru64 will put them in the object +++ # directory. +++ mkdir sub ++ +++ am_cv_$1_dependencies_compiler_type=none +++ if test "$am_compiler_list" = ""; then +++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +++ fi +++ 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/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +++ 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])dnl +++ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +++ ]) ++ +++ # 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. +++ # Grep'ing the whole file is not good either: AIX grep has a line +++ # limit of 2048, but all sed's we know have understand at least 4000. +++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +++ dirpart=`AS_DIRNAME("$mf")` +++ else +++ continue +++ fi +++ # Extract the definition of DEPDIR, am__include, and am__quote +++ # from the Makefile without running `make'. +++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +++ test -z "$DEPDIR" && continue +++ am__include=`sed -n 's/^am__include = //p' < "$mf"` +++ test -z "am__include" && continue +++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +++ # When using ansi2knr, U may be empty or an underscore; expand it +++ U=`sed -n 's/^U = //p' < "$mf"` +++ # Find all dependency output files, they are included files with +++ # $(DEPDIR) in their names. We invoke sed twice because it is the +++ # simplest approach to changing $(DEPDIR) to its actual value in the +++ # expansion. +++ for file in `sed -n " +++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +++ # Make sure the directory exists. +++ test -f "$dirpart/$file" && continue +++ fdir=`AS_DIRNAME(["$file"])` +++ AS_MKDIR_P([$dirpart/$fdir]) +++ # echo "creating $dirpart/$file" +++ echo '# dummy' > "$dirpart/$file" +++ done +++ done +++ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ ++ +++ # AM_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, 2006, 2008 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. ++ +++ # serial 13 ++ +++ # 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.60])dnl +++ dnl Autoconf wants to disallow AM_ names. We explicitly allow +++ dnl the ones we care about. +++ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +++ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +++ AC_REQUIRE([AC_PROG_INSTALL])dnl +++ if test "`cd $srcdir && pwd`" != "`pwd`"; then +++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +++ # is not polluted with repeated "-I." +++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +++ # test to see if srcdir already configured +++ if test -f $srcdir/config.status; then +++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +++ fi +++ fi ++ +++ # 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 +++ dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +++ m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ +++ _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 +++ AC_PROVIDE_IFELSE([AC_PROG_OBJC], +++ [_AM_DEPENDENCIES(OBJC)], +++ [define([AC_PROG_OBJC], +++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])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_arg=$1 +++ _am_stamp_count=1 +++ for _am_header in $config_headers :; do +++ case $_am_header in +++ $_am_arg | $_am_arg:* ) +++ break ;; +++ * ) +++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; +++ esac +++ done +++ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) ++ +++ # 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-"\$(SHELL) $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, 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 5 ++ +++ # AM_MISSING_PROG(NAME, PROGRAM) +++ # ------------------------------ +++ AC_DEFUN([AM_MISSING_PROG], +++ [AC_REQUIRE([AM_MISSING_HAS_RUN]) +++ $1=${$1-"${am_missing_run}$2"} +++ AC_SUBST($1)]) ++ ++ +++ # AM_MISSING_HAS_RUN +++ # ------------------ +++ # Define MISSING if not defined so far and test if it supports --run. +++ # If it does, set am_missing_run to use it, otherwise, to nothing. +++ AC_DEFUN([AM_MISSING_HAS_RUN], +++ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +++ AC_REQUIRE_AUX_FILE([missing])dnl +++ 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, 2006 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. ++ +++ # AM_PROG_MKDIR_P +++ # --------------- +++ # Check for `mkdir -p'. +++ AC_DEFUN([AM_PROG_MKDIR_P], +++ [AC_PREREQ([2.60])dnl +++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl +++ dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +++ dnl while keeping a definition of mkdir_p for backward compatibility. +++ dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +++ dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +++ dnl Makefile.ins that do not define MKDIR_P, so we do our own +++ dnl adjustment using top_builddir (which is defined more often than +++ dnl MKDIR_P). +++ AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +++ case $mkdir_p in +++ [[\\/$]]* | ?:[[\\/]]*) ;; +++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +++ esac +++ ]) ++ +++ # 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="\$(install_sh) -c -s" +++ AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++ +++ # Copyright (C) 2006 Free Software Foundation, Inc. +++ # +++ # This file is free software; the Free Software Foundation +++ # gives unlimited permission to copy and/or distribute it, +++ # with or without modifications, as long as this notice is preserved. ++ +++ # _AM_SUBST_NOTMAKE(VARIABLE) +++ # --------------------------- +++ # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +++ # This macro is traced by Automake. +++ AC_DEFUN([_AM_SUBST_NOTMAKE]) ++ +++ # 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/doc/Makefile.in gnome-system-tools-2.22.2.new/doc/Makefile.in +--- gnome-system-tools-2.22.2/doc/Makefile.in 2009-03-17 15:27:43.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/doc/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -34,8 +34,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/doc/network/Makefile.in gnome-system-tools-2.22.2.new/doc/network/Makefile.in +--- gnome-system-tools-2.22.2/doc/network/Makefile.in 2009-03-17 15:27:43.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/doc/network/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -59,8 +59,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/doc/services/Makefile.in gnome-system-tools-2.22.2.new/doc/services/Makefile.in +--- gnome-system-tools-2.22.2/doc/services/Makefile.in 2009-03-17 15:27:44.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/doc/services/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -59,8 +59,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/doc/services/nl/Makefile.in gnome-system-tools-2.22.2.new/doc/services/nl/Makefile.in +--- gnome-system-tools-2.22.2/doc/services/nl/Makefile.in 2009-03-17 15:27:44.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/doc/services/nl/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -97,8 +97,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/doc/shares/Makefile.in gnome-system-tools-2.22.2.new/doc/shares/Makefile.in +--- gnome-system-tools-2.22.2/doc/shares/Makefile.in 2009-03-17 15:27:44.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/doc/shares/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -59,8 +59,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/doc/time/Makefile.in gnome-system-tools-2.22.2.new/doc/time/Makefile.in +--- gnome-system-tools-2.22.2/doc/time/Makefile.in 2009-03-17 15:27:44.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/doc/time/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -59,8 +59,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/doc/time/nl/Makefile.in gnome-system-tools-2.22.2.new/doc/time/nl/Makefile.in +--- gnome-system-tools-2.22.2/doc/time/nl/Makefile.in 2009-03-17 15:27:44.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/doc/time/nl/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -97,8 +97,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/doc/users/Makefile.in gnome-system-tools-2.22.2.new/doc/users/Makefile.in +--- gnome-system-tools-2.22.2/doc/users/Makefile.in 2009-03-17 15:27:44.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/doc/users/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -59,8 +59,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/16x16/apps/Makefile.in gnome-system-tools-2.22.2.new/icons/16x16/apps/Makefile.in +--- gnome-system-tools-2.22.2/icons/16x16/apps/Makefile.in 2009-03-17 15:27:44.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/16x16/apps/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,7 @@ + subdir = icons/16x16/apps + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/16x16/Makefile.in gnome-system-tools-2.22.2.new/icons/16x16/Makefile.in +--- gnome-system-tools-2.22.2/icons/16x16/Makefile.in 2009-03-17 15:27:44.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/16x16/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -34,8 +34,7 @@ + subdir = icons/16x16 + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/22x22/apps/Makefile.in gnome-system-tools-2.22.2.new/icons/22x22/apps/Makefile.in +--- gnome-system-tools-2.22.2/icons/22x22/apps/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/22x22/apps/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,7 @@ + subdir = icons/22x22/apps + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/22x22/Makefile.in gnome-system-tools-2.22.2.new/icons/22x22/Makefile.in +--- gnome-system-tools-2.22.2/icons/22x22/Makefile.in 2009-03-17 15:27:44.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/22x22/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -34,8 +34,7 @@ + subdir = icons/22x22 + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/24x24/apps/Makefile.in gnome-system-tools-2.22.2.new/icons/24x24/apps/Makefile.in +--- gnome-system-tools-2.22.2/icons/24x24/apps/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/24x24/apps/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,7 @@ + subdir = icons/24x24/apps + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/24x24/Makefile.in gnome-system-tools-2.22.2.new/icons/24x24/Makefile.in +--- gnome-system-tools-2.22.2/icons/24x24/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/24x24/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -34,8 +34,7 @@ + subdir = icons/24x24 + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/32x32/apps/Makefile.in gnome-system-tools-2.22.2.new/icons/32x32/apps/Makefile.in +--- gnome-system-tools-2.22.2/icons/32x32/apps/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/32x32/apps/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,7 @@ + subdir = icons/32x32/apps + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/32x32/Makefile.in gnome-system-tools-2.22.2.new/icons/32x32/Makefile.in +--- gnome-system-tools-2.22.2/icons/32x32/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/32x32/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -34,8 +34,7 @@ + subdir = icons/32x32 + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/48x48/apps/Makefile.in gnome-system-tools-2.22.2.new/icons/48x48/apps/Makefile.in +--- gnome-system-tools-2.22.2/icons/48x48/apps/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/48x48/apps/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,7 @@ + subdir = icons/48x48/apps + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/48x48/devices/Makefile.in gnome-system-tools-2.22.2.new/icons/48x48/devices/Makefile.in +--- gnome-system-tools-2.22.2/icons/48x48/devices/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/48x48/devices/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,7 @@ + subdir = icons/48x48/devices + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/48x48/Makefile.in gnome-system-tools-2.22.2.new/icons/48x48/Makefile.in +--- gnome-system-tools-2.22.2/icons/48x48/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/48x48/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -34,8 +34,7 @@ + subdir = icons/48x48 + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/Makefile.in gnome-system-tools-2.22.2.new/icons/Makefile.in +--- gnome-system-tools-2.22.2/icons/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -34,8 +34,7 @@ + subdir = icons + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/scalable/apps/Makefile.in gnome-system-tools-2.22.2.new/icons/scalable/apps/Makefile.in +--- gnome-system-tools-2.22.2/icons/scalable/apps/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/scalable/apps/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,7 @@ + subdir = icons/scalable/apps + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/icons/scalable/Makefile.in gnome-system-tools-2.22.2.new/icons/scalable/Makefile.in +--- gnome-system-tools-2.22.2/icons/scalable/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/icons/scalable/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -34,8 +34,7 @@ + subdir = icons/scalable + 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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/interfaces/Makefile.in gnome-system-tools-2.22.2.new/interfaces/Makefile.in +--- gnome-system-tools-2.22.2/interfaces/Makefile.in 2009-03-17 15:27:45.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/interfaces/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/Makefile.in gnome-system-tools-2.22.2.new/Makefile.in +--- gnome-system-tools-2.22.2/Makefile.in 2009-03-17 15:27:47.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -39,8 +39,7 @@ + AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \ + config.sub depcomp install-sh ltmain.sh missing mkinstalldirs + 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 \ +diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/pixmaps/Makefile.in gnome-system-tools-2.22.2.new/pixmaps/Makefile.in +--- gnome-system-tools-2.22.2/pixmaps/Makefile.in 2009-03-17 15:27:46.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/pixmaps/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/src/common/Makefile.in gnome-system-tools-2.22.2.new/src/common/Makefile.in +--- gnome-system-tools-2.22.2/src/common/Makefile.in 2009-03-17 15:27:46.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/src/common/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -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,18 +49,18 @@ + ARFLAGS = cru + libsetuptool_a_AR = $(AR) $(ARFLAGS) + libsetuptool_a_LIBADD = +-am__libsetuptool_a_SOURCES_DIST = gst-dialog.c gst-dialog.h gst-tool.c \ +- gst-tool.h gst-platform-dialog.c gst-platform-dialog.h \ +- gst-conf.c gst-conf.h gst-filter.c gst-filter.h \ +- gst-service-role.c gst-service-role.h gst.h \ +- gst-polkit-action.c gst-polkit-action.h gst-polkit-button.c \ +- gst-polkit-button.h ++am__libsetuptool_a_SOURCES_DIST = gst-package.c gst-package.h \ ++ gst-dialog.c gst-dialog.h gst-tool.c gst-tool.h \ ++ gst-platform-dialog.c gst-platform-dialog.h gst-conf.c \ ++ gst-conf.h gst-filter.c gst-filter.h gst-service-role.c \ ++ gst-service-role.h gst.h gst-polkit-action.c \ ++ gst-polkit-action.h gst-polkit-button.c gst-polkit-button.h + @HAVE_POLKIT_TRUE@am__objects_1 = gst-polkit-action.$(OBJEXT) \ + @HAVE_POLKIT_TRUE@ gst-polkit-button.$(OBJEXT) +-am_libsetuptool_a_OBJECTS = gst-dialog.$(OBJEXT) gst-tool.$(OBJEXT) \ +- gst-platform-dialog.$(OBJEXT) gst-conf.$(OBJEXT) \ +- gst-filter.$(OBJEXT) gst-service-role.$(OBJEXT) \ +- $(am__objects_1) ++am_libsetuptool_a_OBJECTS = gst-package.$(OBJEXT) gst-dialog.$(OBJEXT) \ ++ gst-tool.$(OBJEXT) gst-platform-dialog.$(OBJEXT) \ ++ gst-conf.$(OBJEXT) gst-filter.$(OBJEXT) \ ++ gst-service-role.$(OBJEXT) $(am__objects_1) + libsetuptool_a_OBJECTS = $(am_libsetuptool_a_OBJECTS) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -272,10 +271,11 @@ + -DPREFIX=\""$(prefix)"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + +-libsetuptool_a_SOURCES = gst-dialog.c gst-dialog.h gst-tool.c \ +- gst-tool.h gst-platform-dialog.c gst-platform-dialog.h \ +- gst-conf.c gst-conf.h gst-filter.c gst-filter.h \ +- gst-service-role.c gst-service-role.h gst.h $(am__append_1) ++libsetuptool_a_SOURCES = gst-package.c gst-package.h gst-dialog.c \ ++ gst-dialog.h gst-tool.c gst-tool.h gst-platform-dialog.c \ ++ gst-platform-dialog.h gst-conf.c gst-conf.h gst-filter.c \ ++ gst-filter.h gst-service-role.c gst-service-role.h gst.h \ ++ $(am__append_1) + EXTRA_DIST = CommonMakefile $(headers) + all: all-am + +@@ -327,6 +327,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-polkit-action.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-polkit-button.Po@am__quote@ +diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/src/Makefile.in gnome-system-tools-2.22.2.new/src/Makefile.in +--- gnome-system-tools-2.22.2/src/Makefile.in 2009-03-17 15:27:46.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/src/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -34,8 +34,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/src/network/Makefile.in gnome-system-tools-2.22.2.new/src/network/Makefile.in +--- gnome-system-tools-2.22.2/src/network/Makefile.in 2009-03-17 15:27:46.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/src/network/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -39,8 +39,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/src/services/Makefile.in gnome-system-tools-2.22.2.new/src/services/Makefile.in +--- gnome-system-tools-2.22.2/src/services/Makefile.in 2009-03-17 15:27:46.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/src/services/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -39,8 +39,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/src/shares/Makefile.in gnome-system-tools-2.22.2.new/src/shares/Makefile.in +--- gnome-system-tools-2.22.2/src/shares/Makefile.in 2009-03-17 15:27:46.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/src/shares/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -38,8 +38,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/src/shares/nautilus/Makefile.in gnome-system-tools-2.22.2.new/src/shares/nautilus/Makefile.in +--- gnome-system-tools-2.22.2/src/shares/nautilus/Makefile.in 2009-03-17 15:27:46.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/src/shares/nautilus/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/src/time/e-map/Makefile.in gnome-system-tools-2.22.2.new/src/time/e-map/Makefile.in +--- gnome-system-tools-2.22.2/src/time/e-map/Makefile.in 2009-03-17 15:27:47.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/src/time/e-map/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -35,8 +35,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/src/time/Makefile.in gnome-system-tools-2.22.2.new/src/time/Makefile.in +--- gnome-system-tools-2.22.2/src/time/Makefile.in 2009-03-17 15:27:46.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/src/time/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -38,8 +38,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 -Nur -x '*.orig' -x '*~' gnome-system-tools-2.22.2/src/users/Makefile.in gnome-system-tools-2.22.2.new/src/users/Makefile.in +--- gnome-system-tools-2.22.2/src/users/Makefile.in 2009-03-17 15:27:47.000000000 +0000 ++++ gnome-system-tools-2.22.2.new/src/users/Makefile.in 2009-03-17 16:19:55.000000000 +0000 +@@ -39,8 +39,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.22.2.orig/debian/patches/81_gst-packages-shares-admin.patch +++ gnome-system-tools-2.22.2/debian/patches/81_gst-packages-shares-admin.patch @@ -0,0 +1,81 @@ +Index: ubuntu/src/shares/shares-tool.c +=================================================================== +--- ubuntu.orig/src/shares/shares-tool.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/shares/shares-tool.c 2008-06-24 17:06:50.000000000 +0100 +@@ -141,9 +141,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; +@@ -156,10 +183,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); ++ ++ /* 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)); + +- return FALSE; ++ retval = TRUE; ++ } ++ } ++ ++ gtk_widget_destroy (dialog); ++ return retval; + } + + static void --- gnome-system-tools-2.22.2.orig/debian/patches/83_network-locations-apply-button.patch +++ gnome-system-tools-2.22.2/debian/patches/83_network-locations-apply-button.patch @@ -0,0 +1,204 @@ +Index: ubuntu/interfaces/network.ui +=================================================================== +--- ubuntu.orig/interfaces/network.ui 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/interfaces/network.ui 2008-06-24 17:06:50.000000000 +0100 +@@ -193,6 +193,31 @@ + 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 +Index: ubuntu/src/network/locations-combo.c +=================================================================== +--- ubuntu.orig/src/network/locations-combo.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/network/locations-combo.c 2008-06-24 17:06:50.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)); + } +@@ -137,6 +146,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); + } +@@ -166,6 +178,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; + } + } + +@@ -194,6 +209,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; + } + } + +@@ -215,11 +233,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); + } + } + +@@ -430,6 +446,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) + { +@@ -480,6 +512,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; + } +@@ -501,12 +538,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); + } +Index: ubuntu/src/network/locations-combo.h +=================================================================== +--- ubuntu.orig/src/network/locations-combo.h 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/network/locations-combo.h 2008-06-24 17:06:50.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 +Index: ubuntu/src/network/network-tool.c +=================================================================== +--- ubuntu.orig/src/network/network-tool.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/network/network-tool.c 2008-06-24 17:06:50.000000000 +0100 +@@ -109,7 +109,7 @@ + { + GObject *object; + GstNetworkTool *tool; +- 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, +@@ -147,7 +147,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); + + tool->dialog = connection_dialog_init (GST_TOOL (tool)); + tool->host_aliases_dialog = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "host_aliases_edit_dialog"); --- gnome-system-tools-2.22.2.orig/debian/patches/80_gst-packages-common.patch +++ gnome-system-tools-2.22.2/debian/patches/80_gst-packages-common.patch @@ -0,0 +1,279 @@ +Index: ubuntu/src/common/Makefile.am +=================================================================== +--- ubuntu.orig/src/common/Makefile.am 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/common/Makefile.am 2008-06-24 17:06:50.000000000 +0100 +@@ -9,6 +9,7 @@ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + + libsetuptool_a_SOURCES = \ ++ gst-package.c gst-package.h \ + gst-dialog.c gst-dialog.h \ + gst-tool.c gst-tool.h \ + gst-platform-dialog.c gst-platform-dialog.h \ +Index: ubuntu/src/common/gst-package.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ubuntu/src/common/gst-package.c 2008-06-24 17:06:50.000000000 +0100 +@@ -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; ++} +Index: ubuntu/src/common/gst-package.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ubuntu/src/common/gst-package.h 2008-06-24 17:06:50.000000000 +0100 +@@ -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__ */ +Index: ubuntu/src/common/gst.h +=================================================================== +--- ubuntu.orig/src/common/gst.h 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/common/gst.h 2008-06-24 17:06:50.000000000 +0100 +@@ -1,5 +1,6 @@ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + #include ++#include "gst-package.h" + #include "gst-tool.h" + #include "gst-dialog.h" + #include "gst-conf.h" --- gnome-system-tools-2.22.2.orig/debian/patches/92_postgresql_versions.patch +++ gnome-system-tools-2.22.2/debian/patches/92_postgresql_versions.patch @@ -0,0 +1,18 @@ +# Description: Add PostgreSQL 8.3, and also some future ones. +# Ubuntu: https://launchpad.net/bugs/214496 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=560182 +Index: gnome-system-tools-2.22.1/src/common/gst-service-role.c +=================================================================== +--- gnome-system-tools-2.22.1.orig/src/common/gst-service-role.c 2008-11-10 17:42:15.000000000 +0100 ++++ gnome-system-tools-2.22.1/src/common/gst-service-role.c 2008-11-10 17:42:28.000000000 +0100 +@@ -147,6 +147,10 @@ + { "postgresql-8.0", GST_ROLE_DATABASE_SERVER }, + { "postgresql-8.1", GST_ROLE_DATABASE_SERVER }, + { "postgresql-8.2", GST_ROLE_DATABASE_SERVER }, ++ { "postgresql-8.3", GST_ROLE_DATABASE_SERVER }, ++ { "postgresql-8.4", GST_ROLE_DATABASE_SERVER }, ++ { "postgresql-8.5", GST_ROLE_DATABASE_SERVER }, ++ { "postgresql-9.0", GST_ROLE_DATABASE_SERVER }, + { "powernowd", GST_ROLE_CPUFREQ_MANAGEMENT }, + { "pptpd", GST_ROLE_VPN_SERVER }, + { "proftpd", GST_ROLE_FILE_SERVER_FTP }, --- gnome-system-tools-2.22.2.orig/debian/patches/26_users_home_dir.patch +++ gnome-system-tools-2.22.2/debian/patches/26_users_home_dir.patch @@ -0,0 +1,26 @@ +Index: ubuntu/src/users/user-settings.c +=================================================================== +--- ubuntu.orig/src/users/user-settings.c 2008-06-24 17:04:49.000000000 +0100 ++++ ubuntu/src/users/user-settings.c 2008-06-24 17:04:49.000000000 +0100 +@@ -347,9 +347,6 @@ + widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_shell"); + set_entry_text (GTK_BIN (widget)->child, oobs_user_get_shell (user)); + +- widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_home"); +- set_entry_text (widget, oobs_user_get_home_directory (user)); +- + 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); +@@ -394,6 +391,11 @@ + if (!login) + table_set_default_profile (GST_USERS_TOOL (tool)); + ++ if (user) { ++ widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_home"); ++ set_entry_text (widget, oobs_user_get_home_directory (user)); ++ } ++ + return dialog; + } + --- gnome-system-tools-2.22.2.orig/debian/patches/51_users_fit_575_height.patch +++ gnome-system-tools-2.22.2/debian/patches/51_users_fit_575_height.patch @@ -0,0 +1,467 @@ +# +# Ubuntu: https://bugs.launchpad.net/bugs/320146 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568738 +# Patch: http://bugzilla.gnome.org/attachment.cgi?id=127020&action=view +# Description: Move contact info into its own tab to fit 575 vertical pixels +# +Index: gnome-system-tools-2.22.1/interfaces/users.ui +=================================================================== +--- gnome-system-tools-2.22.1.orig/interfaces/users.ui 2009-01-22 13:31:50.000000000 -0500 ++++ gnome-system-tools-2.22.1/interfaces/users.ui 2009-01-22 13:31:50.000000000 -0500 +@@ -1058,212 +1058,6 @@ + + + +- +- True +- 4 +- 3 +- False +- 6 +- 12 +- +- +- True +- <span weight="bold">Contact Information</span> +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- 3 +- 0 +- 1 +- fill +- +- +- +- +- +- True +- O_ffice location: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- user_settings_room_number +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 1 +- 2 +- 1 +- 2 +- fill +- +- +- +- +- +- True +- _Work phone: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- user_settings_wphone +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 1 +- 2 +- 2 +- 3 +- fill +- +- +- +- +- +- True +- _Home phone: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- user_settings_hphone +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 1 +- 2 +- 3 +- 4 +- fill +- +- +- +- +- +- True +- True +- True +- True +- 0 +- True +- True +- +- +- 2 +- 3 +- 1 +- 2 +- +- +- +- +- +- True +- True +- True +- True +- 0 +- True +- True +- +- +- 2 +- 3 +- 2 +- 3 +- +- +- +- +- +- True +- True +- True +- True +- 0 +- True +- True +- +- +- 2 +- 3 +- 3 +- 4 +- +- +- +- +- +- True +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- 1 +- 1 +- 4 +- fill +- +- +- +- +- +- 0 +- False +- False +- +- +- + + True + 7 +@@ -1671,6 +1465,243 @@ + + + ++ ++ 12 ++ True ++ False ++ 18 ++ ++ ++ True ++ 4 ++ 3 ++ False ++ 6 ++ 12 ++ ++ ++ True ++ <span weight="bold">Contact Information</span> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 3 ++ 0 ++ 1 ++ fill ++ ++ ++ ++ ++ ++ True ++ O_ffice location: ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ user_settings_room_number ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ fill ++ ++ ++ ++ ++ ++ True ++ _Work phone: ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ user_settings_wphone ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ fill ++ ++ ++ ++ ++ ++ True ++ _Home phone: ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ user_settings_hphone ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 3 ++ 4 ++ fill ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ True ++ True ++ ++ ++ 2 ++ 3 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ True ++ True ++ ++ ++ 2 ++ 3 ++ 2 ++ 3 ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ True ++ True ++ ++ ++ 2 ++ 3 ++ 3 ++ 4 ++ ++ ++ ++ ++ ++ True ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 1 ++ 4 ++ fill ++ ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ Contact ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ + + 12 + True --- gnome-system-tools-2.22.2.orig/debian/patches/series +++ gnome-system-tools-2.22.2/debian/patches/series @@ -0,0 +1,18 @@ +10_add_missing_services.patch +11_shares_admin_not_listed_under_gnome.patch +18_disable_uid.patch +23_users_update_model.patch +25_sambashare_group_definition.patch +26_users_home_dir.patch +40_more-groups.patch +50_min-max-gid.patch +51_users_fit_575_height.patch +80_gst-packages-common.patch +81_gst-packages-shares-admin.patch +82_gst-packages-time-admin.patch +83_network-locations-apply-button.patch +84_translate_extra_strings.patch +85_users_fix_add_group.patch +91_time_admin_adjustment.patch +92_postgresql_versions.patch +98_automake.patch --- gnome-system-tools-2.22.2.orig/debian/patches/85_users_fix_add_group.patch +++ gnome-system-tools-2.22.2/debian/patches/85_users_fix_add_group.patch @@ -0,0 +1,49 @@ +Index: ubuntu/src/users/callbacks.c +=================================================================== +--- ubuntu.orig/src/users/callbacks.c 2008-06-24 17:04:49.000000000 +0100 ++++ ubuntu/src/users/callbacks.c 2008-06-24 17:06:51.000000000 +0100 +@@ -414,7 +414,7 @@ + response = group_settings_dialog_run (dialog, group); + + if (response == GTK_RESPONSE_OK) { +- group_settings_dialog_get_data (group); ++ group = group_settings_dialog_get_group (); + + config = OOBS_GROUPS_CONFIG (GST_USERS_TOOL (tool)->groups_config); + groups_list = oobs_groups_config_get_groups (config); +Index: ubuntu/src/users/group-settings.c +=================================================================== +--- ubuntu.orig/src/users/group-settings.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/group-settings.c 2008-06-24 17:06:51.000000000 +0100 +@@ -341,3 +341,19 @@ + + group_members_table_save (group); + } ++ ++OobsGroup* ++group_settings_dialog_get_group (void) ++{ ++ GtkWidget *widget; ++ OobsGroup *group; ++ ++ widget = gst_dialog_get_widget (tool->main_dialog, "group_settings_name"); ++ group = oobs_group_new(gtk_entry_get_text (GTK_ENTRY (widget))); ++ widget = gst_dialog_get_widget (tool->main_dialog, "group_settings_gid"); ++ oobs_group_set_gid (group, gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget))); ++ ++ group_members_table_save (group); ++ ++ return group; ++} +Index: ubuntu/src/users/group-settings.h +=================================================================== +--- ubuntu.orig/src/users/group-settings.h 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/group-settings.h 2008-06-24 17:06:51.000000000 +0100 +@@ -37,6 +37,7 @@ + + gid_t group_settings_find_new_gid (void); + void group_settings_dialog_get_data (OobsGroup *group); ++OobsGroup* group_settings_dialog_get_group (void); + + + #endif /* __GROUP_SETTINGS_H */ --- gnome-system-tools-2.22.2.orig/debian/patches/11_shares_admin_not_listed_under_gnome.patch +++ gnome-system-tools-2.22.2/debian/patches/11_shares_admin_not_listed_under_gnome.patch @@ -0,0 +1,12 @@ +Index: ubuntu/src/shares/shares.desktop.in.in +=================================================================== +--- ubuntu.orig/src/shares/shares.desktop.in.in 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/shares/shares.desktop.in.in 2008-06-24 17:04:49.000000000 +0100 +@@ -6,6 +6,7 @@ + Terminal=false + Type=Application + Categories=GNOME;GTK;System;Settings;X-GNOME-NetworkSettings; ++NotShowIn=GNOME; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-system-tools + X-GNOME-Bugzilla-Component=shares-admin --- gnome-system-tools-2.22.2.orig/debian/patches/18_disable_uid.patch +++ gnome-system-tools-2.22.2/debian/patches/18_disable_uid.patch @@ -0,0 +1,20 @@ +Index: ubuntu/src/users/user-settings.c +=================================================================== +--- ubuntu.orig/src/users/user-settings.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/user-settings.c 2008-06-24 17:07:25.000000000 +0100 +@@ -332,6 +332,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_full (G_OBJECT (dialog), "user", +@@ -351,6 +352,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.22.2.orig/debian/patches/91_time_admin_adjustment.patch +++ gnome-system-tools-2.22.2/debian/patches/91_time_admin_adjustment.patch @@ -0,0 +1,31 @@ +Index: gnome-system-tools-2.22.0/interfaces/time.ui +=================================================================== +--- gnome-system-tools-2.22.0.orig/interfaces/time.ui 2008-09-11 00:17:56.000000000 +0100 ++++ gnome-system-tools-2.22.0/interfaces/time.ui 2008-09-11 00:18:03.000000000 +0100 +@@ -6,7 +6,7 @@ + 0 + 10 + 0 +- 10 ++ 0 + 1 + + +@@ -14,7 +14,7 @@ + 0 + 10 + 0 +- 10 ++ 0 + 1 + + +@@ -22,7 +22,7 @@ + 0 + 10 + 0 +- 10 ++ 0 + 1 + + --- gnome-system-tools-2.22.2.orig/debian/patches/50_min-max-gid.patch +++ gnome-system-tools-2.22.2/debian/patches/50_min-max-gid.patch @@ -0,0 +1,16 @@ +fixes Minimum versus Maximum GID in users-admin; thanks Kenrick Bingham and +Goswin von Brederlow; GNOME #526590; closes: #305842. + +Index: ubuntu/interfaces/users.ui +=================================================================== +--- ubuntu.orig/interfaces/users.ui 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/interfaces/users.ui 2008-06-24 17:06:50.000000000 +0100 +@@ -3114,7 +3114,7 @@ + + + True +- Minimum GID: ++ Maximum GID: + False + False + GTK_JUSTIFY_LEFT --- gnome-system-tools-2.22.2.orig/debian/patches/82_gst-packages-time-admin.patch +++ gnome-system-tools-2.22.2/debian/patches/82_gst-packages-time-admin.patch @@ -0,0 +1,37 @@ +Index: ubuntu/src/time/time-tool.c +=================================================================== +--- ubuntu.orig/src/time/time-tool.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/time/time-tool.c 2008-06-24 17:06:50.000000000 +0100 +@@ -374,6 +374,7 @@ + { + GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool); + GtkWidget *message, *widget; ++ gint response; + + if (GST_TIME_TOOL (tool)->ntp_service) + return TRUE; +@@ -392,9 +393,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; + } +