[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, experimental, updated. debian/1.7.0-1-5-g2c9b520
Iain Lane
laney at debian.org
Tue Jul 5 22:50:32 UTC 2011
The following commit has been merged in the experimental branch:
commit dbee52f1894be94566b0a8d66c55b86c24c3ad3b
Author: Iain Lane <laney at debian.org>
Date: Tue Jul 5 22:46:04 2011 +0100
Imported Upstream version 1.7.1
diff --git a/ChangeLog b/ChangeLog
index 2c1e67a..860c8b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,291 @@
# Generated by Makefile. Do not edit.
+commit e0afa6ff9f5bd625abb86e16faef6fd28319166f
+Author: Fran Dieguez <fran at openhost.es>
+Date: Mon Jul 4 21:47:07 2011 +0200
+
+ Updated Galician translations
+
+ po/gl.po | 171 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 94 insertions(+), 77 deletions(-)
+
+commit f7cd01c02cdb5b7d9137113d8bb1d88a4782a6f9
+Author: Yaron Shahrabani <sh.yaron at gmail.com>
+Date: Sat Jul 2 11:10:16 2011 +0300
+
+ Updated Hebrew translation.
+
+ po/he.po | 436 +++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 274 insertions(+), 162 deletions(-)
+
+commit d1dc142830f58f77706264b03fef4c822421d362
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date: Sun Jun 26 20:36:07 2011 +0200
+
+ Updated Slovenian translation
+
+ po/sl.po | 168 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 92 insertions(+), 76 deletions(-)
+
+commit e632f8d189ca5b8b7186666e4fd806633faf59c0
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: Sun Jun 26 13:05:03 2011 +0200
+
+ Updated Spanish translation
+
+ po/es.po | 112 +++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 64 insertions(+), 48 deletions(-)
+
+commit 32bc77abf14c4163f89a00174adcc560f123eec3
+Author: Jared Jennings <jjennings at src.gnome.org>
+Date: Sun Jun 26 01:25:13 2011 -0400
+
+ bgo #531085 Addresses improper handling of links.
+ Patches submitted by Sandy Armstrong and Aaron Borden
+
+ Tomboy/Watchers.cs | 40 +++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 39 insertions(+), 1 deletions(-)
+
+commit 8026313c705edf69f50cd53a86ca20a3d4cad61a
+Author: Jared Jennings <jjennings at src.gnome.org>
+Date: Sun Jun 26 00:41:59 2011 -0400
+
+ bgo #653280 Updated copyright for --version --usage --help
+
+ Tomboy/Tomboy.cs | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 80e24a006aa0b49770b52d077f5b3afe85996517
+Author: Abhinav Upadhyay <er.abhinav.upadhyay at gmail.com>
+Date: Sat Jun 25 17:31:59 2011 -0700
+
+ Add UI for no search results in notebook
+
+ In the Search All Notes window, when searching a notebook and no results
+ appear, display a link button with information and the option to search
+ all notebooks instead.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=588730
+
+ Signed-off-by: Aaron Borden <adborden at live.com>
+
+ Tomboy/RecentChanges.cs | 77 ++++++++++++++++++++++++++++++++++++++++++----
+ 1 files changed, 70 insertions(+), 7 deletions(-)
+
+commit c9b2876607185380a39b2d93d367152184b3857b
+Author: Lukas Vacek <lucas.vacek at gmail.com>
+Date: Fri Jan 14 01:20:35 2011 +0100
+
+ Correct exception handling when trying to load files without read permissions
+
+ Signed-off-by: Aaron Borden <adborden at live.com>
+
+ Tomboy/NoteManager.cs | 15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+commit 5770662522219349b6c38ac8f1774d474c9e72bf
+Author: Lukas Vacek <lucas.vacek at gmail.com>
+Date: Fri Jan 14 01:15:14 2011 +0100
+
+ Correct exception handling when loading corrupted note files
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=639500
+
+ Signed-off-by: Aaron Borden <adborden at live.com>
+
+ Tomboy/NoteManager.cs | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit da3b1caacd0dfa45b6390bbd4eab4204f3ccb22e
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: Sat Jun 25 19:25:12 2011 +0200
+
+ Updated Spanish translation
+
+ po/es.po | 92 ++++++++++++++++++++++++-------------------------------------
+ 1 files changed, 36 insertions(+), 56 deletions(-)
+
+commit a68e36da14ddd1d26040d2899f153e746e096219
+Author: Max Lin <mlin at novell.com>
+Date: Tue Mar 1 17:44:23 2011 +0800
+
+ Fix incorrect opening the Url twice
+
+ Signed-off-by: Aaron Borden <adborden at live.com>
+
+ Tomboy/PreferencesDialog.cs | 8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+commit 1f4fc99da48ef5a573ec1b0d725c9a8948ea49e4
+Author: Robert Nordan <rpvn at robpvn.net>
+Date: Sat Jun 25 13:36:19 2011 +0200
+
+ Fix for #627872, makes attempting to rename special notebooks impossible
+
+ Signed-off-by: Jared Jennings <jjennings at src.gnome.org>
+
+ Tomboy/RecentChanges.cs | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 85c61449925f1adcf12f684b5b7ccf1ed307d2f6
+Author: Robert Nordan <rpvn at robpvn.net>
+Date: Sat Jun 25 17:10:57 2011 +0200
+
+ Fix for #651286, removes trailing slash from server URL.
+
+ Tomboy/Addins/WebSyncService/WebSyncServer.cs | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 61e1883dc97435712a7c8f10ffc3d7ee74e30c74
+Author: Matt Rajca <matt.rajca at me.com>
+Date: Sat Nov 13 10:31:03 2010 -0600
+
+ Fixed missing ending period in UI string (630577)
+
+ Signed-off-by: Jared Jennings <jjennings at src.gnome.org>
+
+ Tomboy/PreferencesDialog.cs | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e25f42a594428f7a5b46f9df593617886db4628c
+Author: Robert Nordan <rpvn at robpvn.net>
+Date: Sat Jun 25 10:04:43 2011 +0200
+
+ Fix for #652783, resolves relative paths between exported notes.
+
+ Signed-off-by: Jared Jennings <jjennings at src.gnome.org>
+
+ Tomboy/Addins/ExportToHtml/ExportToHtml.xsl | 16 +++-
+ .../ExportToHtml/ExportToHtmlApplicationAddin.cs | 106 +++++++++++++++++++-
+ Tomboy/ExportAllApplicationAddin.cs | 69 +++++++++++++
+ 3 files changed, 186 insertions(+), 5 deletions(-)
+
+commit 60a47d6a9c823df5b7a594a34ab09734e99e204f
+Author: Мирослав Николић <miroslavnikolic at rocketmail.com>
+Date: Sat Jun 25 01:15:03 2011 +0200
+
+ Updated Serbian translation
+
+ po/sr.po | 364 ++++++++++++++++++++++++++++----------------------------
+ po/sr at latin.po | 364 ++++++++++++++++++++++++++++----------------------------
+ 2 files changed, 362 insertions(+), 366 deletions(-)
+
+commit 52a89816328f6e3d485eb52bd4103ac0da854450
+Author: Jared Jennings <jjennings at src.gnome.org>
+Date: Wed Jun 22 00:10:44 2011 -0400
+
+ bgo #447245 Addressed bullet list bug when using the delete key
+
+ Tomboy/NoteBuffer.cs | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit fdfa00140cc164b23b240f5e80d43746a00f310c
+Author: Fran Diéguez <fran.dieguez at mabishu.com>
+Date: Mon Jun 20 16:42:22 2011 +0200
+
+ Updated Galician translations
+
+ po/gl.po | 399 ++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 248 insertions(+), 151 deletions(-)
+
+commit 8d2fcfcfbca4a86636bbf2c04394ab4acfaf65af
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date: Sun Jun 19 21:41:58 2011 +0200
+
+ Updated Slovenian translation
+
+ po/sl.po | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 92 insertions(+), 11 deletions(-)
+
+commit bf5492c40cc52afee9565be57ce2505af6de0dde
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: Sun Jun 19 12:16:51 2011 +0200
+
+ Updated Spanish translation
+
+ po/es.po | 455 +++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 284 insertions(+), 171 deletions(-)
+
+commit 515b26bfeed54020774262e1210f3c1364da40da
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date: Thu Jun 16 16:01:39 2011 -0700
+
+ Drop dependency on gconf-sharp-peditors
+
+ Copy in source for property editors that we actually use. Other
+ bits of that library were causing continued dependency on obsolete
+ libraries because of a gnome-sharp dependency.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=652787
+
+ Tomboy/GConf.PropertyEditors/PropertyEditor.cs | 96 ++++++++++++++++++++
+ Tomboy/GConf.PropertyEditors/PropertyEditorBool.cs | 50 ++++++++++
+ .../GConf.PropertyEditors/PropertyEditorEntry.cs | 51 +++++++++++
+ .../PropertyEditorToggleButton.cs | 49 ++++++++++
+ Tomboy/Makefile.am | 16 ++--
+ configure.in | 4 +-
+ 6 files changed, 257 insertions(+), 9 deletions(-)
+
+commit 22edbf166a58c92ae898f3472214b9f59c9308f5
+Author: Aaron Borden <adborden at live.com>
+Date: Thu Jun 16 14:44:53 2011 -0700
+
+ Updat POTFILES.in with new source files
+
+ po/POTFILES.in | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 405cc4e74824235128e2770cbcabd6ba48e1ae00
+Author: Robert Nordan <rpvn at robpvn.net>
+Date: Thu May 12 21:50:20 2011 +0200
+
+ Fix for Bug 356871 - Allows mass export of HTML, v2
+
+ Tomboy/Addins/ExportToHtml/ExportToHtml.addin.xml | 6 +-
+ .../ExportToHtml/ExportToHtmlApplicationAddin.cs | 54 +++
+ Tomboy/Addins/ExportToHtml/Makefile.am | 3 +-
+ Tomboy/ExportAllApplicationAddin.cs | 469 ++++++++++++++++++++
+ Tomboy/Makefile.am | 1 +
+ 5 files changed, 531 insertions(+), 2 deletions(-)
+
+commit dcc33640f7991909b2d71f3a72a25d0d48b5c626
+Author: Daniel Nylander <po at danielnylander.se>
+Date: Thu Jun 16 22:56:30 2011 +0200
+
+ Updated Swedish translation
+
+ po/sv.po | 561 +++++++++++++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 389 insertions(+), 172 deletions(-)
+
+commit dd21196a72e1d879c0248e2e98498f7ec93127bf
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date: Tue Jun 14 18:25:43 2011 +0200
+
+ Updated Slovenian translation
+
+ po/sl.po | 33 +++++++++++++++++++--------------
+ 1 files changed, 19 insertions(+), 14 deletions(-)
+
+commit b298262565fcd5d30a8714b65dee476cc1ab6ea4
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Jun 13 14:12:56 2011 -0700
+
+ Bump version to 1.7.1
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 6b2ac535b14209e059a44437e465d1cf40884306
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Jun 13 14:07:07 2011 -0700
+
+ Update NEWS file for Tomboy 1.7.0
+
+ NEWS | 19 ++++++++++++++++++-
+ 1 files changed, 18 insertions(+), 1 deletions(-)
+
commit 77d012da95221b0b25f92d2eae5915c8039dc2ab
Author: Aaron Borden <adborden at live.com>
Date: Mon Jun 13 12:43:08 2011 -0700
diff --git a/Makefile.in b/Makefile.in
index 1c41a81..2973fc8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,7 +264,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/NEWS b/NEWS
index b7b1cde..9a4b073 100644
--- a/NEWS
+++ b/NEWS
@@ -9,10 +9,25 @@ Please send questions and suggestions to
Please report bugs using http://bugzilla.gnome.org/
(http://bugzilla.gnome.org/enter_bug.cgi?product=Tomboy).
+Version 1.7.1
+* New addin to Export All Notes (#356871, Robert Nordan)
+* Drop dependency for gconf-sharp-peditors (#652787)
+* Fix delete key behavior in bullet lists (#447245)
+* Resolve relative paths when exporting notes (#652783, Robert Nordan)
+* Fix string in Preferences UI (#630577, Matt Rajca)
+* Handle ending slashes in sync URLs (#651286, Robert Nordan)
+* Don't allow rename of special notebooks (#627872, Robert Nordan)
+* Don't open URL twice in Addin preferences (#643564, Max Lin)
+* Handle invalid files when loading notes (#639500, Lukas Vacek)
+* Add UI for no search results in notebook (#588730, Abhinav Upadhyay)
+* Update copyright to 2011 (#653280)
+* Handle matching brackets in links (#531085)
+* Translation Updates: es, gl, he, sl, sr, sv
+
Version 1.7.0
* Search does not give preference to note title (#637239, Robert Nordan)
-* Cleanup strings in sync dialog dialogs (#473519)
-* Context-menu key now opens next to selected notes (#606007)
+* Fix strings in sync dialogs (#473519)
+* Fix context-menu key now opens next to selected notes (#606007)
* Fix string references to *Search All Notes* window (#631000)
* Disable Delete action when note list not in focus (#647462, Abhinav Upadhyay)
* Allow the user to open multiple notes via keypress or menu (#587499)
diff --git a/Tomboy/Addins/Backlinks/Makefile.in b/Tomboy/Addins/Backlinks/Makefile.in
index 8e187c8..58ba5ca 100644
--- a/Tomboy/Addins/Backlinks/Makefile.in
+++ b/Tomboy/Addins/Backlinks/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Bugzilla/Makefile.in b/Tomboy/Addins/Bugzilla/Makefile.in
index 7f9d597..7a7e082 100644
--- a/Tomboy/Addins/Bugzilla/Makefile.in
+++ b/Tomboy/Addins/Bugzilla/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Evolution/Makefile.in b/Tomboy/Addins/Evolution/Makefile.in
index 861993a..3b9c46f 100644
--- a/Tomboy/Addins/Evolution/Makefile.in
+++ b/Tomboy/Addins/Evolution/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/ExportToHtml/ExportToHtml.addin.xml b/Tomboy/Addins/ExportToHtml/ExportToHtml.addin.xml
index 4d28cd1..00776cf 100644
--- a/Tomboy/Addins/ExportToHtml/ExportToHtml.addin.xml
+++ b/Tomboy/Addins/ExportToHtml/ExportToHtml.addin.xml
@@ -5,7 +5,7 @@
description="Exports individual notes to HTML."
category="Tools"
defaultEnabled="true"
- version="0.1">
+ version="0.2">
<Runtime>
<Import assembly="ExportToHtml.dll" />
@@ -15,6 +15,10 @@
<Addin id="Tomboy" version="0.10" />
</Dependencies>
+ <Extension path="/Tomboy/ApplicationAddins">
+ <ApplicationAddin type="Tomboy.ExportToHtml.ExportToHtmlApplicationAddin" />
+ </Extension>
+
<Extension path="/Tomboy/NoteAddins">
<NoteAddin type="Tomboy.ExportToHtml.ExportToHtmlNoteAddin" />
</Extension>
diff --git a/Tomboy/Addins/ExportToHtml/ExportToHtml.xsl b/Tomboy/Addins/ExportToHtml/ExportToHtml.xsl
index eeabc22..8d1dea5 100644
--- a/Tomboy/Addins/ExportToHtml/ExportToHtml.xsl
+++ b/Tomboy/Addins/ExportToHtml/ExportToHtml.xsl
@@ -12,6 +12,7 @@
<xsl:param name="export-linked" />
<xsl:param name="export-linked-all" />
<xsl:param name="root-note" />
+<xsl:param name="exporting-multiple" />
<xsl:param name="newline" select="'
'" />
@@ -133,9 +134,18 @@
</xsl:template>
<xsl:template match="link:internal">
- <a style="color:#204A87" href="#{tomboy:ToLower(node())}">
- <xsl:value-of select="node()"/>
- </a>
+ <xsl:choose>
+ <xsl:when test="$exporting-multiple">
+ <a style="color:#204A87" href="{tomboy:GetRelativePath(node())}">
+ <xsl:value-of select="node()"/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a style="color:#204A87" href="#{tomboy:ToLower(node())}">
+ <xsl:value-of select="node()"/>
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<xsl:template match="link:url">
diff --git a/Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs b/Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs
new file mode 100644
index 0000000..7432361
--- /dev/null
+++ b/Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs
@@ -0,0 +1,156 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using System.Xml.XPath;
+using System.Xml.Xsl;
+using Tomboy;
+using Mono.Unix;
+
+namespace Tomboy.ExportToHtml
+{
+ /// <summary>
+ /// Extends the ExportAll add-in to export to HTML.
+ /// </summary>
+ public class ExportToHtmlApplicationAddin : ExportAllApplicationAddin
+ {
+
+ const string stylesheet_name = "ExportToHtml.xsl";
+ static XslTransform xsl;
+
+ Gtk.ImageMenuItem item;
+
+ static XslTransform NoteXsl
+ {
+ get {
+ if (xsl == null) {
+ Assembly asm = Assembly.GetExecutingAssembly ();
+ string asm_dir = System.IO.Path.GetDirectoryName (asm.Location);
+ string stylesheet_file = Path.Combine (asm_dir, stylesheet_name);
+
+ xsl = new XslTransform ();
+
+ if (File.Exists (stylesheet_file)) {
+ Logger.Info ("ExportToHTML: Using user-custom {0} file.",
+ stylesheet_name);
+ xsl.Load (stylesheet_file);
+ } else {
+ Stream resource = asm.GetManifestResourceStream (stylesheet_name);
+ if (resource != null) {
+ XmlTextReader reader = new XmlTextReader (resource);
+ xsl.Load (reader, null, null);
+ resource.Close ();
+ } else {
+ Logger.Error ("Unable to find HTML export template '{0}'.",
+ stylesheet_name);
+ }
+ }
+ }
+ return xsl;
+ }
+ }
+
+ /// <summary>
+ /// Sets the names of the export type.
+ /// </summary>
+ protected override void SetNames ()
+ {
+ export_file_suffix = "html";
+ export_type_pretty_name = Catalog.GetString ("HTML");
+ }
+
+ /// <summary>
+ /// Exports a single Note to HTML in a specified location.
+ /// </summary>
+ public override void ExportSingleNote (Note note,
+ string output_folder)
+ {
+ string output_path = output_folder + SanitizeNoteTitle (note.Title)
+ + "." + export_file_suffix;
+
+ Logger.Debug ("Exporting Note '{0}' to '{1}'...", note.Title, output_path);
+
+ StreamWriter writer = null;
+
+ try {
+ // FIXME: Warn about file existing. Allow overwrite.
+ File.Delete (output_path);
+ } catch {
+ }
+
+ writer = new StreamWriter (output_path);
+
+ WriteHTMLForNote (writer, note);
+
+ if (writer != null)
+ writer.Close ();
+
+ return;
+ }
+
+ public void WriteHTMLForNote (TextWriter writer,
+ Note note)
+ {
+ // NOTE: Don't use the XmlDocument version, which strips
+ // whitespace between elements for some reason. Also,
+ // XPathDocument is faster.
+ StringWriter s_writer = new StringWriter ();
+ NoteArchiver.Write (s_writer, note.Data);
+ StringReader reader = new StringReader (s_writer.ToString ());
+ s_writer.Close ();
+ XPathDocument doc = new XPathDocument (reader);
+ reader.Close ();
+
+ XsltArgumentList args = new XsltArgumentList ();
+ args.AddParam ("exporting-multiple", "", true);
+ args.AddParam ("export-linked", "", false);
+ args.AddParam ("export-linked-all", "", false);
+ args.AddParam ("root-note", "", note.Title);
+ args.AddExtensionObject ("http://beatniksoftware.com/tomboy",
+ new ExportAllTransformExtension (note, this));
+
+ if ((bool) Preferences.Get (Preferences.ENABLE_CUSTOM_FONT)) {
+ string font_face = (string) Preferences.Get (Preferences.CUSTOM_FONT_FACE);
+ Pango.FontDescription font_desc =
+ Pango.FontDescription.FromString (font_face);
+ string font = String.Format ("font-family:'{0}';", font_desc.Family);
+
+ args.AddParam ("font", "", font);
+ }
+
+ NoteXsl.Transform (doc, args, writer);
+ }
+ }
+
+ /// <summary>
+ /// Makes <see cref="System.String.ToLower"/> available in the
+ /// XSL stylesheet and resolves relative paths between notes.
+ /// </summary>
+ public class ExportAllTransformExtension
+ {
+ private Note note;
+ private ExportToHtmlApplicationAddin parent;
+
+ public ExportAllTransformExtension (Note note, ExportToHtmlApplicationAddin parent)
+ {
+ this.note = note;
+ this.parent = parent;
+ }
+
+ public String ToLower (string s)
+ {
+ return s.ToLower ();
+ }
+
+ public string GetRelativePath (string title_to)
+ {
+ if (string.IsNullOrEmpty (title_to))
+ return string.Empty;
+
+ //Get the the value from the exportAll superclass, changing from platform
+ //dependent to URL drectory seperators since we're making HTML.
+ string system_relative_path = parent.ResolveRelativePath (note, title_to);
+ return system_relative_path.Replace (System.IO.Path.DirectorySeparatorChar, '/');
+ }
+ }
+}
diff --git a/Tomboy/Addins/ExportToHtml/Makefile.am b/Tomboy/Addins/ExportToHtml/Makefile.am
index 4d65027..78dc548 100644
--- a/Tomboy/Addins/ExportToHtml/Makefile.am
+++ b/Tomboy/Addins/ExportToHtml/Makefile.am
@@ -15,7 +15,8 @@ ADDIN_NAME = ExportToHtml
TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
CSFILES = \
$(srcdir)/ExportToHtmlDialog.cs \
- $(srcdir)/ExportToHtmlNoteAddin.cs
+ $(srcdir)/ExportToHtmlNoteAddin.cs \
+ $(srcdir)/ExportToHtmlApplicationAddin.cs
RESOURCES = \
-resource:$(srcdir)/$(ADDIN_NAME).addin.xml \
-resource:$(srcdir)/ExportToHtml.xsl
diff --git a/Tomboy/Addins/ExportToHtml/Makefile.in b/Tomboy/Addins/ExportToHtml/Makefile.in
index e77b426..756b108 100644
--- a/Tomboy/Addins/ExportToHtml/Makefile.in
+++ b/Tomboy/Addins/ExportToHtml/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -275,7 +274,8 @@ ADDIN_NAME = ExportToHtml
TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll
CSFILES = \
$(srcdir)/ExportToHtmlDialog.cs \
- $(srcdir)/ExportToHtmlNoteAddin.cs
+ $(srcdir)/ExportToHtmlNoteAddin.cs \
+ $(srcdir)/ExportToHtmlApplicationAddin.cs
RESOURCES = \
-resource:$(srcdir)/$(ADDIN_NAME).addin.xml \
diff --git a/Tomboy/Addins/FileSystemSyncService/Makefile.in b/Tomboy/Addins/FileSystemSyncService/Makefile.in
index c758fb6..81daace 100644
--- a/Tomboy/Addins/FileSystemSyncService/Makefile.in
+++ b/Tomboy/Addins/FileSystemSyncService/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/FixedWidth/Makefile.in b/Tomboy/Addins/FixedWidth/Makefile.in
index 2455517..796ca8f 100644
--- a/Tomboy/Addins/FixedWidth/Makefile.in
+++ b/Tomboy/Addins/FixedWidth/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/GalagoPresence/Makefile.in b/Tomboy/Addins/GalagoPresence/Makefile.in
index b9a013d..56ad36b 100644
--- a/Tomboy/Addins/GalagoPresence/Makefile.in
+++ b/Tomboy/Addins/GalagoPresence/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/InsertTimestamp/Makefile.in b/Tomboy/Addins/InsertTimestamp/Makefile.in
index f9789ae..21d49c0 100644
--- a/Tomboy/Addins/InsertTimestamp/Makefile.in
+++ b/Tomboy/Addins/InsertTimestamp/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Makefile.in b/Tomboy/Addins/Makefile.in
index 93005fd..a37ab3d 100644
--- a/Tomboy/Addins/Makefile.in
+++ b/Tomboy/Addins/Makefile.in
@@ -249,7 +249,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
index 38d867f..d442031 100644
--- a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
+++ b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/NoteOfTheDay/Makefile.in b/Tomboy/Addins/NoteOfTheDay/Makefile.in
index 498a5a2..d2e6fbb 100644
--- a/Tomboy/Addins/NoteOfTheDay/Makefile.in
+++ b/Tomboy/Addins/NoteOfTheDay/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/PrintNotes/Makefile.in b/Tomboy/Addins/PrintNotes/Makefile.in
index fb95d69..9465203 100644
--- a/Tomboy/Addins/PrintNotes/Makefile.in
+++ b/Tomboy/Addins/PrintNotes/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/RemoveBrokenLinks/Makefile.in b/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
index 52d40f6..3764d1a 100644
--- a/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
+++ b/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Sketching/Makefile.in b/Tomboy/Addins/Sketching/Makefile.in
index 16e8219..6cb4f1d 100644
--- a/Tomboy/Addins/Sketching/Makefile.in
+++ b/Tomboy/Addins/Sketching/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/SshSyncService/Makefile.in b/Tomboy/Addins/SshSyncService/Makefile.in
index fa13b5b..46eb9f4 100644
--- a/Tomboy/Addins/SshSyncService/Makefile.in
+++ b/Tomboy/Addins/SshSyncService/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/StickyNoteImport/Makefile.in b/Tomboy/Addins/StickyNoteImport/Makefile.in
index 1396957..61050a0 100644
--- a/Tomboy/Addins/StickyNoteImport/Makefile.in
+++ b/Tomboy/Addins/StickyNoteImport/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Tasque/Makefile.in b/Tomboy/Addins/Tasque/Makefile.in
index 81e87e7..797f7f9 100644
--- a/Tomboy/Addins/Tasque/Makefile.in
+++ b/Tomboy/Addins/Tasque/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Underline/Makefile.in b/Tomboy/Addins/Underline/Makefile.in
index b9b0e52..546bab4 100644
--- a/Tomboy/Addins/Underline/Makefile.in
+++ b/Tomboy/Addins/Underline/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/WebDavSyncService/Makefile.in b/Tomboy/Addins/WebDavSyncService/Makefile.in
index c669927..508fe14 100644
--- a/Tomboy/Addins/WebDavSyncService/Makefile.in
+++ b/Tomboy/Addins/WebDavSyncService/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/WebSyncService/Makefile.in b/Tomboy/Addins/WebSyncService/Makefile.in
index 65e995a..a0a4d71 100644
--- a/Tomboy/Addins/WebSyncService/Makefile.in
+++ b/Tomboy/Addins/WebSyncService/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/WebSyncService/WebSyncServer.cs b/Tomboy/Addins/WebSyncService/WebSyncServer.cs
index 285c16a..6005fe9 100644
--- a/Tomboy/Addins/WebSyncService/WebSyncServer.cs
+++ b/Tomboy/Addins/WebSyncService/WebSyncServer.cs
@@ -44,7 +44,7 @@ namespace Tomboy.WebSync
public WebSyncServer (string serverUrl, IWebConnection connection)
{
this.connection = connection;
- rootUri = serverUrl + "/api/1.0/"; // TODO: Trim trailing / from serverUrl if necessary
+ rootUri = serverUrl.TrimEnd ('/') + "/api/1.0/";
}
#region SyncServer implementation
diff --git a/Tomboy/ExportAllApplicationAddin.cs b/Tomboy/ExportAllApplicationAddin.cs
new file mode 100644
index 0000000..6bfdad9
--- /dev/null
+++ b/Tomboy/ExportAllApplicationAddin.cs
@@ -0,0 +1,538 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Mono.Unix;
+using Tomboy;
+using Tomboy.Notebooks;
+
+namespace Tomboy
+{
+ /// <summary>
+ /// An abstract class which handles all the details of "export all",
+ /// to be subclassed with a method that defines what to do with a
+ /// single note.
+ /// </summary>
+ public abstract class ExportAllApplicationAddin : ApplicationAddin
+ {
+
+ /// <summary>
+ /// The filename suffix of the export type, e.g. "html" or "txt".
+ /// Don't put a punctuation mark in front!
+ /// </summary>
+ protected string export_file_suffix;
+
+ /// <summary>
+ /// The full name to be used in the menu. Can include spaces, should use Catalog.GetString.
+ /// </summary>
+ protected string export_type_pretty_name;
+
+ private Gtk.ActionGroup action_group;
+ private uint action_group_id;
+ private ActionManager am = Tomboy.ActionManager;
+ private bool initialized = false;
+
+ /// <summary>
+ /// Used to inform the path resolver if all notes are being exported or just one notebook.
+ /// </summary>
+ private bool exporting_single_notebook = false;
+
+ /// <summary>
+ /// Called when Tomboy has started up and is nearly 100% initialized.
+ /// </summary>
+ public override void Initialize ()
+ {
+ // Gets names from subclass.
+ SetNames ();
+
+ /*Adds "Export All Notes/Notebook To ***" to Tomboy's Main Menu */
+
+ if (am.FindActionByName ("NoteExportAll"+export_file_suffix+"Action") == null) {
+
+ am.MainWindowActions.Add (new Gtk.ActionEntry [] {
+ new Gtk.ActionEntry ("NoteExportAll"+export_file_suffix+"Action", null,
+ Catalog.GetString ("Export All Notes to "+export_type_pretty_name), null,
+ Catalog.GetString ("Start exporting notes to "+export_type_pretty_name), null)
+ });
+ am.MainWindowActions.Add (new Gtk.ActionEntry [] {
+ new Gtk.ActionEntry ("NoteExportNotebook"+export_file_suffix+"Action", null,
+ Catalog.GetString ("Export selected notebook to "+export_type_pretty_name), null,
+ Catalog.GetString ("Start exporting notebook to "+export_type_pretty_name), null)
+ });
+
+ action_group = new Gtk.ActionGroup ("Export");
+ action_group.Add (new Gtk.ActionEntry [] {
+ new Gtk.ActionEntry ("ToolsMenuAction", null,
+ Catalog.GetString ("_Tools"), null, null, null),
+
+ new Gtk.ActionEntry ("ExportMenuAction", Gtk.Stock.New,
+ Catalog.GetString ("Export"), null,
+ Catalog.GetString ("Export your notes."), null),
+
+ new Gtk.ActionEntry ("ExportAllNotes"+export_file_suffix+"Action", null,
+ Catalog.GetString ("Export All Notes To "+export_type_pretty_name), null, null,
+ delegate {
+ am ["NoteExportAll"+export_file_suffix+"Action"].Activate ();
+ }),
+ new Gtk.ActionEntry ("ExportNotebook"+export_file_suffix+"Action", null,
+ Catalog.GetString ("Export Selected Notebook To "+export_type_pretty_name), null, null,
+ delegate {
+ am ["NoteExportNotebook"+export_file_suffix+"Action"].Activate ();
+ })
+ });
+
+ action_group_id = am.UI.AddUiFromString (String.Format (@"
+ <ui>
+ <menubar name='MainWindowMenubar'>
+ <placeholder name='MainWindowMenuPlaceholder'>
+ <menu name='ToolsMenu' action='ToolsMenuAction'>
+ <menu name='ExportMenu' action='ExportMenuAction'>
+ <menuitem name='ExportAllNotes{0}' action='ExportAllNotes{0}Action' />
+ <menuitem name='ExportNotebook{0}' action='ExportNotebook{0}Action' />
+ </menu>
+ </menu>
+ </placeholder>
+ </menubar>
+ </ui>
+ ", export_file_suffix)
+ );
+
+ am.UI.InsertActionGroup (action_group, 0);
+
+ am ["NoteExportAll"+export_file_suffix+"Action"].Activated += ExportAllButtonClicked;
+ am ["NoteExportNotebook"+export_file_suffix+"Action"].Activated += ExportNotebookButtonClicked;
+
+ initialized = true;
+ }
+ }
+
+ /// <summary>
+ /// Must be overridden in order to set names for internal menu use
+ /// and file naming (export_file_suffix) and what the user sees
+ /// (export_type_pretty_name).
+ /// </summary>
+ protected abstract void SetNames ();
+
+ /// <summary>
+ /// Called just before Tomboy shuts down for good.
+ /// </summary>
+ public override void Shutdown ()
+ {
+ // Disconnect the event handlers and global menu entries so
+ // there aren't any memory leaks.
+
+ if (action_group != null) {
+ am ["NoteExportAll"+export_file_suffix+"Action"].Activated -= ExportAllButtonClicked;
+ am ["NoteExportNotebook"+export_file_suffix+"Action"].Activated -= ExportAllButtonClicked;
+ am.UI.RemoveUi (action_group_id);
+ am.UI.RemoveActionGroup (action_group);
+ am.MainWindowActions.Remove
+ (Tomboy.ActionManager.FindActionByName ("NoteExportAll"+export_file_suffix+"Action"));
+ am.MainWindowActions.Remove
+ (Tomboy.ActionManager.FindActionByName ("NoteExportNotebook"+export_file_suffix+"Action"));
+
+ action_group = null;
+ }
+ }
+
+ void ExportAllButtonClicked (object sender, EventArgs args)
+ {
+ ExportAllNotes ();
+ }
+
+ /// <summary>
+ /// Called when the user chooses "Export All"
+ /// </summary>
+ /// <param name="sender">
+ void ExportAllNotes ()
+ {
+ Logger.Info ("Activated export all to " + export_type_pretty_name);
+ exporting_single_notebook = false;
+
+ //Opens the folder selection dialog
+ ExportMultipleDialog dialog =
+ new ExportMultipleDialog ("All Notes " + export_type_pretty_name +" Export", export_type_pretty_name);
+ int response = dialog.Run ();
+ if (response != (int) Gtk.ResponseType.Ok) {
+ Logger.Debug("User clicked cancel.");
+ dialog.Destroy ();
+ return;
+ }
+ string output_folder = SanitizePath (dialog.Filename);
+
+ try {
+ Logger.Debug ("Creating an export folder in: " + output_folder);
+ System.IO.Directory.CreateDirectory (output_folder);
+
+ //Iterate through notebooks
+ Notebooks.Notebook notebook;
+ string notebook_folder;
+
+ foreach (Tag tag in TagManager.AllTags) {
+ // Skip over tags that aren't notebooks
+ notebook = NotebookManager.GetNotebookFromTag (tag);
+ if (notebook == null)
+ continue;
+
+ Logger.Debug ("Exporting notebook " + notebook.Name);
+ notebook_folder = SanitizePath (output_folder + System.IO.Path.DirectorySeparatorChar
+ + notebook.NormalizedName);
+ System.IO.Directory.CreateDirectory (notebook_folder);
+ ExportNotesInList (notebook.Tag.Notes, notebook_folder);
+
+ }
+
+ //Finally we have to export all unfiled notes.
+ Logger.Debug ("Exporting Unfiled Notes");
+ ExportNotesInList (ListUnfiledNotes (), output_folder);
+
+ //Successful export: clean up and inform.
+ dialog.SavePreferences ();
+ ShowSuccessDialog (output_folder);
+
+ } catch (UnauthorizedAccessException) {
+ Logger.Error (Catalog.GetString ("Could not export, access denied."));
+ ShowErrorDialog (output_folder, dialog,
+ Catalog.GetString ("Access denied."));
+ return;
+ } catch (DirectoryNotFoundException) {
+ Logger.Error (Catalog.GetString ("Could not export, folder does not exist."));
+ ShowErrorDialog (output_folder, dialog,
+ Catalog.GetString ("Folder does not exist."));
+ return;
+ } catch (Exception ex) {
+ Logger.Error (Catalog.GetString ("Could not export: {0}"), ex);
+ ShowErrorDialog (output_folder, dialog,
+ Catalog.GetString ("Unknown error."));
+ return;
+ } finally {
+ if (dialog != null) {
+ dialog.Destroy ();
+ dialog = null;
+ }
+ }
+ }
+
+ /// <summary>
+ /// Called when the user chooses "Export Notebook"
+ /// (Even when "All Notes or "Unfiled Notes" are
+ /// selected.)
+ /// </summary>
+ void ExportNotebookButtonClicked (object sender, EventArgs args)
+ {
+ string output_folder = null;
+ ExportMultipleDialog dialog = null;
+ Logger.Info ("Activated export notebook to " + export_file_suffix);
+
+ Notebook notebook = NoteRecentChanges.GetInstance (Tomboy.DefaultNoteManager).GetSelectedNotebook ();
+
+ try {
+ //Handling the two special notebooks
+ string notebook_name = notebook.NormalizedName;
+ if (notebook_name == "___NotebookManager___AllNotes__Notebook___") {
+ Logger.Info ("This notebook includes all notes, activating Export All");
+ ExportAllNotes ();
+ return;
+ } else if (notebook_name == "___NotebookManager___UnfiledNotes__Notebook___") {
+ dialog = new ExportMultipleDialog (Catalog.GetString ("Unfiled Notes"), export_type_pretty_name);
+ int response = dialog.Run ();
+ output_folder = SanitizePath (dialog.Filename);
+ if (response != (int) Gtk.ResponseType.Ok) {
+ Logger.Debug("User clicked cancel.");
+ dialog.Destroy ();
+ return;
+ }
+
+ exporting_single_notebook = true;
+ Logger.Debug ("Creating an export folder in: " + output_folder);
+ System.IO.Directory.CreateDirectory (output_folder);
+ ExportNotesInList (ListUnfiledNotes (), output_folder);
+ } else {
+ //Ordinary notebooks
+ dialog = new ExportMultipleDialog (notebook_name, export_type_pretty_name);
+ int response = dialog.Run ();
+ output_folder = SanitizePath (dialog.Filename);
+ if (response != (int) Gtk.ResponseType.Ok) {
+ Logger.Debug("User clicked cancel.");
+ dialog.Destroy ();
+ return;
+ }
+
+ exporting_single_notebook = true;
+ Logger.Debug ("Creating an export folder in: " + output_folder);
+ System.IO.Directory.CreateDirectory (output_folder);
+ ExportNotesInList (notebook.Tag.Notes, output_folder);
+ }
+
+ //Successful export: clean up and inform.
+ dialog.SavePreferences ();
+ ShowSuccessDialog (output_folder);
+
+ } catch (UnauthorizedAccessException) {
+ Logger.Error (Catalog.GetString ("Could not export, access denied."));
+ ShowErrorDialog (output_folder, dialog,
+ Catalog.GetString ("Access denied."));
+ return;
+ } catch (DirectoryNotFoundException) {
+ Logger.Error (Catalog.GetString ("Could not export, folder does not exist."));
+ ShowErrorDialog (output_folder, dialog,
+ Catalog.GetString ("Folder does not exist."));
+ return;
+ } catch (Exception ex) {
+ Logger.Error (Catalog.GetString ("Could not export: {0}"), ex);
+ ShowErrorDialog (output_folder, dialog,
+ Catalog.GetString ("Unknown error."));
+ return;
+ } finally {
+ if (dialog != null) {
+ dialog.Destroy ();
+ dialog = null;
+ }
+ }
+ }
+
+ /// <summary>
+ /// Exports the specified list of notes to *** files in the given folder,
+ /// excludes template notes.
+ /// </summary>
+ public void ExportNotesInList (List<Note> note_list, string output_folder)
+ {
+ output_folder = output_folder + System.IO.Path.DirectorySeparatorChar;
+ bool save;
+
+ foreach (Note note in note_list) {
+ save = true;
+ //Checks all tags on note to see if it's a template.
+ foreach (Tag tag in note.Tags) {
+ if (tag.Name.StartsWith (Tag.SYSTEM_TAG_PREFIX + TagManager.TemplateNoteSystemTag))
+ save = false;
+ }
+
+ if (save) {
+ ExportSingleNote (note, output_folder);
+ }
+ }
+ return;
+ }
+
+ /// <summary>
+ /// Finds all notes without a notebook tag and returns them in a list.
+ /// </summary>
+ public List<Note> ListUnfiledNotes ()
+ {
+ List<Note> unfiled_notes = new List<Note> ();
+ //Checks all notes
+ foreach (Note note in Tomboy.DefaultNoteManager.Notes) {
+ if (NotebookManager.GetNotebookFromNote (note) == null)
+ unfiled_notes.Add (note);
+ }
+ return unfiled_notes;
+ }
+
+ /// <summary>
+ /// Exports a single Note to the chosen format and saves it in the specified folder.
+ /// To be implemented in a subclass where the subclass implementation takes care
+ /// of conversion and saving.
+ /// <param name="output_folder">
+ /// The folder which the note is to be saved to. For an all notes export the top level
+ /// folder is chosen by the user and sublevel folders are automatically created for
+ /// each notebook and passed to this method.
+ /// </summary>
+ public abstract void ExportSingleNote (Note note, string output_folder);
+
+ /// <summary>
+ /// Removes elements from the note title that might be problematic in a file name.
+ /// </summary>
+ public string SanitizeNoteTitle (string note_title)
+ {
+ note_title = SanitizePath (note_title);
+
+ //Clearing common folder and file chars
+ note_title = note_title.Replace ('/', '_');
+ note_title = note_title.Replace ('\\', '_');
+ note_title = note_title.Replace ('.', '_');
+
+ return note_title;
+ }
+
+ /// <summary>
+ /// Makes sure a path doesn't have any illegal characters.
+ /// </summary>
+ private string SanitizePath (string path)
+ {
+ char[] invalid_path_chars = Path.GetInvalidPathChars ();
+
+ foreach (char x in invalid_path_chars) {
+ path = path.Replace (x, '_');
+ }
+
+ return path;
+ }
+
+ /// <summary>
+ /// Return true if the addin is initialized
+ /// </summary>
+ public override bool Initialized
+ {
+ get
+ {
+ return initialized;
+ }
+ }
+
+ /// <summary>
+ /// Shows a success dialog when export is complete
+ /// </summary>
+ /// <param name="detail"> A string with details of the export folder.</param>
+ private static void ShowSuccessDialog (string output_folder)
+ {
+ string detail = String.Format (
+ Catalog.GetString ("Your notes were exported to \"{0}\"."),
+ output_folder);
+
+ HIGMessageDialog msg_dialog =
+ new HIGMessageDialog (
+ null,
+ Gtk.DialogFlags.DestroyWithParent,
+ Gtk.MessageType.Info,
+ Gtk.ButtonsType.Ok,
+ Catalog.GetString ("Notes exported successfully"),
+ detail);
+ msg_dialog.Run ();
+ msg_dialog.Destroy ();
+ }
+
+ /// <summary>
+ /// Shows an error dialog if things go wrong.
+ /// </summary>
+ /// <param name="output_folder">
+ /// A <see cref="System.String"/> with the name of the folder
+ /// that couldn't be exported to.
+ /// </param>
+ /// <param name="dialog">
+ /// The parent <see cref="ExportMultipleDialog"/>.
+ /// </param>
+ /// <param name="error_message">
+ /// A <see cref="System.String"/> with an error description.
+ /// </param>
+ private static void ShowErrorDialog (string output_folder, ExportMultipleDialog dialog,
+ string error_message)
+ {
+ string msg = String.Format (
+ Catalog.GetString ("Could not save the files in \"{0}\""),
+ output_folder);
+ HIGMessageDialog msg_dialog =
+ new HIGMessageDialog (
+ dialog,
+ Gtk.DialogFlags.DestroyWithParent,
+ Gtk.MessageType.Error,
+ Gtk.ButtonsType.Ok,
+ msg,
+ error_message);
+ msg_dialog.Run ();
+ msg_dialog.Destroy ();
+ dialog.Destroy ();
+ Logger.Error (error_message);
+ }
+
+ /// <summary>
+ /// Determines the relative path between two exported files, can optionally be used
+ /// by the subclass.
+ /// </summary>
+ /// <param name="title_from">
+ /// The note we're finding the relative path from.
+ /// </param>
+ /// <param name="title_to">
+ /// The title of the note we're finding the relative path to.
+ /// </param>
+ /// <returns>
+ /// A <see cref="System.String"/>
+ /// </returns>
+ public string ResolveRelativePath (Note note_from, string title_to)
+ {
+ NoteManager manager = Tomboy.DefaultNoteManager;
+ Note note_to = manager.Find (title_to);
+ string title_from = SanitizeNoteTitle (note_from.Title);
+ title_to = SanitizeNoteTitle (note_to.Title);
+
+ if (exporting_single_notebook) {
+ //If there is only one notebook being exported
+ if (NotebookManager.GetNotebookFromNote (note_from) == NotebookManager.GetNotebookFromNote (note_to)) {
+ return title_to + "." + export_file_suffix;
+ } else {
+ return "";
+ }
+ } else {
+ //If all notebooks are available
+ if (NotebookManager.GetNotebookFromNote (note_from) == NotebookManager.GetNotebookFromNote (note_to)) {
+ //Both notes are in the same notebook
+ return title_to + "." + export_file_suffix;
+ } else {
+ //Unfiled notes are a special case because they're in the root directory and will
+ // throw an exception from the notebookmanager
+ string notebook_from;
+ string notebook_to;
+ try {
+ notebook_from = NotebookManager.GetNotebookFromNote (note_from).NormalizedName;
+ } catch (Exception ex) {
+ notebook_from = "___NotebookManager___UnfiledNotes__Notebook___"; //TODO: Ugly!
+ }
+ try {
+ notebook_to = NotebookManager.GetNotebookFromNote (note_to).NormalizedName;
+ } catch (Exception ex) {
+ notebook_to = "___NotebookManager___UnfiledNotes__Notebook___";
+ }
+
+ if (notebook_to == "___NotebookManager___UnfiledNotes__Notebook___") {
+ return ".." + System.IO.Path.DirectorySeparatorChar + title_to + "." + export_file_suffix;
+ } else if (notebook_from == "___NotebookManager___UnfiledNotes__Notebook___") {
+ return SanitizePath (notebook_to) + System.IO.Path.DirectorySeparatorChar
+ + title_to + "." + export_file_suffix;
+ } else {
+ return ".." + System.IO.Path.DirectorySeparatorChar + SanitizePath (notebook_to)
+ + System.IO.Path.DirectorySeparatorChar + title_to + "." + export_file_suffix;
+ }
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// A utility class for choosing where to export to.
+ /// </summary>
+ public class ExportMultipleDialog : Gtk.FileChooserDialog
+ {
+
+ public ExportMultipleDialog (string default_folder, string export_type_name) :
+ base (Catalog.GetString ("Create destination folder for " + export_type_name + " Export"),
+ null, Gtk.FileChooserAction.Save, new object[] {})
+ //Using action Save insted of CreateFolder because of Win32 issue
+ {
+ AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel);
+ AddButton (Gtk.Stock.Save, Gtk.ResponseType.Ok);
+
+ DefaultResponse = Gtk.ResponseType.Ok;
+ DoOverwriteConfirmation = true;
+ LocalOnly = true;
+
+ ShowAll ();
+
+ LoadPreferences (default_folder);
+ }
+
+ //Using the same directory prefs as a single note export.
+ public void SavePreferences ()
+ {
+ string dir = System.IO.Path.GetDirectoryName (Filename);
+ Preferences.Set (Preferences.EXPORTHTML_LAST_DIRECTORY, dir);
+ }
+
+ protected void LoadPreferences (string default_folder)
+ {
+ string last_dir = (string) Preferences.Get (Preferences.EXPORTHTML_LAST_DIRECTORY);
+ if (last_dir == "")
+ last_dir = Environment.GetEnvironmentVariable ("HOME");
+ SetCurrentFolder (last_dir);
+ CurrentName = default_folder;
+ }
+ }
+}
diff --git a/Tomboy/GConf.PropertyEditors/PropertyEditor.cs b/Tomboy/GConf.PropertyEditors/PropertyEditor.cs
new file mode 100644
index 0000000..51e57d9
--- /dev/null
+++ b/Tomboy/GConf.PropertyEditors/PropertyEditor.cs
@@ -0,0 +1,96 @@
+// PropertyEditor.cs -
+//
+// Author: Rachel Hestilow <hestilow at nullenvoid.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General
+// Public License as published by the Free Software Foundation.
+//
+// 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
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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.
+
+namespace GConf.PropertyEditors
+{
+ using Gtk;
+
+ public abstract class PropertyEditor
+ {
+ protected abstract void ValueChanged (object sender, NotifyEventArgs args);
+ protected abstract void ConnectHandlers ();
+
+ string key;
+ Client client;
+ ChangeSet cs;
+ Widget control;
+
+ public string Key
+ {
+ get { return key; }
+ }
+
+ public Widget Control
+ {
+ get { return control; }
+ }
+
+ protected object Get ()
+ {
+ ClientBase c = (cs != null) ? (ClientBase) cs : (ClientBase) client;
+ try {
+ return c.Get (key);
+ } catch (NoSuchKeyException e) {
+ }
+
+ if (cs != null)
+ {
+ try {
+ return client.Get (key);
+ } catch (NoSuchKeyException e) {
+ }
+ }
+
+ return null;
+ }
+
+ protected virtual void Set (object val)
+ {
+ ClientBase c = (cs != null) ? (ClientBase) cs : (ClientBase) client;
+ c.Set (key, val);
+ }
+
+ public virtual void Setup ()
+ {
+ if (client == null)
+ client = new Client ();
+
+ ValueChanged (client, new NotifyEventArgs (key, Get ()));
+ ConnectHandlers ();
+ client.AddNotify (key, new NotifyEventHandler (ValueChanged));
+ }
+
+ public Client Client
+ {
+ get { return client; }
+ set { client = value; }
+ }
+
+ public ChangeSet ChangeSet
+ {
+ get { return cs; }
+ set { cs = value; }
+ }
+
+ public PropertyEditor (string key, Widget control)
+ {
+ this.key = key;
+ this.control = control;
+ }
+ }
+}
diff --git a/Tomboy/GConf.PropertyEditors/PropertyEditorBool.cs b/Tomboy/GConf.PropertyEditors/PropertyEditorBool.cs
new file mode 100644
index 0000000..fa1164f
--- /dev/null
+++ b/Tomboy/GConf.PropertyEditors/PropertyEditorBool.cs
@@ -0,0 +1,50 @@
+// PropertyEditorBool.cs -
+//
+// Author: Rachel Hestilow <hestilow at nullenvoid.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General
+// Public License as published by the Free Software Foundation.
+//
+// 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
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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.
+
+
+namespace GConf.PropertyEditors
+{
+ using Gtk;
+ using System;
+ using System.Collections;
+
+ public abstract class PropertyEditorBool : PropertyEditor
+ {
+ ArrayList guards = new ArrayList ();
+
+ public void AddGuard (Widget control)
+ {
+ guards.Add (control);
+ control.Sensitive = (bool) Get ();
+ }
+
+ protected override void Set (object val)
+ {
+ bool val_bool = (bool) val;
+
+ foreach (Widget control in guards)
+ control.Sensitive = val_bool;
+
+ base.Set (val);
+ }
+
+ public PropertyEditorBool (string key, Widget control) : base (key, control)
+ {
+ }
+ }
+}
diff --git a/Tomboy/GConf.PropertyEditors/PropertyEditorEntry.cs b/Tomboy/GConf.PropertyEditors/PropertyEditorEntry.cs
new file mode 100644
index 0000000..ee93ad9
--- /dev/null
+++ b/Tomboy/GConf.PropertyEditors/PropertyEditorEntry.cs
@@ -0,0 +1,51 @@
+// PropertyEditorEntry.cs -
+//
+// Author: Rachel Hestilow <hestilow at nullenvoid.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General
+// Public License as published by the Free Software Foundation.
+//
+// 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
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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.
+
+namespace GConf.PropertyEditors
+{
+ using Gtk;
+ using System;
+
+ public class PropertyEditorEntry : PropertyEditor
+ {
+ protected override void ValueChanged (object sender, NotifyEventArgs args)
+ {
+ object val = args.Value;
+ if (val == null)
+ return;
+ Entry entry = (Entry) Control;
+ entry.Text = (string) val;
+ }
+
+ void Changed (object obj, EventArgs args)
+ {
+ Entry entry = (Entry) Control;
+ Set (entry.Text);
+ }
+
+ protected override void ConnectHandlers ()
+ {
+ Entry entry = (Entry) Control;
+ entry.Changed += new EventHandler (Changed);
+ }
+
+ public PropertyEditorEntry (string key, Entry entry) : base (key, entry)
+ {
+ }
+ }
+}
diff --git a/Tomboy/GConf.PropertyEditors/PropertyEditorToggleButton.cs b/Tomboy/GConf.PropertyEditors/PropertyEditorToggleButton.cs
new file mode 100644
index 0000000..ab8b5a3
--- /dev/null
+++ b/Tomboy/GConf.PropertyEditors/PropertyEditorToggleButton.cs
@@ -0,0 +1,49 @@
+// PropertyEditorToggleButton.cs -
+//
+// Author: Rachel Hestilow <hestilow at nullenvoid.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General
+// Public License as published by the Free Software Foundation.
+//
+// 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
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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.
+
+namespace GConf.PropertyEditors
+{
+ using Gtk;
+ using System;
+
+ public class PropertyEditorToggleButton : PropertyEditorBool
+ {
+ protected override void ValueChanged (object sender, NotifyEventArgs args)
+ {
+ object val = args.Value;
+ ToggleButton checkbox = (ToggleButton) Control;
+ checkbox.Active = (bool) val;
+ }
+
+ void Toggled (object obj, EventArgs args)
+ {
+ ToggleButton checkbox = (ToggleButton) Control;
+ Set (checkbox.Active);
+ }
+
+ protected override void ConnectHandlers ()
+ {
+ ToggleButton checkbox = (ToggleButton) Control;
+ checkbox.Toggled += new EventHandler (Toggled);
+ }
+
+ public PropertyEditorToggleButton (string key, ToggleButton checkbox) : base (key, checkbox)
+ {
+ }
+ }
+}
diff --git a/Tomboy/Makefile.am b/Tomboy/Makefile.am
index 48feb25..b1458ce 100644
--- a/Tomboy/Makefile.am
+++ b/Tomboy/Makefile.am
@@ -44,12 +44,16 @@ endif
PANELAPPLET_CSFILES = \
$(srcdir)/Applet.cs
-GNOME_CSFILES = \
- $(srcdir)/GConfPreferencesClient.cs \
- $(srcdir)/GnomeApplication.cs \
- $(srcdir)/GnomeFactory.cs \
- $(srcdir)/GnomeSession.cs \
- $(srcdir)/XKeybinder.cs \
+GNOME_CSFILES = \
+ $(srcdir)/GConf.PropertyEditors/PropertyEditor.cs \
+ $(srcdir)/GConf.PropertyEditors/PropertyEditorBool.cs \
+ $(srcdir)/GConf.PropertyEditors/PropertyEditorEntry.cs \
+ $(srcdir)/GConf.PropertyEditors/PropertyEditorToggleButton.cs \
+ $(srcdir)/GConfPreferencesClient.cs \
+ $(srcdir)/GnomeApplication.cs \
+ $(srcdir)/GnomeFactory.cs \
+ $(srcdir)/GnomeSession.cs \
+ $(srcdir)/XKeybinder.cs \
$(srcdir)/gtk-sharp-beans/*.cs
if ENABLE_PANEL_APPLET
@@ -94,6 +98,7 @@ CSFILES = \
$(srcdir)/AddinPreferenceFactory.cs \
$(srcdir)/ApplicationAddin.cs \
$(srcdir)/Contrast.cs \
+ $(srcdir)/ExportAllApplicationAddin.cs \
$(srcdir)/Keybinder.cs \
$(srcdir)/Logger.cs \
$(srcdir)/NativeApplication.cs \
diff --git a/Tomboy/Makefile.in b/Tomboy/Makefile.in
index 96cb8f2..7412440 100644
--- a/Tomboy/Makefile.in
+++ b/Tomboy/Makefile.in
@@ -277,7 +277,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -342,11 +341,15 @@ PANELAPPLET_CSFILES = \
$(srcdir)/Applet.cs
GNOME_CSFILES = \
- $(srcdir)/GConfPreferencesClient.cs \
- $(srcdir)/GnomeApplication.cs \
- $(srcdir)/GnomeFactory.cs \
- $(srcdir)/GnomeSession.cs \
- $(srcdir)/XKeybinder.cs \
+ $(srcdir)/GConf.PropertyEditors/PropertyEditor.cs \
+ $(srcdir)/GConf.PropertyEditors/PropertyEditorBool.cs \
+ $(srcdir)/GConf.PropertyEditors/PropertyEditorEntry.cs \
+ $(srcdir)/GConf.PropertyEditors/PropertyEditorToggleButton.cs \
+ $(srcdir)/GConfPreferencesClient.cs \
+ $(srcdir)/GnomeApplication.cs \
+ $(srcdir)/GnomeFactory.cs \
+ $(srcdir)/GnomeSession.cs \
+ $(srcdir)/XKeybinder.cs \
$(srcdir)/gtk-sharp-beans/*.cs
@ENABLE_PANEL_APPLET_TRUE at PANEL_APPLET_CSFLAGS = -define:PANEL_APPLET
@@ -379,6 +382,7 @@ CSFILES = \
$(srcdir)/AddinPreferenceFactory.cs \
$(srcdir)/ApplicationAddin.cs \
$(srcdir)/Contrast.cs \
+ $(srcdir)/ExportAllApplicationAddin.cs \
$(srcdir)/Keybinder.cs \
$(srcdir)/Logger.cs \
$(srcdir)/NativeApplication.cs \
diff --git a/Tomboy/NoteBuffer.cs b/Tomboy/NoteBuffer.cs
index 096a9ea..5558e18 100644
--- a/Tomboy/NoteBuffer.cs
+++ b/Tomboy/NoteBuffer.cs
@@ -546,7 +546,11 @@ namespace Tomboy
} else if (start.EndsLine () && start.Line < LineCount) {
Gtk.TextIter next = GetIterAtLine (start.Line + 1);
end = start;
- end.ForwardChars (3);
+
+ if (IsBulletedListActive ())
+ end.ForwardChars (3);
+ else
+ end.ForwardChars (1);
DepthNoteTag depth = FindDepthTag (next);
diff --git a/Tomboy/NoteManager.cs b/Tomboy/NoteManager.cs
index 8c8dc1f..33d5ab5 100644
--- a/Tomboy/NoteManager.cs
+++ b/Tomboy/NoteManager.cs
@@ -331,7 +331,33 @@ Ciao!");
Logger.Error ("Error parsing note XML, skipping \"{0}\": {1}",
file_path,
e.Message);
- }
+ } catch (System.IO.IOException e) {
+ Logger.Error ("Note {0} can not be loaded - file corrupted?: {1}",
+ file_path,
+ e.Message);
+ Gtk.MessageDialog md =
+ new Gtk.MessageDialog(null,Gtk.DialogFlags.DestroyWithParent,
+ Gtk.MessageType.Error,
+ Gtk.ButtonsType.Close,
+ "Skipping a note.\n {0} can not be loaded - Error loading file!",
+ file_path
+ );
+ md.Run();
+ md.Destroy();
+ } catch (System.UnauthorizedAccessException e) {
+ Logger.Error ("Note {0} can not be loaded - access denied: {1}",
+ file_path,
+ e.Message);
+ Gtk.MessageDialog md =
+ new Gtk.MessageDialog(null,Gtk.DialogFlags.DestroyWithParent,
+ Gtk.MessageType.Error,
+ Gtk.ButtonsType.Close,
+ "Skipping a note.\n {0} can not be loaded - Access denied!",
+ file_path
+ );
+ md.Run();
+ md.Destroy();
+ }
}
notes.Sort (new CompareDates ());
diff --git a/Tomboy/PreferencesDialog.cs b/Tomboy/PreferencesDialog.cs
index 90ebe5e..d6c5a42 100644
--- a/Tomboy/PreferencesDialog.cs
+++ b/Tomboy/PreferencesDialog.cs
@@ -621,14 +621,6 @@ namespace Tomboy
Gtk.LinkButton get_more_link =
new Gtk.LinkButton ("http://live.gnome.org/Tomboy/PluginList",
Catalog.GetString ("Get More Add-Ins..."));
- get_more_link.Clicked += delegate(object sender, EventArgs args) {
- string uri = ((Gtk.LinkButton) sender).Uri;
- try {
- Services.NativeApplication.OpenUrl (uri, Screen);
- } catch (Exception e) {
- GuiUtils.ShowOpeningLocationError (this, uri, e.Message);
- }
- };
get_more_link.Show ();
Gtk.VBox tree_box = new Gtk.VBox (false, 0);
tree_box.Add (sw);
@@ -1167,7 +1159,7 @@ namespace Tomboy
"You have disabled the configured synchronization service. " +
"Your synchronization settings will now be cleared. " +
"You may be forced to synchronize all of your notes again " +
- "when you save new settings"));
+ "when you save new settings."));
dialog.Run ();
dialog.Destroy ();
}
diff --git a/Tomboy/RecentChanges.cs b/Tomboy/RecentChanges.cs
index e72a667..6d847f0 100644
--- a/Tomboy/RecentChanges.cs
+++ b/Tomboy/RecentChanges.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using Mono.Unix;
+using Gtk;
namespace Tomboy
{
@@ -25,7 +26,8 @@ namespace Tomboy
Gtk.HPaned hpaned;
Gtk.VBox content_vbox;
Gtk.TreeViewColumn matches_column;
-
+ Gtk.HBox no_matches_box; //to display a message with buttons when no results are found.
+
Notebooks.NotebooksTreeView notebooksTree;
// Use the following like a Set
@@ -491,14 +493,22 @@ namespace Tomboy
IDictionary<Note,int> results =
search.SearchNotes(text, false, selected_notebook);
- foreach (Note note in results.Keys){
- current_matches.Add(note.Uri, results[note]);
+
+ // if no results found in current notebook ask user whether
+ // to search in all notebooks
+ if (results.Count == 0 && selected_notebook != null) {
+ NoMatchesFoundAction ();
}
+ else {
+ foreach (Note note in results.Keys){
+ current_matches.Add (note.Uri, results[note]);
+ }
- AddMatchesColumn ();
- store_filter.Refilter ();
- tree.ScrollToPoint (0, 0);
- UpdateMatchNoteCount (current_matches.Count);
+ AddMatchesColumn ();
+ store_filter.Refilter ();
+ tree.ScrollToPoint (0, 0);
+ UpdateMatchNoteCount (current_matches.Count);
+ }
}
void AddMatchesColumn ()
@@ -593,6 +603,51 @@ namespace Tomboy
status_bar.Pop (0);
status_bar.Push (0, status);
}
+
+ // called when no search results are found in the selected notebook
+ void NoMatchesFoundAction ()
+ {
+ hpaned.Remove (matches_window);
+ String message = Catalog.GetString ("No results found " +
+ "in the selected notebook.\nClick here to " +
+ "search across all notes.");
+ Gtk.LinkButton link_button = new Gtk.LinkButton ("", message);
+ Gtk.LinkButton.SetUriHook(ShowAllSearchResults);
+ link_button.TooltipText = Catalog.GetString
+ ("Click here to search across all notebooks");
+ link_button.Show();
+ Gtk.Table no_matches_found_table = new Gtk.Table (1, 3, false);
+ no_matches_found_table.Attach (link_button, 1, 2, 0, 1,
+ Gtk.AttachOptions.Fill | Gtk.AttachOptions.Shrink,
+ Gtk.AttachOptions.Shrink,
+ 0, 0
+ );
+
+ no_matches_found_table.ColumnSpacing = 4;
+ no_matches_found_table.ShowAll ();
+ no_matches_box = new HBox (false, 0);
+ no_matches_box.PackStart (no_matches_found_table, true, true, 0);
+ no_matches_box.Show ();
+ hpaned.Add2 (no_matches_box);
+ }
+
+ void RestoreMatchesWindow ()
+ {
+ if (no_matches_box != null) {
+ hpaned.Remove (no_matches_box);
+ hpaned.Add2 (matches_window);
+ no_matches_box = null;
+ RestorePosition();
+ }
+ }
+
+ private void ShowAllSearchResults (Gtk.LinkButton button, String param)
+ {
+ TreeIter iter;
+ notebooksTree.Model.GetIterFirst (out iter);
+ notebooksTree.Selection.SelectIter (iter);
+ }
+
/// <summary>
/// Filter out notes based on the current search string
@@ -681,17 +736,20 @@ namespace Tomboy
void OnNotesChanged (object sender, Note changed)
{
+ RestoreMatchesWindow ();
UpdateResults ();
}
void OnNoteRenamed (Note note, string old_title)
{
+ RestoreMatchesWindow ();
UpdateResults ();
}
void OnNoteSaved (Note note)
{
var rect = tree.VisibleRect;
+ RestoreMatchesWindow ();
UpdateResults ();
tree.ScrollToPoint (rect.X, rect.Y);
}
@@ -1221,6 +1279,8 @@ namespace Tomboy
entry_changed_timeout.Reset (500);
clear_search_button.Sensitive = true;
}
+
+ RestoreMatchesWindow ();
}
// Called in after .5 seconds of typing inactivity, or on
@@ -1297,13 +1357,16 @@ namespace Tomboy
if (notebook is Notebooks.SpecialNotebook) {
// Bold the "Special" Notebooks
crt.Markup = string.Format ("<span weight=\"bold\">{0}</span>", notebook.Name);
+ crt.Editable = false;
} else {
crt.Text = notebook.Name;
+ crt.Editable = true;
}
}
private void OnNotebookSelectionChanged (object sender, EventArgs args)
{
+ RestoreMatchesWindow ();
Notebooks.Notebook notebook = GetSelectedNotebook ();
if (notebook == null) {
// Clear out the currently selected tags so that no notebook is selected
@@ -1473,11 +1536,13 @@ namespace Tomboy
private void OnNoteAddedToNotebook (Note note, Notebooks.Notebook notebook)
{
+ RestoreMatchesWindow ();
UpdateResults ();
}
private void OnNoteRemovedFromNotebook (Note note, Notebooks.Notebook notebook)
{
+ RestoreMatchesWindow ();
UpdateResults ();
}
diff --git a/Tomboy/Tomboy.cs b/Tomboy/Tomboy.cs
index 2098a1e..a8a73b4 100644
--- a/Tomboy/Tomboy.cs
+++ b/Tomboy/Tomboy.cs
@@ -368,12 +368,15 @@ namespace Tomboy
"\tJP Rosevear",
"\tKevin Kubasik",
"\tLaurent Bedubourg",
+ "\tLukas Vacek",
"\tŁukasz Jernaś",
"\tMark Wakim",
"\tMathias Hasselmann",
"\tMatthew Pirocchi",
"\tMatt Johnston",
"\tMatt Jones",
+ "\tMatt Rajca",
+ "\tMax Lin",
"\tMichael Fletcher",
"\tMike Mazur",
"\tNathaniel Smith",
@@ -550,8 +553,10 @@ namespace Tomboy
Catalog.GetString (
"Tomboy: A simple, easy to use desktop note-taking " +
"application.\n" +
- "Copyright (C) 2004-2006 Alex Graveley " +
- "<alex at beatniksoftware.com>\n\n");
+ "Copyright \xa9 2004-2007 Alex Graveley\n" +
+ "<alex at beatniksoftware.com>\n\n" +
+ "Copyright \xa9 2004-2011 Others\n"
+ );
Console.Write (about);
}
diff --git a/Tomboy/Watchers.cs b/Tomboy/Watchers.cs
index 105205e..4c906d8 100644
--- a/Tomboy/Watchers.cs
+++ b/Tomboy/Watchers.cs
@@ -374,7 +374,45 @@ namespace Tomboy
Gtk.TextMark click_mark;
const string URL_REGEX =
- @"((\b((news|http|https|ftp|file|irc)://|mailto:|(www|ftp)\.|\S*@\S*\.)|(?<=^|\s)/\S+/|(?<=^|\s)~/\S+)\S*\b/?)";
+ //@"((\b((news|http|https|ftp|file|irc)://|mailto:|(www|ftp)\.|\S*@\S*\.)|(?<=^|\s)/\S+/|(?<=^|\s)~/\S+)\S*\b/?)";
+ @"("+
+ @"(("+
+ @"((?<=(?<starter>("+ // preceded by a starter
+ @"(?<starterA>(\())"+ // opening parenthesis closed by )
+ @"|(?<starterB>(\[))"+ // or opening bracket closed by ]
+ @"|(?<starterC>(\{))"+ // or opening thing closed by }
+ @")))"+
+ @"|\b)"+ // or at beginning of a word \b
+ @"("+
+ @"(news|http|https|ftp|file|irc)://"+ // http:// ...
+ @"|mailto:"+ // or mailto...
+ @"|(www|ftp)\."+ // or www...
+ @"|\S*@\S*\."+ // or email adress
+ @")"+
+ @")"+
+ @"|("+
+ @"((?<=(?<starter>("+ // preceded by a starter
+ @"(?<starterA>(\())"+ // opening parenthesis closed by )
+ @"|(?<starterB>(\[))"+ // or opening bracket closed by ]
+ @"|(?<starterC>(\{))"+ // or opening thing closed by }
+ @")))"+
+ @"|(?<=^|\s))"+
+ @"("+
+ @"(/\S+/)"+ // or starting with '/'
+ @"|(~/\S+?)"+ // or starting with '~/'
+ @")"+
+ @"))"+
+ @"(?(starter)"+ //
+ @"(\S(?!("+ // if starter detected : forbid ender
+ //ignore this comment (for syntax) ([{
+ @"(?(starterA)\)|"+ // closing parenthesis
+ @"(?(starterB)\]|"+ // closing bracket
+ @"(?(starterC)\})))"+ // closing thing
+ @")))*\S?"+
+ @"|\S*/?"+ // else anything without space
+ @")"+
+ @")";
+
static Regex regex;
diff --git a/aclocal.m4 b/aclocal.m4
index facceb5..7ff8cdc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -802,7 +802,8 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -811,7 +812,8 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -838,7 +840,7 @@ m4_define([_LT_COPYING], [dnl
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
-# serial 56 LT_INIT
+# serial 57 LT_INIT
# LT_PREREQ(VERSION)
@@ -867,6 +869,7 @@ esac
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -883,6 +886,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
@@ -919,7 +924,7 @@ m4_defun([_LT_CC_BASENAME],
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
])
@@ -939,6 +944,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
@@ -980,7 +988,6 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
case $host_os in
aix3*)
@@ -994,23 +1001,6 @@ aix3*)
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -1051,6 +1041,28 @@ _LT_CONFIG_COMMANDS
])# _LT_SETUP
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
@@ -1203,7 +1215,7 @@ m4_define([_lt_decl_all_varnames],
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
# _LT_CONFIG_STATUS_DECLARATIONS
@@ -1213,7 +1225,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -1312,12 +1324,20 @@ LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
# Quote evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1328,9 +1348,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1338,16 +1358,38 @@ for var in lt_decl_all_varnames([[ \
esac
done
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
- ;;
-esac
-
_LT_OUTPUT_LIBTOOL_INIT
])
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable. If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins. After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script. The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
# ---------
@@ -1357,20 +1399,11 @@ _LT_OUTPUT_LIBTOOL_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
@@ -1396,7 +1429,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
@@ -1441,15 +1474,13 @@ chmod +x "$CONFIG_LT"
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
- lt_cl_success=:
- test "$silent" = yes &&
- lt_config_lt_args="$lt_config_lt_args --quiet"
- exec AS_MESSAGE_LOG_FD>/dev/null
- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
- exec AS_MESSAGE_LOG_FD>>config.log
- $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
])# LT_OUTPUT
@@ -1626,11 +1657,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
dnl AC_DEFUN([AC_LIBTOOL_F77], [])
dnl AC_DEFUN([AC_LIBTOOL_FC], [])
dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
# _LT_TAG_COMPILER
@@ -1735,6 +1768,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+ [lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+ ])
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -1762,7 +1820,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1782,7 +1840,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -1790,7 +1852,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1836,170 +1898,65 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
# _LT_PROG_ECHO_BACKSLASH
# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-[$]*
-_LT_EOF
- exit 0
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
fi
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
-fi
+case "$ECHO" in
+ printf*) AC_MSG_RESULT([printf]) ;;
+ print*) AC_MSG_RESULT([print -r]) ;;
+ *) AC_MSG_RESULT([cat]) ;;
+esac
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test "X`printf %s $ECHO`" = "X$ECHO" \
+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-AC_SUBST(lt_ECHO)
-])
_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
- [An echo program that does not interpret backslashes])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
])# _LT_PROG_ECHO_BACKSLASH
@@ -2031,7 +1988,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
@@ -2183,10 +2140,19 @@ if test -n "$RANLIB"; then
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
_LT_DECL([], [old_postinstall_cmds], [2])
_LT_DECL([], [old_postuninstall_cmds], [2])
_LT_TAGDECL([], [old_archive_cmds], [2],
[Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+ [Whether to use a lock for old archive extraction])
])# _LT_CMD_OLD_ARCHIVE
@@ -2211,15 +2177,15 @@ AC_CACHE_CHECK([$1], [$2],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -2259,7 +2225,7 @@ AC_CACHE_CHECK([$1], [$2],
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -2322,6 +2288,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -2386,8 +2357,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -2438,7 +2409,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -2479,7 +2450,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -2488,7 +2465,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -2664,16 +2645,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2832,6 +2813,7 @@ m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
@@ -2840,16 +2822,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -2862,7 +2851,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -2882,7 +2871,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
@@ -2970,7 +2965,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -3023,23 +3018,12 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -3096,7 +3080,14 @@ freebsd* | dragonfly*)
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -3107,6 +3098,12 @@ freebsd* | dragonfly*)
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -3139,6 +3136,19 @@ gnu*)
hardcode_into_libs=yes
;;
+haiku*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -3181,8 +3191,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[[3-9]]*)
@@ -3249,16 +3261,21 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
- [shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+ [lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+ [lt_cv_shlibpath_overrides_runpath=yes])])
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+ ])
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -3267,7 +3284,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -3280,18 +3297,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3512,6 +3517,8 @@ _LT_DECL([], [library_names_spec], [1],
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+ [Permission mode override for installation of shared libraries])
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
@@ -3624,6 +3631,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
@@ -3753,8 +3761,8 @@ case $host_os in
fi
;;
esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
@@ -3806,16 +3814,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc)
+cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3845,6 +3855,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -3853,11 +3867,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -3883,7 +3897,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4021,7 +4035,19 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -4034,13 +4060,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -4063,7 +4089,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -4091,7 +4117,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+ esac
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
@@ -4108,6 +4139,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
@@ -4233,7 +4265,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -4395,6 +4427,11 @@ m4_if([$1], [CXX], [
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
@@ -4533,8 +4570,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xlc* | xlC*)
- # IBM XL 8.0 on PPC
+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+ # IBM XL 8.0, 9.0 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -4564,7 +4601,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4596,7 +4633,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4700,6 +4737,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -4742,6 +4785,13 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -4805,7 +4855,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4817,25 +4867,25 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
esac
;;
@@ -4867,7 +4917,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4977,8 +5027,10 @@ m4_if([$1], [CXX], [
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global defined
+ # symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4989,9 +5041,6 @@ m4_if([$1], [CXX], [
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5056,13 +5105,36 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5096,11 +5168,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
_LT_EOF
fi
@@ -5136,6 +5209,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5157,6 +5231,11 @@ _LT_EOF
fi
;;
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5186,11 +5265,12 @@ _LT_EOF
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -5201,13 +5281,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -5223,17 +5307,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -5242,7 +5326,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5354,8 +5438,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global
+ # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5417,7 +5503,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5445,7 +5530,7 @@ _LT_EOF
# empty executable.
_LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5460,8 +5545,13 @@ _LT_EOF
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -5500,7 +5590,7 @@ _LT_EOF
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
@@ -5567,7 +5657,7 @@ _LT_EOF
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -5586,7 +5676,7 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -5607,7 +5697,14 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ m4_if($1, [], [
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ _LT_LINKER_OPTION([if $CC understands -b],
+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
;;
esac
fi
@@ -5635,19 +5732,19 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
AC_LINK_IFELSE(int foo(void) {},
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
)
LDFLAGS="$save_LDFLAGS"
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5656,7 +5753,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -5709,17 +5806,17 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5729,13 +5826,13 @@ _LT_EOF
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5926,36 +6023,38 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
- _LT_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
- then
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+ [$RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+ then
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ else
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ ])
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
;;
esac
fi
@@ -6121,37 +6220,21 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
# _LT_LANG_CXX_CONFIG([TAG])
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
# the compiler configuration to `libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+else
+ _lt_caught_CXX_error=yes
+fi
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -6173,6 +6256,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6275,7 +6360,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
GXX=no
@@ -6387,7 +6472,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -6402,8 +6487,13 @@ if test "$_lt_caught_CXX_error" != yes; then
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
@@ -6436,6 +6526,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -6496,6 +6587,11 @@ if test "$_lt_caught_CXX_error" != yes; then
gnu*)
;;
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -6520,7 +6616,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes; then
@@ -6585,7 +6681,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes; then
@@ -6628,7 +6724,7 @@ if test "$_lt_caught_CXX_error" != yes; then
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -6639,9 +6735,9 @@ if test "$_lt_caught_CXX_error" != yes; then
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6670,7 +6766,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6707,26 +6803,26 @@ if test "$_lt_caught_CXX_error" != yes; then
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
$RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
- *) # Version 6 will use weak symbols
+ *) # Version 6 and above use weak symbols
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
@@ -6734,7 +6830,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -6753,9 +6849,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
- xl*)
+ xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6775,13 +6871,13 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
# would be better.
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6850,7 +6946,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6885,15 +6981,15 @@ if test "$_lt_caught_CXX_error" != yes; then
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
@@ -6909,17 +7005,17 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
@@ -6929,7 +7025,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# FIXME: insert proper C++ library support
@@ -6965,7 +7061,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6986,7 +7082,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -7013,7 +7109,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -7024,7 +7120,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -7078,6 +7174,10 @@ if test "$_lt_caught_CXX_error" != yes; then
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -7324,7 +7424,7 @@ linux*)
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
@@ -7368,32 +7468,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
])# _LT_SYS_HIDDEN_LIBDEPS
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
# _LT_LANG_F77_CONFIG([TAG])
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7412,6 +7496,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7511,32 +7597,17 @@ AC_LANG_POP
])# _LT_LANG_F77_CONFIG
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
# _LT_LANG_FC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7555,6 +7626,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7700,6 +7773,8 @@ _LT_CC_BASENAME([$compiler])
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
if test -n "$compiler"; then
_LT_COMPILER_NO_RTTI($1)
@@ -8061,7 +8136,7 @@ _LT_EOF
func_dirname ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
@@ -8072,7 +8147,7 @@ func_dirname ()
# func_basename file
func_basename ()
{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
}
dnl func_dirname_and_basename
@@ -8088,10 +8163,8 @@ dnl so there is no need for it here.
func_stripname ()
{
case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
esac
}
@@ -8102,20 +8175,20 @@ my_sed_long_arg='1s/^-[[^=]]*=//'
# func_opt_split
func_opt_split ()
{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
}
# func_lo2o object
func_lo2o ()
{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
}
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
}
# func_arith arithmetic-term...
@@ -8163,14 +8236,15 @@ _LT_EOF
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -8285,7 +8359,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -8293,13 +8367,13 @@ case $host in
esac
test -z "$AS" && AS=as
-_LT_DECL([], [AS], [0], [Assembler program])dnl
+_LT_DECL([], [AS], [1], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -8659,29 +8733,29 @@ m4_define([lt_dict_filter],
# Generated from ltversion.in.
-# serial 3017 ltversion.m4
+# serial 3175 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.2.10])
+m4_define([LT_PACKAGE_REVISION], [1.3175])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.2.10'
+macro_revision='1.3175'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
@@ -8751,7 +8825,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -8764,6 +8837,13 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
@@ -8946,7 +9026,7 @@ path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/config.guess b/config.guess
index c2246a4..e1f34b5 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-12-30'
+timestamp='2010-09-24'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -92,7 +92,7 @@ if test $# != 0; then
exit 1
fi
-trap 'exit 1' 1 2 15
+trap 'exit 1' HUP INT TERM
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
@@ -106,7 +106,7 @@ trap 'exit 1' 1 2 15
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -140,6 +140,29 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU/*)
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #ifdef __UCLIBC__
+ # ifdef __UCLIBC_CONFIG_VERSION__
+ LIBC=uclibc __UCLIBC_CONFIG_VERSION__
+ # else
+ LIBC=uclibc
+ # endif
+ #else
+ # ifdef __dietlibc__
+ LIBC=dietlibc
+ # else
+ LIBC=gnu
+ # endif
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -552,7 +575,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -849,11 +872,11 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
@@ -869,50 +892,42 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo cris-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo crisv32-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo frv-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -931,51 +946,54 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo or32-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-tilera-linux-gnu
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo x86_64-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1231,6 +1249,9 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
+ NEO-?:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk${UNAME_RELEASE}
+ exit ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
diff --git a/config.sub b/config.sub
index c2d1257..216604d 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2010-01-22'
+timestamp='2010-09-11'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -124,8 +124,9 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -252,7 +253,7 @@ case $basic_machine in
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
+ | d10v | d30v | dlx | dsp16xx | dvp \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
@@ -282,6 +283,7 @@ case $basic_machine in
| moxie \
| mt \
| msp430 \
+ | nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
| or32 \
@@ -295,7 +297,7 @@ case $basic_machine in
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
+ | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| we32k \
@@ -303,6 +305,15 @@ case $basic_machine in
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
+ c55x)
+ basic_machine=tic55x-unknown
+ ;;
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -334,7 +345,7 @@ case $basic_machine in
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
@@ -368,6 +379,7 @@ case $basic_machine in
| mmix-* \
| mt-* \
| msp430-* \
+ | nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
@@ -482,6 +494,15 @@ case $basic_machine in
basic_machine=powerpc-ibm
os=-cnk
;;
+ c54x-*)
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c55x-*)
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c6x-*)
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -752,6 +773,24 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
+ mipsEE* | ee | ps2)
+ basic_machine=mips64r5900el-scei
+ case $os in
+ -linux*)
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
+ iop)
+ basic_machine=mipsel-scei
+ os=-irx
+ ;;
+ dvp)
+ basic_machine=dvp-scei
+ os=-elf
+ ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
@@ -841,6 +880,12 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
+ neo-tandem)
+ basic_machine=neo-tandem
+ ;;
+ nse-tandem)
+ basic_machine=nse-tandem
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -1075,18 +1120,6 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
- tic55x | c55x*)
- basic_machine=tic55x-unknown
- os=-coff
- ;;
- tic6x | c6x*)
- basic_machine=tic6x-unknown
- os=-coff
- ;;
# This must be matched before tile*.
tilegx*)
basic_machine=tilegx-unknown
@@ -1301,11 +1334,12 @@ case $os in
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -1484,6 +1518,15 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
+ tic54x-*)
+ os=-coff
+ ;;
+ tic55x-*)
+ os=-coff
+ ;;
+ tic6x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
diff --git a/configure b/configure
index 8f2527d..e784675 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for tomboy 1.7.0.
+# Generated by GNU Autoconf 2.65 for tomboy 1.7.1.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -171,7 +171,15 @@ test x\$exitcode = x0 || exit 1"
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1
+
+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
else
@@ -316,7 +324,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -356,19 +364,19 @@ else
fi # as_fn_arith
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -525,161 +533,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-$*
-_LT_EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "$0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -698,8 +559,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='tomboy'
PACKAGE_TARNAME='tomboy'
-PACKAGE_VERSION='1.7.0'
-PACKAGE_STRING='tomboy 1.7.0'
+PACKAGE_VERSION='1.7.1'
+PACKAGE_STRING='tomboy 1.7.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -827,7 +688,6 @@ OTOOL
LIPO
NMEDIT
DSYMUTIL
-lt_ECHO
RANLIB
AR
OBJDUMP
@@ -1098,9 +958,8 @@ do
fi
case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1145,7 +1004,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1171,7 +1030,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1375,7 +1234,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1391,7 +1250,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1421,8 +1280,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
@@ -1430,7 +1289,7 @@ Try \`$0 --help' for more information"
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1448,13 +1307,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1477,7 +1336,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1491,8 +1350,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1507,9 +1366,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1548,11 +1407,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1578,7 +1437,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures tomboy 1.7.0 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.7.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1592,7 +1451,7 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1652,7 +1511,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tomboy 1.7.0:";;
+ short | recursive ) echo "Configuration of tomboy 1.7.1:";;
esac
cat <<\_ACEOF
@@ -1816,10 +1675,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tomboy configure 1.7.0
-generated by GNU Autoconf 2.67
+tomboy configure 1.7.1
+generated by GNU Autoconf 2.65
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1922,7 +1781,7 @@ ac_fn_c_check_func ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2002,7 +1861,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
+ test $ac_status = 0; } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -2069,7 +1928,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2099,10 +1958,10 @@ $as_echo "$ac_res" >&6; }
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2138,7 +1997,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -2165,7 +2024,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2181,8 +2040,8 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tomboy $as_me 1.7.0, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+It was created by tomboy $as_me 1.7.1, which was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2292,9 +2151,11 @@ trap 'exit_status=$?
{
echo
- $as_echo "## ---------------- ##
+ cat <<\_ASBOX
+## ---------------- ##
## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2328,9 +2189,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
- $as_echo "## ----------------- ##
+ cat <<\_ASBOX
+## ----------------- ##
## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_vars
do
@@ -2343,9 +2206,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ cat <<\_ASBOX
+## ------------------- ##
## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_files
do
@@ -2359,9 +2224,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ cat <<\_ASBOX
+## ----------- ##
## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
echo
cat confdefs.h
echo
@@ -2416,12 +2283,7 @@ _ACEOF
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2436,11 +2298,7 @@ do
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+ . "$ac_site_file"
fi
done
@@ -2516,7 +2374,7 @@ if $ac_cache_corrupted; then
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2534,22 +2392,16 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2665,11 +2517,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2691,7 +2543,7 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -2701,7 +2553,7 @@ then
# Ok.
:
else
- as_fn_error $? "newly created file is older than distributed files!
+ as_fn_error "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2939,7 +2791,7 @@ done
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2947,7 +2799,7 @@ SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2981,7 +2833,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -2997,7 +2849,7 @@ fi
# Define the identity of the package.
PACKAGE='tomboy'
- VERSION='1.7.0'
+ VERSION='1.7.1'
cat >>confdefs.h <<_ACEOF
@@ -3305,7 +3157,7 @@ $as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
fi
@@ -3752,8 +3604,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3867,8 +3719,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3910,8 +3763,8 @@ done
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3968,9 +3821,9 @@ $as_echo "$ac_try_echo"; } >&5
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
@@ -4021,8 +3874,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -4374,7 +4227,7 @@ fi
case "$am__api_version" in
1.01234)
- as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
;;
*)
;;
@@ -4391,7 +4244,7 @@ $as_echo_n "checking for intltool >= 0.35... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- as_fn_error $? "Your intltool is too old. You need intltool 0.35 or later." "$LINENO" 5
+ as_fn_error "Your intltool is too old. You need intltool 0.35 or later." "$LINENO" 5
fi
# Extract the first word of "intltool-update", so it can be a program name with args.
@@ -4515,7 +4368,7 @@ fi
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -4797,13 +4650,13 @@ fi
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
# Extract the first word of "perl", so it can be a program name with args.
@@ -4847,13 +4700,13 @@ fi
if test -z "$INTLTOOL_PERL"; then
- as_fn_error $? "perl not found" "$LINENO" 5
+ as_fn_error "perl not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
if test $? -ne 0; then
- as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
else
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
@@ -4866,7 +4719,7 @@ $as_echo_n "checking for XML::Parser... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
else
- as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
fi
fi
@@ -5214,8 +5067,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -5679,7 +5532,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -5695,11 +5548,11 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -5738,7 +5591,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -5754,18 +5607,18 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -5826,7 +5679,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -5892,7 +5745,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -6057,8 +5910,8 @@ esac
-macro_version='2.2.6b'
-macro_revision='1.3017'
+macro_version='2.2.10'
+macro_revision='1.3175'
@@ -6076,7 +5929,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@ -6087,16 +5940,16 @@ else
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -6121,7 +5974,7 @@ else
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -6129,7 +5982,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -6145,6 +5998,75 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
+else
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO ""
+}
+
+case "$ECHO" in
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if test "${ac_cv_path_SED+set}" = set; then :
@@ -6202,7 +6124,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -6281,7 +6203,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -6397,7 +6319,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -6480,8 +6402,11 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$ac_tool_prefix"; then
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6525,7 +6450,7 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6580,6 +6505,15 @@ esac
fi
fi
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -6599,13 +6533,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6602: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6605: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6608: output\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6651,6 +6585,11 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -6715,8 +6654,8 @@ else
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -6987,16 +6926,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc)
+cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -7026,6 +6967,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -7034,11 +6979,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -7064,7 +7009,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -7476,6 +7421,18 @@ if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
@@ -7645,8 +7602,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
@@ -7799,7 +7756,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7802 "configure"' > conftest.$ac_ext
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8511,6 +8468,38 @@ rm -f core conftest.err conftest.$ac_objext \
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if test "${lt_cv_ld_force_load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+ echo "$AR cru libconftest.a conftest.o" >&5
+ $AR cru libconftest.a conftest.o 2>&5
+ echo "$RANLIB libconftest.a" >&5
+ $RANLIB libconftest.a 2>&5
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -8538,7 +8527,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -8553,7 +8542,8 @@ do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -8578,6 +8568,8 @@ done
+
+
# Set options
@@ -8700,6 +8692,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
test -z "$LN_S" && LN_S="ln -s"
@@ -8749,19 +8742,6 @@ _ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
@@ -8774,23 +8754,6 @@ aix3*)
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -8819,7 +8782,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
# Only perform the check for file, if the check method requires it
@@ -9024,7 +8987,12 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+ *)
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
@@ -9044,15 +9012,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9047: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9051: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
@@ -9130,6 +9098,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ lt_prog_compiler_static=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -9172,6 +9146,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ lt_prog_compiler_wl='-Xlinker '
+ lt_prog_compiler_pic='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -9234,7 +9215,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
@@ -9246,25 +9227,25 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-qpic'
lt_prog_compiler_static='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_wl=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
+ lt_prog_compiler_wl='-Wl,'
;;
esac
;;
@@ -9296,7 +9277,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
@@ -9383,15 +9364,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9386: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9390: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
@@ -9439,7 +9420,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
@@ -9488,16 +9469,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9491: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9495: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -9543,16 +9524,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9546: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9550: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -9662,13 +9643,36 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -9702,11 +9706,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
_LT_EOF
fi
@@ -9742,6 +9747,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
+ export_dynamic_flag_spec='${wl}--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -9763,6 +9769,11 @@ _LT_EOF
fi
;;
+ haiku*)
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -9792,11 +9803,12 @@ _LT_EOF
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -9807,13 +9819,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -9829,17 +9845,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
hardcode_libdir_flag_spec=
hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -9848,7 +9864,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -9960,8 +9976,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global
+ # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -10023,7 +10041,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -10080,7 +10097,7 @@ rm -f core conftest.err conftest.$ac_objext \
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -10124,8 +10141,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
+ fi
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -10164,7 +10186,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
old_archive_from_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -10180,7 +10202,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ else
+ whole_archive_flag_spec=''
+ fi
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -10188,7 +10214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -10254,7 +10280,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -10273,7 +10299,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -10294,7 +10320,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if test "${lt_cv_prog_compiler__b+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler__b=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -b"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler__b=yes
+ fi
+ else
+ lt_cv_prog_compiler__b=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
;;
esac
fi
@@ -10322,7 +10387,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
@@ -10333,15 +10398,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
int foo(void) {}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10350,7 +10415,7 @@ rm -f core conftest.err conftest.$ac_objext \
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -10403,17 +10468,17 @@ rm -f core conftest.err conftest.$ac_objext \
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10423,13 +10488,13 @@ rm -f core conftest.err conftest.$ac_objext \
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10632,44 +10697,50 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
- pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- then
- archive_cmds_need_lc=no
- else
- archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+ then
+ lt_cv_archive_cmds_need_lc=no
+ else
+ lt_cv_archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
;;
esac
fi
@@ -10840,16 +10911,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -10862,7 +10940,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -10882,7 +10960,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
@@ -10970,7 +11054,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -11023,23 +11107,12 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -11096,7 +11169,14 @@ freebsd* | dragonfly*)
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -11107,6 +11187,12 @@ freebsd* | dragonfly*)
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -11139,6 +11225,19 @@ gnu*)
hardcode_into_libs=yes
;;
+haiku*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -11181,8 +11280,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[3-9]*)
@@ -11249,12 +11350,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -11267,13 +11373,17 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
- shlibpath_overrides_runpath=yes
+ lt_cv_shlibpath_overrides_runpath=yes
fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
+fi
+
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -11282,7 +11392,7 @@ rm -f core conftest.err conftest.$ac_objext \
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -11295,18 +11405,6 @@ rm -f core conftest.err conftest.$ac_objext \
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -11597,6 +11695,11 @@ fi
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
@@ -11927,7 +12030,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11930 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11968,7 +12071,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11977,7 +12086,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -12023,7 +12136,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12026 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12064,7 +12177,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -12073,7 +12192,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -13047,7 +13170,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&
if test "${enable_schemas_install+set}" = set; then :
enableval=$enable_schemas_install; case ${enableval} in
yes|no) ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
esac
fi
@@ -13105,7 +13228,7 @@ fi
if test "x$GMCS" = "x" ; then
- as_fn_error $? "Can't find \"gmcs\" in your PATH" "$LINENO" 5
+ as_fn_error "Can't find \"gmcs\" in your PATH" "$LINENO" 5
fi
#
@@ -13169,7 +13292,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$MONO_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (mono >= $MONO_MINIMUM_VERSION) were not met:
+ as_fn_error "Package requirements (mono >= $MONO_MINIMUM_VERSION) were not met:
$MONO_PKG_ERRORS
@@ -13184,7 +13307,7 @@ elif test $pkg_failed = untried; then
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13193,7 +13316,7 @@ and MONO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
else
MONO_CFLAGS=$pkg_cv_MONO_CFLAGS
MONO_LIBS=$pkg_cv_MONO_LIBS
@@ -13282,7 +13405,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$LIBTOMBOY_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gdk-2.0 >= $GDK20_MINIMUM_VERSION
+ as_fn_error "Package requirements (gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
atk >= $ATK_MINIMUM_VERSION) were not met:
@@ -13299,7 +13422,7 @@ elif test $pkg_failed = untried; then
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13308,7 +13431,7 @@ and LIBTOMBOY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
else
LIBTOMBOY_CFLAGS=$pkg_cv_LIBTOMBOY_CFLAGS
LIBTOMBOY_LIBS=$pkg_cv_LIBTOMBOY_LIBS
@@ -13352,7 +13475,7 @@ if test "${enable_panelapplet_srvdir_check+set}" = set; then :
enableval=$enable_panelapplet_srvdir_check; case "$enableval" in
yes) ENABLE_PANELAPPLET_SRVDIR_CHECK=yes ;;
no) ENABLE_PANELAPPLET_SRVDIR_CHECK=no ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-panelapplet-srvdir-check" "$LINENO" 5 ;;
+ *) as_fn_error "bad value ${enableval} for --enable-panelapplet-srvdir-check" "$LINENO" 5 ;;
esac
else
ENABLE_PANELAPPLET_SRVDIR_CHECK=yes
@@ -13570,7 +13693,7 @@ fi
if ((test "x$ENABLE_GNOME" = "xyes") && (test "x$ENABLE_WIN" = "xyes")) || ((test "x$ENABLE_GNOME" = "xyes") && (test "x$ENABLE_OSX" = "xyes")) || ((test "x$ENABLE_OSX" = "xyes") && (test "x$ENABLE_WIN" = "xyes")) ; then
- as_fn_error $? "--enable-gnome, --enable-windows, and --enable-osx are mutually exclusive" "$LINENO" 5
+ as_fn_error "--enable-gnome, --enable-windows, and --enable-osx are mutually exclusive" "$LINENO" 5
fi
if (test "x$ENABLE_WIN" = "xno") && (test "x$ENABLE_OSX" = "xno") ; then
@@ -13691,7 +13814,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3) were not met:
+ as_fn_error "Package requirements (dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3) were not met:
$DBUS_PKG_ERRORS
@@ -13706,7 +13829,7 @@ elif test $pkg_failed = untried; then
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13715,7 +13838,7 @@ and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -13801,7 +13924,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$MONO_ADDINS_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (mono-addins >= 0.3 \
+ as_fn_error "Package requirements (mono-addins >= 0.3 \
mono-addins-gui >= 0.3 \
mono-addins-setup >= 0.3) were not met:
@@ -13818,7 +13941,7 @@ elif test $pkg_failed = untried; then
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13827,7 +13950,7 @@ and MONO_ADDINS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
else
MONO_ADDINS_CFLAGS=$pkg_cv_MONO_ADDINS_CFLAGS
MONO_ADDINS_LIBS=$pkg_cv_MONO_ADDINS_LIBS
@@ -13854,18 +13977,15 @@ if test -n "$GNOME_CFLAGS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-sharp-2.0 >= \$GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24\""; } >&5
($PKG_CONFIG --exists --print-errors "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24" 2>/dev/null`
else
pkg_failed=yes
@@ -13879,18 +13999,15 @@ if test -n "$GNOME_LIBS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-sharp-2.0 >= \$GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24\""; } >&5
($PKG_CONFIG --exists --print-errors "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24" 2>/dev/null`
else
pkg_failed=yes
@@ -13913,20 +14030,17 @@ fi
if test $_pkg_short_errors_supported = yes; then
GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24" 2>&1`
else
GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
+ as_fn_error "Package requirements (gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24) were not met:
$GNOME_PKG_ERRORS
@@ -13942,7 +14056,7 @@ elif test $pkg_failed = untried; then
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -13951,7 +14065,7 @@ and GNOME_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
else
GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
GNOME_LIBS=$pkg_cv_GNOME_LIBS
@@ -13969,15 +14083,12 @@ if test -n "$GNOME_CFLAGS"; then
pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0
- gconf-sharp-peditors-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gconf-sharp-2.0
- gconf-sharp-peditors-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gconf-sharp-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gconf-sharp-2.0
- gconf-sharp-peditors-2.0" 2>/dev/null`
+ pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gconf-sharp-2.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13988,15 +14099,12 @@ if test -n "$GNOME_LIBS"; then
pkg_cv_GNOME_LIBS="$GNOME_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0
- gconf-sharp-peditors-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gconf-sharp-2.0
- gconf-sharp-peditors-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gconf-sharp-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gconf-sharp-2.0
- gconf-sharp-peditors-2.0" 2>/dev/null`
+ pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gconf-sharp-2.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -14016,17 +14124,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-sharp-2.0
- gconf-sharp-peditors-2.0" 2>&1`
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-sharp-2.0" 2>&1`
else
- GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-sharp-2.0
- gconf-sharp-peditors-2.0" 2>&1`
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-sharp-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gconf-sharp-2.0
- gconf-sharp-peditors-2.0) were not met:
+ as_fn_error "Package requirements (gconf-sharp-2.0) were not met:
$GNOME_PKG_ERRORS
@@ -14041,7 +14146,7 @@ elif test $pkg_failed = untried; then
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -14050,7 +14155,7 @@ and GNOME_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
else
GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
GNOME_LIBS=$pkg_cv_GNOME_LIBS
@@ -14119,7 +14224,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GTKSHARP_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION) were not met:
+ as_fn_error "Package requirements (gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION) were not met:
$GTKSHARP_PKG_ERRORS
@@ -14134,7 +14239,7 @@ elif test $pkg_failed = untried; then
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -14143,7 +14248,7 @@ and GTKSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
else
GTKSHARP_CFLAGS=$pkg_cv_GTKSHARP_CFLAGS
GTKSHARP_LIBS=$pkg_cv_GTKSHARP_LIBS
@@ -14175,7 +14280,7 @@ $as_echo "found" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
- as_fn_error $? "missing reqired Mono 2.0 assembly: $asm.dll" "$LINENO" 5
+ as_fn_error "missing reqired Mono 2.0 assembly: $asm.dll" "$LINENO" 5
fi
done
@@ -14595,7 +14700,7 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
+ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -14613,7 +14718,7 @@ libdir:
@echo libdir='${LIBDIR}'
_ACEOF
if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
for ac_var in incroot usrlibdir libdir; do
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
@@ -14699,7 +14804,7 @@ else
fi
done
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
if test "$ac_x_libraries" = no; then
@@ -15277,7 +15382,7 @@ fi
if test "x$HAVE_X" = "xno"
then
- as_fn_error $? "cannot find X11 development files" "$LINENO" 5
+ as_fn_error "cannot find X11 development files" "$LINENO" 5
else
X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
X_LIBS="$X_LIBS -lX11"
@@ -15398,7 +15503,6 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -15422,23 +15526,23 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_SK\" was never defined.
+ as_fn_error "conditional \"ENABLE_SK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -15446,67 +15550,67 @@ fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
- as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAS_GTK_2_16_TRUE}" && test -z "${HAS_GTK_2_16_FALSE}"; then
- as_fn_error $? "conditional \"HAS_GTK_2_16\" was never defined.
+ as_fn_error "conditional \"HAS_GTK_2_16\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAS_GTK_2_20_TRUE}" && test -z "${HAS_GTK_2_20_FALSE}"; then
- as_fn_error $? "conditional \"HAS_GTK_2_20\" was never defined.
+ as_fn_error "conditional \"HAS_GTK_2_20\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE}" && test -z "${ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_PANELAPPLET_SRVDIR_CHECK\" was never defined.
+ as_fn_error "conditional \"ENABLE_PANELAPPLET_SRVDIR_CHECK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${FIXED_GTKSPELL_TRUE}" && test -z "${FIXED_GTKSPELL_FALSE}"; then
- as_fn_error $? "conditional \"FIXED_GTKSPELL\" was never defined.
+ as_fn_error "conditional \"FIXED_GTKSPELL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_UPDATE_MIMEDB_TRUE}" && test -z "${ENABLE_UPDATE_MIMEDB_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_UPDATE_MIMEDB\" was never defined.
+ as_fn_error "conditional \"ENABLE_UPDATE_MIMEDB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_WIN_TRUE}" && test -z "${ENABLE_WIN_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_WIN\" was never defined.
+ as_fn_error "conditional \"ENABLE_WIN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_OSX_TRUE}" && test -z "${ENABLE_OSX_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_OSX\" was never defined.
+ as_fn_error "conditional \"ENABLE_OSX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_GNOME_TRUE}" && test -z "${ENABLE_GNOME_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_GNOME\" was never defined.
+ as_fn_error "conditional \"ENABLE_GNOME\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_PANEL_APPLET_TRUE}" && test -z "${ENABLE_PANEL_APPLET_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_PANEL_APPLET\" was never defined.
+ as_fn_error "conditional \"ENABLE_PANEL_APPLET\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${WITH_DBUS_SERVICE_DIR_TRUE}" && test -z "${WITH_DBUS_SERVICE_DIR_FALSE}"; then
- as_fn_error $? "conditional \"WITH_DBUS_SERVICE_DIR\" was never defined.
+ as_fn_error "conditional \"WITH_DBUS_SERVICE_DIR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_EVOLUTION_TRUE}" && test -z "${ENABLE_EVOLUTION_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_EVOLUTION\" was never defined.
+ as_fn_error "conditional \"ENABLE_EVOLUTION\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_SKETCHING_TRUE}" && test -z "${ENABLE_SKETCHING_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_SKETCHING\" was never defined.
+ as_fn_error "conditional \"ENABLE_SKETCHING\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_GALAGO_TRUE}" && test -z "${ENABLE_GALAGO_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_GALAGO\" was never defined.
+ as_fn_error "conditional \"ENABLE_GALAGO\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_NUNIT_TRUE}" && test -z "${HAVE_NUNIT_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_NUNIT\" was never defined.
+ as_fn_error "conditional \"HAVE_NUNIT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -15656,19 +15760,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -15864,7 +15968,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -15917,8 +16021,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tomboy $as_me 1.7.0, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by tomboy $as_me 1.7.1, which was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -15983,11 +16087,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-tomboy config.status 1.7.0
-configured by $0, generated by GNU Autoconf 2.67,
+tomboy config.status 1.7.1
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -16005,16 +16109,11 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -16036,7 +16135,6 @@ do
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -16049,7 +16147,7 @@ do
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
+ as_fn_error "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -16058,7 +16156,7 @@ Try \`$0 --help' for more information.";;
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -16112,131 +16210,143 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
# Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+SED \
GREP \
EGREP \
FGREP \
@@ -16260,8 +16370,6 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
@@ -16291,12 +16399,13 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
+install_override_mode \
finish_eval \
old_striplib \
striplib; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -16323,9 +16432,9 @@ postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -16333,12 +16442,6 @@ sys_lib_dlsearch_path_spec; do
esac
done
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
- ;;
-esac
-
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
@@ -16405,7 +16508,7 @@ do
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -16443,7 +16546,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -16460,7 +16563,7 @@ if test "x$ac_cr" = x; then
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -16474,18 +16577,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -16574,28 +16677,20 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -16623,7 +16718,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -16708,7 +16803,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -16721,7 +16816,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -16749,7 +16844,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -16776,7 +16871,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -16913,22 +17008,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -16939,19 +17034,19 @@ which seems to be undefined. Please make sure it is defined" >&2;}
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -17112,7 +17207,8 @@ $as_echo X"$file" |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -17160,6 +17256,12 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
# The host system.
host_alias=$host_alias
host=$host
@@ -17209,10 +17311,6 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
@@ -17234,6 +17332,9 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
# A C compiler.
LTCC=$lt_CC
@@ -17255,12 +17356,6 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
-
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
@@ -17323,6 +17418,9 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
@@ -17362,6 +17460,10 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
@@ -17621,7 +17723,7 @@ _LT_EOF
func_dirname ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
@@ -17632,7 +17734,7 @@ func_dirname ()
# func_basename file
func_basename ()
{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
}
@@ -17645,10 +17747,8 @@ func_basename ()
func_stripname ()
{
case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
esac
}
@@ -17659,20 +17759,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
# func_opt_split
func_opt_split ()
{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
}
# func_lo2o object
func_lo2o ()
{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
}
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
}
# func_arith arithmetic-term...
@@ -17732,7 +17832,7 @@ _LT_EOF
"pot-update":F) chmod +x pot-update ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
- as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
@@ -17760,7 +17860,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -17781,7 +17881,7 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/configure.in b/configure.in
index 6ad3355..a03a402 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 1.7.0)
+AC_INIT(tomboy, 1.7.1)
AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
AM_INIT_AUTOMAKE([foreign tar-ustar])
AM_MAINTAINER_MODE
@@ -192,12 +192,10 @@ if test "x$ENABLE_GNOME" != "xno"; then
PKG_CHECK_MODULES(GNOME,
gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
- gconf-sharp-peditors-2.0
gnome-panel-sharp-2.24)
else
PKG_CHECK_MODULES(GNOME,
- gconf-sharp-2.0
- gconf-sharp-peditors-2.0)
+ gconf-sharp-2.0)
fi
fi
AC_SUBST(GNOME_LIBS)
diff --git a/data/Makefile.in b/data/Makefile.in
index f932a25..9ee5b6c 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -281,7 +281,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index b86019e..9b25a03 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -211,7 +211,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
index bc2a61f..0da2cf9 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -361,7 +361,7 @@ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
## @ _DOC_POT
## A pot file
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
.PHONY: pot
pot: $(_DOC_POT)
$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
diff --git a/help/Makefile.in b/help/Makefile.in
index 00a4a66..18f82df 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -234,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -348,7 +347,7 @@ _DOC_SRC_FIGURES = \
$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \
$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
################################################################################
_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
diff --git a/libtomboy/Makefile.in b/libtomboy/Makefile.in
index e2d5792..0927019 100644
--- a/libtomboy/Makefile.in
+++ b/libtomboy/Makefile.in
@@ -257,7 +257,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/ltmain.sh b/ltmain.sh
index fa4b1e1..04eaea4 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,10 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.2.10
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -32,50 +33,54 @@
#
# Provide generalized library-building support services.
#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print informational messages (default)
-# --version print version information
-# -h, --help print short or long help message
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --no-quiet, --no-silent
+# print informational messages (default)
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print more informational messages than default
+# --no-verbose don't print the extra informational messages
+# --version print version information
+# -h, --help, --help-all print short, long, or detailed help message
#
# MODE must be one of the following:
#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
#
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE. When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
# include the following information:
#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
-# automake: $automake_version
-# autoconf: $autoconf_version
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.10
+# automake: $automake_version
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
-PROGRAM=ltmain.sh
+PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
+VERSION=2.2.10
TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3175
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +96,15 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,24 +117,33 @@ do
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
$lt_unset CDPATH
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
: ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${EGREP="grep -E"}
+: ${FGREP="grep -F"}
+: ${GREP="grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/bin/sed"}
+: ${SED="sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -159,32 +178,168 @@ basename="s,^.*/,,"
func_dirname_and_basename ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
func_dirname_result="$func_dirname_result${2}"
fi
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
}
# Generated shell functions inserted here.
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+ s@/\./@/@g
+ t dotsl
+ s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+# value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
+ ;;
+ *)
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
+ esac
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test "$func_normal_abspath_tpath" = / ; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result" ; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+# value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=${func_dirname_result}
+ if test "x$func_relative_path_tlibdir" = x ; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test "x$func_stripname_result" != x ; then
+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+ fi
+
+ # Normalisation. If bindir is libdir, return empty string,
+ # else relative path ending with a slash; either way, target
+ # file name can be directly appended.
+ if test ! -z "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result/"
+ func_relative_path_result=$func_stripname_result
+ fi
+}
# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
-case $progname in
- -*) progname=./$progname ;;
-esac
# Make sure we have an absolute path for reexecution:
case $progpath in
@@ -258,6 +413,13 @@ func_verbose ()
:
}
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
@@ -326,9 +488,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
done
- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@ -378,7 +540,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "X$my_tmpdir" | $Xsed
+ $ECHO "$my_tmpdir"
}
@@ -392,7 +554,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@ -419,7 +581,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "X$1" | $Xsed \
+ my_arg=`$ECHO "$1" | $SED \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@ -489,14 +651,19 @@ func_show_eval_locale ()
}
-
-
-
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ $SED -n '/(C)/!b go
+ :more
+ /\./!{
+ N
+ s/\n# / /
+ b more
+ }
+ :go
+ /^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,19 +676,20 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
- $SED -n '/^# Usage:/,/# -h/ {
+ $SED -n '/^# Usage:/,/^# *.*--help/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- $ECHO
+ echo
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
func_help ()
{
$SED -n '/^# Usage:/,/# Report bugs to/ {
@@ -538,7 +706,10 @@ func_help ()
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
}' < "$progpath"
- exit $?
+ ret=$?
+ if test -z "$1"; then
+ exit $ret
+ fi
}
# func_missing_arg argname
@@ -546,7 +717,7 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
- func_error "missing argument for $1"
+ func_error "missing argument for $1."
exit_cmd=exit
}
@@ -556,29 +727,6 @@ exit_cmd=:
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell, and then maybe $ECHO will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-$*
-EOF
- exit $EXIT_SUCCESS
-fi
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
@@ -636,16 +784,16 @@ func_config ()
# Display the features supported by this script.
func_features ()
{
- $ECHO "host: $host"
+ echo "host: $host"
if test "$build_libtool_libs" = yes; then
- $ECHO "enable shared libraries"
+ echo "enable shared libraries"
else
- $ECHO "disable shared libraries"
+ echo "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- $ECHO "enable static libraries"
+ echo "enable static libraries"
else
- $ECHO "disable static libraries"
+ echo "disable static libraries"
fi
exit $?
@@ -772,10 +920,21 @@ func_enable_tag ()
--quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
+ opt_verbose=false
+ ;;
+
+ --no-quiet|--no-silent)
+ preserve_args="$preserve_args $opt"
+ opt_silent=false
;;
--verbose| -v) preserve_args="$preserve_args $opt"
opt_silent=false
+ opt_verbose=:
+ ;;
+
+ --no-verbose) preserve_args="$preserve_args $opt"
+ opt_verbose=false
;;
--tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
@@ -793,6 +952,7 @@ func_enable_tag ()
-\?|-h) func_usage ;;
--help) opt_help=: ;;
+ --help-all) opt_help=': help-all' ;;
--version) func_version ;;
-*) func_fatal_help "unrecognized option \`$opt'" ;;
@@ -1016,10 +1176,13 @@ func_infer_tag ()
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@ -1033,8 +1196,11 @@ func_infer_tag ()
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case "$@ " in
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -1213,7 +1379,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -1288,7 +1454,7 @@ func_mode_compile ()
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@ -1445,7 +1611,7 @@ compiler."
}
$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+ test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -1482,10 +1648,11 @@ This mode accepts the following additional options:
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
- -prefer-pic try to building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
+ -prefer-pic try to build PIC objects only
+ -prefer-non-pic try to build non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
+ -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
@@ -1538,7 +1705,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
@@ -1558,6 +1725,8 @@ The following components of LINK-COMMAND are treated specially:
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
+ -bindir BINDIR specify path to binaries directory (for systems where
+ libraries must be found in the PATH setting at runtime)
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1586,6 +1755,11 @@ The following components of LINK-COMMAND are treated specially:
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
+ -Wc,FLAG
+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
+ -Wl,FLAG
+ -Xlinker FLAG pass linker-specific FLAG directly to the linker
+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
All other options (arguments beginning with \`-') are ignored.
@@ -1623,14 +1797,40 @@ Otherwise, only FILE itself is deleted using RM."
;;
esac
- $ECHO
+ echo
$ECHO "Try \`$progname --help' for more information about other modes."
-
- exit $?
}
- # Now that we've collected a possible --mode arg, show help if necessary
- $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+ if test "$opt_help" = :; then
+ func_mode_help
+ else
+ {
+ func_help noexit
+ for mode in compile link execute install finish uninstall clean; do
+ func_mode_help
+ done
+ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ {
+ func_help noexit
+ for mode in compile link execute install finish uninstall clean; do
+ echo
+ func_mode_help
+ done
+ } |
+ sed '1d
+ /^When reporting/,/^Report/{
+ H
+ d
+ }
+ $x
+ /information about other modes/d
+ /more detailed .*MODE/d
+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+ fi
+ exit $?
+fi
# func_mode_execute arg...
@@ -1712,7 +1912,7 @@ func_mode_execute ()
for file
do
case $file in
- -*) ;;
+ -* | *.la | *.lo ) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
@@ -1754,7 +1954,7 @@ func_mode_execute ()
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- $ECHO "export $shlibpath_var"
+ echo "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
@@ -1795,23 +1995,23 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- $ECHO "X----------------------------------------------------------------------" | $Xsed
- $ECHO "Libraries have been installed in:"
+ echo "----------------------------------------------------------------------"
+ echo "Libraries have been installed in:"
for libdir in $libdirs; do
$ECHO " $libdir"
done
- $ECHO
- $ECHO "If you ever happen to want to link against installed libraries"
- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $ECHO "flag during linking and do at least one of the following:"
+ echo
+ echo "If you ever happen to want to link against installed libraries"
+ echo "in a given directory, LIBDIR, you must either use libtool, and"
+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $ECHO " during execution"
+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " during execution"
fi
if test -n "$runpath_var"; then
- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
- $ECHO " during linking"
+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
@@ -1823,21 +2023,21 @@ func_mode_finish ()
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
fi
- $ECHO
+ echo
- $ECHO "See any operating system documentation about shared libraries for"
+ echo "See any operating system documentation about shared libraries for"
case $host in
solaris2.[6789]|solaris2.1[0-9])
- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- $ECHO "pages."
+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ echo "pages."
;;
*)
- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
;;
esac
- $ECHO "X----------------------------------------------------------------------" | $Xsed
+ echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
}
@@ -1852,7 +2052,7 @@ func_mode_install ()
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+ case $nonopt in *shtool*) :;; *) false;; esac; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -1867,6 +2067,11 @@ func_mode_install ()
# Aesthetically quote it.
func_quote_for_eval "$arg"
install_prog="$install_prog$func_quote_for_eval_result"
+ install_shared_prog=$install_prog
+ case " $install_prog " in
+ *[\\\ /]cp\ *) install_cp=: ;;
+ *) install_cp=false ;;
+ esac
# We need to accept at least all the BSD install flags.
dest=
@@ -1876,8 +2081,10 @@ func_mode_install ()
install_type=
isdir=no
stripme=
+ no_mode=:
for arg
do
+ arg2=
if test -n "$dest"; then
files="$files $dest"
dest=$arg
@@ -1887,10 +2094,9 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
- case " $install_prog " in
- *[\\\ /]cp\ *) ;;
- *) prev=$arg ;;
- esac
+ if $install_cp; then :; else
+ prev=$arg
+ fi
;;
-g | -m | -o)
prev=$arg
@@ -1904,6 +2110,10 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
+ if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ arg2=$install_override_mode
+ no_mode=false
+ fi
prev=
else
dest=$arg
@@ -1915,6 +2125,10 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
install_prog="$install_prog $func_quote_for_eval_result"
+ if test -n "$arg2"; then
+ func_quote_for_eval "$arg2"
+ fi
+ install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -1923,6 +2137,13 @@ func_mode_install ()
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
+ if test -n "$install_override_mode" && $no_mode; then
+ if $install_cp; then :; else
+ func_quote_for_eval "$install_override_mode"
+ install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+ fi
+ fi
+
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
@@ -2010,7 +2231,7 @@ func_mode_install ()
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@ -2023,9 +2244,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@ -2043,7 +2264,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@ -2183,7 +2404,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
@@ -2202,7 +2423,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@ -2221,7 +2442,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@ -2323,6 +2544,10 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
/* External symbol declarations for the compiler. */\
"
@@ -2332,7 +2557,7 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_verbose "extracting global C symbols from \`$progfile'"
$opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
@@ -2371,7 +2596,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin | *mingw* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -2415,10 +2640,10 @@ extern \"C\" {
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
typedef struct {
@@ -2428,7 +2653,7 @@ typedef struct {
"
case $host in
*cygwin* | *mingw* | *cegcc* )
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
/* DATA imports from DLLs on WIN32 con't be const, because
runtime relocations are performed -- see ld's documentation
on pseudo-relocs. */"
@@ -2441,7 +2666,7 @@ typedef struct {
lt_dlsym_const=const ;;
esac
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
$lt_dlsym_const lt_dlsymlist
@@ -2457,7 +2682,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
@@ -2515,16 +2740,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
else
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
@@ -2538,8 +2763,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
fi
}
@@ -2549,6 +2774,7 @@ static const void *lt_preloaded_setup() {
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
$opt_debug
@@ -2559,8 +2785,9 @@ func_win32_libid ()
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e '
1,100{
@@ -2598,7 +2825,18 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+ if test "$lock_old_archive_extraction" = yes; then
+ lockfile=$f_ex_an_ar_oldlib.lock
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+ fi
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+ 'stat=$?; rm -f "$lockfile"; exit $stat'
+ if test "$lock_old_archive_extraction" = yes; then
+ $opt_dry_run || rm -f "$lockfile"
+ fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -2669,7 +2907,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
@@ -2684,25 +2922,30 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [arg=no]
#
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take. If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
{
- func_emit_wrapper_part1_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part1_arg1=$1
- fi
+ func_emit_wrapper_arg1=${1-no}
$ECHO "\
#! $SHELL
@@ -2718,7 +2961,6 @@ func_emit_wrapper_part1 ()
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
@@ -2749,31 +2991,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
- ECHO=\"$qecho\"
- file=\"\$0\"
- # Make sure echo works.
- if test \"X\$1\" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
- # Yippee, \$ECHO works!
- :
- else
- # Restart under the correct shell, and then maybe \$ECHO will work.
- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
- fi
- fi\
+ file=\"\$0\""
+
+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+ $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+ ECHO=\"$qECHO\"
+ fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+ lt_script_arg0=\$0
+ shift
+ for lt_opt
+ do
+ case \"\$lt_opt\" in
+ --lt-debug) lt_option_debug=1 ;;
+ --lt-dump-script)
+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+ cat \"\$lt_dump_D/\$lt_dump_F\"
+ exit 0
+ ;;
+ --lt-*)
+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+ exit 1
+ ;;
+ esac
+ done
+
+ # Print the debug banner immediately:
+ if test -n \"\$lt_option_debug\"; then
+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+ lt_dump_args_N=1;
+ for lt_arg
+ do
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+ done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
"
- $ECHO "\
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $ECHO "\
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+ exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done
+ func_exec_program_core \${1+\"\$@\"}
+}
+
+ # Parse options
+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
while test -n \"\$file\"; do
- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +3126,13 @@ else
esac
fi
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
- func_emit_wrapper_part2_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part2_arg1=$1
- fi
-
- $ECHO "\
# Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +3140,7 @@ func_emit_wrapper_part2 ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
@@ -2877,7 +3203,7 @@ func_emit_wrapper_part2 ()
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
export $shlibpath_var
"
@@ -2894,64 +3220,18 @@ func_emit_wrapper_part2 ()
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
-"
- case $host in
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2* | *-cegcc*)
- $ECHO "\
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
- ;;
-
- *)
- $ECHO "\
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
- ;;
- esac
- $ECHO "\
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- exit 1
+ func_exec_program \${1+\"\$@\"}
fi
else
# The program doesn't exist.
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
fi
fi\
"
}
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable. Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory. This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
- func_emit_wrapper_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_arg1=$1
- fi
-
- # split this up so that func_emit_cwrapperexe_src
- # can call each part independently.
- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
# func_to_host_path arg
@@ -2978,23 +3258,19 @@ func_emit_wrapper ()
func_to_host_path ()
{
func_to_host_path_result="$1"
- if test -n "$1" ; then
+ if test -n "$1"; then
case $host in
*mingw* )
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
case $build in
*mingw* ) # actually, msys
# awkward: cmd appends spaces to result
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
+ func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
;;
*cygwin* )
- func_to_host_path_tmp1=`cygpath -w "$1"`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
+ func_to_host_path_result=`cygpath -w "$1" |
+ $SED -e "$lt_sed_naive_backslashify"`
;;
* )
# Unfortunately, winepath does not exit with a non-zero
@@ -3006,17 +3282,17 @@ func_to_host_path ()
# the odd construction:
func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
$SED -e "$lt_sed_naive_backslashify"`
else
# Allow warning below.
- func_to_host_path_result=""
+ func_to_host_path_result=
fi
;;
esac
if test -z "$func_to_host_path_result" ; then
func_error "Could not determine host path corresponding to"
- func_error " '$1'"
+ func_error " \`$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
func_to_host_path_result="$1"
@@ -3049,30 +3325,24 @@ func_to_host_path ()
func_to_host_pathlist ()
{
func_to_host_pathlist_result="$1"
- if test -n "$1" ; then
+ if test -n "$1"; then
case $host in
*mingw* )
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
# into '.;' and ';.', and winepath ignores them completely.
- func_to_host_pathlist_tmp2="$1"
- # Once set for this call, this variable should not be
- # reassigned. It is used in tha fallback case.
- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e 's|^:*||' -e 's|:*$||'`
+ func_stripname : : "$1"
+ func_to_host_pathlist_tmp1=$func_stripname_result
case $build in
*mingw* ) # Actually, msys.
# Awkward: cmd appends spaces to result.
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
+ func_to_host_pathlist_result=`
+ ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
;;
*cygwin* )
- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
$SED -e "$lt_sed_naive_backslashify"`
;;
* )
@@ -3088,18 +3358,17 @@ func_to_host_pathlist ()
if test -z "$func_to_host_pathlist_result" ; then
func_to_host_pathlist_result="$func_to_host_path_result"
else
- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+ func_append func_to_host_pathlist_result ";$func_to_host_path_result"
fi
fi
fi
- IFS=:
done
IFS=$func_to_host_pathlist_oldIFS
;;
esac
- if test -z "$func_to_host_pathlist_result" ; then
+ if test -z "$func_to_host_pathlist_result"; then
func_error "Could not determine the host path(s) corresponding to"
- func_error " '$1'"
+ func_error " \`$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This may break if $1 contains DOS-style drive
# specifications. The fix is not to complicate the expression
@@ -3116,7 +3385,7 @@ func_to_host_pathlist ()
;;
esac
case "$1" in
- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+ *: ) func_append func_to_host_pathlist_result ";"
;;
esac
;;
@@ -3141,31 +3410,23 @@ func_emit_cwrapperexe_src ()
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-
- Currently, it simply execs the wrapper *script* "$SHELL $output",
- but could eventually absorb all of the scripts functionality and
- exec $objdir/$outputname directly.
*/
EOF
cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
#include <stdio.h>
#include <stdlib.h>
#ifdef _MSC_VER
# include <direct.h>
# include <process.h>
# include <io.h>
-# define setmode _setmode
#else
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
# include <io.h>
-# define HAVE_SETENV
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
# endif
#endif
#include <malloc.h>
@@ -3177,6 +3438,44 @@ int setenv (const char *, const char *, int);
#include <fcntl.h>
#include <sys/stat.h>
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat _stat
+# define chmod _chmod
+# define getcwd _getcwd
+# define putenv _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+# define _INTPTR_T_DEFINED
+# define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat _stat
+# define chmod _chmod
+# define getcwd _getcwd
+# define putenv _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
@@ -3192,14 +3491,7 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
@@ -3230,10 +3522,6 @@ int setenv (const char *, const char *, int);
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
@@ -3246,22 +3534,13 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
- va_list args;
- va_start (args, fmt);
- (void) vfprintf (stderr, fmt, args);
- va_end (args);
-}
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
#else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
#endif
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
void *xmalloc (size_t num);
char *xstrdup (const char *string);
@@ -3271,31 +3550,17 @@ char *chase_symlinks (const char *pathspec);
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
void lt_setenv (const char *name, const char *value);
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
void lt_update_exe_path (const char *name, const char *value);
void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
- func_emit_wrapper_part1 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
- cat <<EOF
-
-static const char *script_text_part2 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
EOF
- func_emit_wrapper_part2 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
cat <<EOF
const char * MAGIC_EXE = "$magic_exe";
@@ -3340,24 +3605,10 @@ EOF
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
- /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
int
main (int argc, char *argv[])
@@ -3374,10 +3625,13 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+ newargz = XMALLOC (char *, argc + 1);
- /* very simple arg parsing; don't want to rely on getopt */
+ /* very simple arg parsing; don't want to rely on getopt
+ * also, copy all non cwrapper options to newargz, except
+ * argz[0], which is handled differently
+ */
+ newargc=0;
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -3391,25 +3645,57 @@ EOF
esac
cat <<"EOF"
- printf ("%s", script_text_part1);
- printf ("%s", script_text_part2);
+ lt_dump_script (stdout);
return 0;
}
+ if (strcmp (argv[i], debug_opt) == 0)
+ {
+ lt_debug = 1;
+ continue;
+ }
+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ {
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+ namespace, but it is not one of the ones we know about and
+ have already dealt with, above (inluding dump-script), then
+ report an error. Otherwise, targets might begin to believe
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+ namespace. The first time any user complains about this, we'll
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+ or a configure.ac-settable value.
+ */
+ lt_fatal (__FILE__, __LINE__,
+ "unrecognized %s option: '%s'",
+ ltwrapper_option_prefix, argv[i]);
+ }
+ /* otherwise ... */
+ newargz[++newargc] = xstrdup (argv[i]);
}
+ newargz[++newargc] = NULL;
+
+EOF
+ cat <<EOF
+ /* The GNU banner must be the first non-error debug message */
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+ cat <<"EOF"
+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- newargz = XMALLOC (char *, argc + 1);
tmp_pathspec = find_executable (argv[0]);
if (tmp_pathspec == NULL)
- lt_fatal ("Couldn't find %s", argv[0]);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
- tmp_pathspec));
+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (before symlink chase) at: %s\n",
+ tmp_pathspec);
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
- actual_cwrapper_path));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (after symlink chase) at: %s\n",
+ actual_cwrapper_path);
XFREE (tmp_pathspec);
- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
@@ -3427,8 +3713,9 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
- target_name));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) libtool target name: %s\n",
+ target_name);
EOF
cat <<EOF
@@ -3481,77 +3768,12 @@ EOF
lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
- newargc=0;
- for (i = 1; i < argc; i++)
- {
- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
- {
- if (argv[i][env_set_opt_len] == '=')
- {
- const char *p = argv[i] + env_set_opt_len + 1;
- lt_opt_process_env_set (p);
- }
- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_set (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_set_opt);
- continue;
- }
- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
- {
- if (argv[i][env_prepend_opt_len] == '=')
- {
- const char *p = argv[i] + env_prepend_opt_len + 1;
- lt_opt_process_env_prepend (p);
- }
- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_prepend (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_prepend_opt);
- continue;
- }
- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
- {
- if (argv[i][env_append_opt_len] == '=')
- {
- const char *p = argv[i] + env_append_opt_len + 1;
- lt_opt_process_env_append (p);
- }
- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_append (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_append_opt);
- continue;
- }
- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
- {
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- namespace, but it is not one of the ones we know about and
- have already dealt with, above (inluding dump-script), then
- report an error. Otherwise, targets might begin to believe
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- namespace. The first time any user complains about this, we'll
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- or a configure.ac-settable value.
- */
- lt_fatal ("Unrecognized option in %s namespace: '%s'",
- ltwrapper_option_prefix, argv[i]);
- }
- /* otherwise ... */
- newargz[++newargc] = xstrdup (argv[i]);
- }
- newargz[++newargc] = NULL;
-
- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+ nonnull (lt_argv_zero));
for (i = 0; i < newargc; i++)
{
- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+ i, nonnull (newargz[i]));
}
EOF
@@ -3560,11 +3782,14 @@ EOF
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
+ newargz = prepare_spawn (newargz);
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) failed to launch target \"%s\": %s\n",
+ lt_argv_zero, nonnull (strerror (errno)));
return 127;
}
return rval;
@@ -3586,7 +3811,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
- lt_fatal ("Memory exhausted");
+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
return p;
}
@@ -3620,8 +3845,8 @@ check_executable (const char *path)
{
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3638,8 +3863,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3665,8 +3890,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+ nonempty (wrapper));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
@@ -3719,7 +3944,8 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +3970,8 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +3997,9 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
- tmp_pathspec));
+ lt_debugprintf (__FILE__, __LINE__,
+ "checking path component for symlinks: %s\n",
+ tmp_pathspec);
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +4021,9 @@ chase_symlinks (const char *pathspec)
}
else
{
- char *errstr = strerror (errno);
- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+ lt_fatal (__FILE__, __LINE__,
+ "error accessing file \"%s\": %s",
+ tmp_pathspec, nonnull (strerror (errno)));
}
}
XFREE (tmp_pathspec);
@@ -3807,7 +4036,8 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
- lt_fatal ("Could not follow symlinks for %s", pathspec);
+ lt_fatal (__FILE__, __LINE__,
+ "could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
@@ -3833,11 +4063,25 @@ strendzap (char *str, const char *pat)
return str;
}
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+ va_list args;
+ if (lt_debug)
+ {
+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+ }
+}
+
static void
-lt_error_core (int exit_status, const char *mode,
+lt_error_core (int exit_status, const char *file,
+ int line, const char *mode,
const char *message, va_list ap)
{
- fprintf (stderr, "%s: %s: ", program_name, mode);
+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
@@ -3846,20 +4090,32 @@ lt_error_core (int exit_status, const char *mode,
}
void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
{
va_list ap;
va_start (ap, message);
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
va_end (ap);
}
+static const char *
+nonnull (const char *s)
+{
+ return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+ return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
void
lt_setenv (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_setenv) setting '%s' to '%s'\n",
+ nonnull (name), nonnull (value));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
@@ -3904,95 +4160,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
return new_value;
}
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
- const char *p;
- int len;
- if (!arg || !*arg)
- return 1;
-
- p = strchr (arg, (int)'=');
-
- if (!p)
- return 1;
-
- *value = xstrdup (++p);
-
- len = strlen (arg) - strlen (*value);
- *name = XMALLOC (char, len);
- strncpy (*name, arg, len-1);
- (*name)[len - 1] = '\0';
-
- return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
- }
-
- lt_setenv (name, value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 0);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 1);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
void
lt_update_exe_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4011,9 +4184,9 @@ lt_update_exe_path (const char *name, const char *value)
void
lt_update_lib_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4023,11 +4196,152 @@ lt_update_lib_path (const char *name, const char *value)
}
}
+EOF
+ case $host_os in
+ mingw*)
+ cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+ Note that spawn() does not by itself call the command interpreter
+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ GetVersionEx(&v);
+ v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+ }) ? "cmd.exe" : "command.com").
+ Instead it simply concatenates the arguments, separated by ' ', and calls
+ CreateProcess(). We must quote the arguments since Win32 CreateProcess()
+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+ special way:
+ - Space and tab are interpreted as delimiters. They are not treated as
+ delimiters if they are surrounded by double quotes: "...".
+ - Unescaped double quotes are removed from the input. Their only effect is
+ that within double quotes, space and tab are treated like normal
+ characters.
+ - Backslashes not followed by double quotes are not special.
+ - But 2*n+1 backslashes followed by a double quote become
+ n backslashes followed by a double quote (n >= 0):
+ \" -> "
+ \\\" -> \"
+ \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+ size_t argc;
+ char **new_argv;
+ size_t i;
+
+ /* Count number of arguments. */
+ for (argc = 0; argv[argc] != NULL; argc++)
+ ;
+
+ /* Allocate new argument vector. */
+ new_argv = XMALLOC (char *, argc + 1);
+
+ /* Put quoted arguments into the new argument vector. */
+ for (i = 0; i < argc; i++)
+ {
+ const char *string = argv[i];
+
+ if (string[0] == '\0')
+ new_argv[i] = xstrdup ("\"\"");
+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+ {
+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+ size_t length;
+ unsigned int backslashes;
+ const char *s;
+ char *quoted_string;
+ char *p;
+
+ length = 0;
+ backslashes = 0;
+ if (quote_around)
+ length++;
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ length += backslashes + 1;
+ length++;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ length += backslashes + 1;
+
+ quoted_string = XMALLOC (char, length + 1);
+
+ p = quoted_string;
+ backslashes = 0;
+ if (quote_around)
+ *p++ = '"';
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ {
+ unsigned int j;
+ for (j = backslashes + 1; j > 0; j--)
+ *p++ = '\\';
+ }
+ *p++ = c;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ {
+ unsigned int j;
+ for (j = backslashes; j > 0; j--)
+ *p++ = '\\';
+ *p++ = '"';
+ }
+ *p = '\0';
+
+ new_argv[i] = quoted_string;
+ }
+ else
+ new_argv[i] = (char *) string;
+ }
+ new_argv[argc] = NULL;
+
+ return new_argv;
+}
+EOF
+ ;;
+ esac
+
+ cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+ func_emit_wrapper yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
+ cat <<"EOF"
+}
EOF
}
# end: func_emit_cwrapperexe_src
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+ $opt_debug
+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+ *import*) : ;;
+ *) false ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
@@ -4072,6 +4386,7 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
+ bindir=
dlfiles=
dlprefiles=
dlself=no
@@ -4164,6 +4479,11 @@ func_mode_link ()
esac
case $prev in
+ bindir)
+ bindir="$arg"
+ prev=
+ continue
+ ;;
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
@@ -4425,6 +4745,11 @@ func_mode_link ()
continue
;;
+ -bindir)
+ prev=bindir
+ continue
+ ;;
+
-dlopen)
prev=dlfiles
continue
@@ -4503,7 +4828,7 @@ func_mode_link ()
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
@@ -4522,7 +4847,7 @@ func_mode_link ()
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -4708,7 +5033,7 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $wl$func_quote_for_eval_result"
+ arg="$arg $func_quote_for_eval_result"
compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
@@ -4754,18 +5079,19 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
- # -r[0-9][0-9]* specifies the processor on the SGI compiler
- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
- # +DA*, +DD* enable 64-bit mode on the HP compiler
- # -q* pass through compiler args for the IBM compiler
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+ # Flags to be passed through unchanged, with rationale:
+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
+ # -r[0-9][0-9]* specify processor for the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+ # +DA*, +DD* enable 64-bit mode for the HP compiler
+ # -q* compiler args for the IBM compiler
+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+ # -F/path path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
@@ -4925,7 +5251,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
@@ -5033,10 +5359,7 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5051,7 +5374,8 @@ func_mode_link ()
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+ func_basename "$deplib"
+ deplib_base=$func_basename_result
case " $weak_libs " in
*" $deplib_base "*) ;;
*) deplibs="$deplibs $deplib" ;;
@@ -5230,7 +5554,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -5240,15 +5564,15 @@ func_mode_link ()
;;
esac
if test "$valid_a_lib" != yes; then
- $ECHO
+ echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because the file extensions .$libext of this argument makes me believe"
- $ECHO "*** that it is just a static archive that I should not use here."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because the file extensions .$libext of this argument makes me believe"
+ echo "*** that it is just a static archive that I should not use here."
else
- $ECHO
+ echo
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
@@ -5321,7 +5645,7 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
@@ -5329,7 +5653,7 @@ func_mode_link ()
esac
done
fi
- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -5347,19 +5671,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_duplicate_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -5583,7 +5907,7 @@ func_mode_link ()
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
- $ECHO
+ echo
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
@@ -5686,9 +6010,9 @@ func_mode_link ()
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
- $ECHO
- $ECHO "*** And there doesn't seem to be a static archive available"
- $ECHO "*** The link will probably fail, sorry"
+ echo
+ echo "*** And there doesn't seem to be a static archive available"
+ echo "*** The link will probably fail, sorry"
else
add="$dir/$old_library"
fi
@@ -5828,21 +6152,21 @@ func_mode_link ()
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
- $ECHO
+ echo
$ECHO "*** Warning: This system can not link to static lib archive $lib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
- $ECHO "*** But as you try to build a module library, libtool will still create "
- $ECHO "*** a static module, that should work as long as the dlopening application"
- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ echo "*** But as you try to build a module library, libtool will still create "
+ echo "*** a static module, that should work as long as the dlopening application"
+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
- $ECHO
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $ECHO "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
@@ -5962,7 +6286,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
@@ -6130,7 +6454,7 @@ func_mode_link ()
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
- $ECHO
+ echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
libobjs="$libobjs $objs"
@@ -6198,7 +6522,7 @@ func_mode_link ()
age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|sunos)
+ freebsd-aout|freebsd-elf|qnx|sunos)
current="$number_major"
revision="$number_minor"
age="0"
@@ -6210,9 +6534,6 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
- ;;
esac
;;
no)
@@ -6435,14 +6756,14 @@ func_mode_link ()
oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
@@ -6483,7 +6804,7 @@ func_mode_link ()
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -6568,13 +6889,13 @@ EOF
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which I believe you do not have"
- $ECHO "*** because a test_compile did reveal that the linker did not use it for"
- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which I believe you do not have"
+ echo "*** because a test_compile did reveal that the linker did not use it for"
+ echo "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
;;
@@ -6611,22 +6932,22 @@ EOF
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because a test_compile did reveal that the linker did not use this one"
- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because a test_compile did reveal that the linker did not use this one"
+ echo "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
- $ECHO "*** make it link in! You will probably need to install it or some"
- $ECHO "*** library that it depends on before this library will be fully"
- $ECHO "*** functional. Installing it before continuing would be even better."
+ echo "*** make it link in! You will probably need to install it or some"
+ echo "*** library that it depends on before this library will be fully"
+ echo "*** functional. Installing it before continuing would be even better."
fi
;;
*)
@@ -6672,7 +6993,7 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
@@ -6687,12 +7008,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
@@ -6730,7 +7051,7 @@ EOF
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
@@ -6741,12 +7062,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
@@ -6764,25 +7085,25 @@ EOF
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
done
fi
- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
- $GREP . >/dev/null; then
- $ECHO
+ case $tmp_deplibs in
+ *[!\ \ ]*)
+ echo
if test "X$deplibs_check_method" = "Xnone"; then
- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
else
- $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+ echo "*** Warning: inter-library dependencies are not known to be supported."
fi
- $ECHO "*** All declared inter-library dependencies are being dropped."
+ echo "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
- fi
+ ;;
+ esac
;;
esac
versuffix=$versuffix_save
@@ -6794,23 +7115,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
- $ECHO
- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+ echo
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
- $ECHO "*** a static module, that should work as long as the dlopening"
- $ECHO "*** application is linked with the -dlopen flag."
+ echo "*** a static module, that should work as long as the dlopening"
+ echo "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
- $ECHO
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $ECHO "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
@@ -6820,16 +7141,16 @@ EOF
build_libtool_libs=no
fi
else
- $ECHO "*** The inter-library dependencies that have been dropped here will be"
- $ECHO "*** automatically added whenever a program is linked with this library"
- $ECHO "*** or is declared to -dlopen it."
+ echo "*** The inter-library dependencies that have been dropped here will be"
+ echo "*** automatically added whenever a program is linked with this library"
+ echo "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; then
- $ECHO
- $ECHO "*** Since this library must not contain undefined symbols,"
- $ECHO "*** because either the platform does not support them or"
- $ECHO "*** it was explicitly requested with -no-undefined,"
- $ECHO "*** libtool will only create a static version of it."
+ echo
+ echo "*** Since this library must not contain undefined symbols,"
+ echo "*** because either the platform does not support them or"
+ echo "*** it was explicitly requested with -no-undefined,"
+ echo "*** libtool will only create a static version of it."
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
@@ -6846,9 +7167,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -6970,7 +7291,7 @@ EOF
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
@@ -7036,7 +7357,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -7137,7 +7458,8 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+ func_basename "$output"
+ output_la=$func_basename_result
# Clear the reloadable object creation command queue and
# initialize k to one.
@@ -7150,12 +7472,12 @@ EOF
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
- $ECHO 'INPUT (' > $output
+ echo 'INPUT (' > $output
for obj in $save_libobjs
do
$ECHO "$obj" >> $output
done
- $ECHO ')' >> $output
+ echo ')' >> $output
delfiles="$delfiles $output"
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
@@ -7197,17 +7519,19 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ reload_objs=$objlist
+ eval concat_cmds=\"$reload_cmds\"
else
# All subsequent reloadable object files will link in
# the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
last_robj=$output_objdir/$output_la-${k}.$objext
func_arith $k + 1
k=$func_arith_result
output=$output_objdir/$output_la-${k}.$objext
- objlist=$obj
+ objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
@@ -7217,7 +7541,8 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
@@ -7276,7 +7601,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
@@ -7441,7 +7766,7 @@ EOF
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -7452,7 +7777,7 @@ EOF
fi
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7512,8 +7837,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
@@ -7530,8 +7855,8 @@ EOF
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -7668,8 +7993,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -7681,15 +8006,15 @@ EOF
wrappers_required=yes
case $host in
+ *cegcc* | *mingw32ce*)
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
- *cegcc)
- # Disable wrappers for cegcc, we are cross compiling anyway.
- wrappers_required=no
- ;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
@@ -7698,7 +8023,7 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -7745,7 +8070,7 @@ EOF
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
@@ -7764,7 +8089,7 @@ EOF
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -7776,7 +8101,7 @@ EOF
fi
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
@@ -7800,18 +8125,7 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- fi
-
- # Quote $ECHO for shipping.
- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
- case $progpath in
- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
- esac
- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
- else
- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@ -7932,7 +8246,7 @@ EOF
done | sort | sort -uc >/dev/null 2>&1); then
:
else
- $ECHO "copying selected object files to avoid basename conflicts..."
+ echo "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
generated="$generated $gentop"
func_mkdir_p "$gentop"
@@ -8043,7 +8357,7 @@ EOF
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -8128,9 +8442,27 @@ EOF
fi
$RM $output
# place dlname in correct position for cygwin
+ # In fact, it would be nice if we could use this code for all target
+ # systems that can't hard-code library paths into their executables
+ # and that have no shared library path variable independent of PATH,
+ # but it turns out we can't easily determine that from inspecting
+ # libtool variables, so we have to hard-code the OSs to which it
+ # applies here; at the moment, that means platforms that use the PE
+ # object format with DLL files. See the long comment at the top of
+ # tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ # If a -bindir argument was supplied, place the dll there.
+ if test "x$bindir" != x ;
+ then
+ func_relative_path "$install_libdir" "$bindir"
+ tdlname=$func_relative_path_result$dlname
+ else
+ # Otherwise fall back on heuristic.
+ tdlname=../bin/$dlname
+ fi
+ ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5fef86b..653874e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,6 +12,7 @@ Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs
Tomboy/Addins/Backlinks/Backlinks.addin.xml
Tomboy/Addins/Bugzilla/BugzillaPreferences.cs
Tomboy/Addins/Bugzilla/Bugzilla.addin.xml
+Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs
Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs
Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs
Tomboy/Addins/ExportToHtml/ExportToHtml.addin.xml
@@ -44,6 +45,7 @@ Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs
Tomboy/Addins/WebSyncService/WebSyncService.addin.xml
Tomboy/Applet.cs
+Tomboy/ExportAllApplicationAddin.cs
Tomboy/JumpListManager.cs
Tomboy/MacApplication.cs
Tomboy/Notebooks/CreateNotebookDialog.cs
diff --git a/po/es.po b/po/es.po
index 0ebbcc1..04d7442 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,8 +12,8 @@ msgstr ""
"Project-Id-Version: tomboy.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-21 21:03+0000\n"
-"PO-Revision-Date: 2011-04-27 12:22+0200\n"
+"POT-Creation-Date: 2011-06-26 04:42+0000\n"
+"PO-Revision-Date: 2011-06-26 13:04+0200\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
"Language-Team: Español <gnome-es-list at gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -83,7 +83,6 @@ msgid "Custom Font Face"
msgstr "Personalizar tipografía"
#: ../data/tomboy.schemas.in.h:5
-#| msgid "Determines X coordinate of Search window; stored on Tomboy exit."
msgid ""
"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
"exit."
@@ -92,7 +91,6 @@ msgstr ""
"en Tomboy al salir."
#: ../data/tomboy.schemas.in.h:6
-#| msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
msgid ""
"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
"exit."
@@ -101,7 +99,6 @@ msgstr ""
"en Tomboy al salir."
#: ../data/tomboy.schemas.in.h:7
-#| msgid "Determines pixel height of Search window; stored on Tomboy exit."
msgid ""
"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
"exit."
@@ -110,7 +107,6 @@ msgstr ""
"almacenado en Tomboy al salir."
#: ../data/tomboy.schemas.in.h:8
-#| msgid "Determines pixel width of Search window; stored on Tomboy exit."
msgid ""
"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
msgstr ""
@@ -118,21 +114,21 @@ msgstr ""
"almacenado en Tomboy al salir."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Activar listas de topos automáticas."
-
-#: ../data/tomboy.schemas.in.h:10
msgid "Enable Middle-Click Paste On Icon."
msgstr "Activar pegar con el botón del medio del ratón."
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
msgid "Enable Tray Icon"
msgstr "Activar icono de la bandeja de notificación"
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
msgid "Enable WikiWord highlighting"
msgstr "Activar resaltado de Wikipalabras"
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Activar listas de topos automáticas."
+
#: ../data/tomboy.schemas.in.h:13
msgid "Enable closing notes with escape."
msgstr "Activar cerrar las notas con escape."
@@ -190,21 +186,17 @@ msgid "HTML Export All Linked Notes"
msgstr "Exportar todas las notas enlazadas a HTML"
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Exportar al último directorio usado en formato HTML"
-
-#: ../data/tomboy.schemas.in.h:25
msgid "HTML Export Linked Notes"
msgstr "Exportar las notas enlazadas a HTML"
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
msgid ""
"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
msgstr ""
"Si está desactivado, se eliminará el diálogo de confirmación de «Eliminar "
"nota»."
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
msgid ""
"If enable_custom_font is true, the font name set here will be used as the "
"font when displaying notes."
@@ -212,7 +204,7 @@ msgstr ""
"Si enable_custom_font está activado, la tipografía aquí seleccionada se "
"usará al mostrar las notas."
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
msgid ""
"If enabled, all notes that were open when Tomboy quit will automatically be "
"reopened at startup."
@@ -220,12 +212,12 @@ msgstr ""
"Si está activado, todas las notas que estaban abiertas cuando se cerró "
"Tomboy, se abrirán automáticamente al inicio."
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
msgid "If enabled, an opened note can be closed by hitting the escape key."
msgstr ""
"Si está activado, una nota abierta se puede cerrar pulsando la tecla escape."
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
msgid ""
"If true, Tomboy's tray icon will be displayed in the notification area. "
"Disabling this may be useful when another application is providing the "
@@ -235,7 +227,7 @@ msgstr ""
"notificación. Puede ser útil desactivarlo cuando otra aplicación proporcione "
"la funcionalidad del icono de la bandeja."
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
msgid ""
"If true, misspellings will be underlined in red, and correct spelling "
"suggestions shown in the right-click menu."
@@ -243,7 +235,7 @@ msgstr ""
"Si está activado, las faltas de ortografía se subrayarán en rojo, y pulsando "
"con el botón derecho del ratón se mostrarán sugerencias."
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
msgid ""
"If true, the desktop-global keybindings set in /apps/tomboy/"
"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -253,7 +245,7 @@ msgstr ""
"fijadas en /apps/tomboy/global_keybindings también se activará, permitiendo "
"al resto de aplicaciones usar las opciones útiles de Tomboy."
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
msgid ""
"If true, the font name set in custom_font_face will be used as the font when "
"displaying notes. Otherwise the desktop default font will be used."
@@ -262,7 +254,7 @@ msgstr ""
"usará como tipografía para mostrar las notas. De otra manera se usará la "
"tipografía predeterminada del escritorio."
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
msgid ""
"Indicates that the Sticky Note Importer plugin has not been run, so it "
"should run automatically the next time Tomboy starts."
@@ -271,7 +263,7 @@ msgstr ""
"ejecutado, así que debería ejecutarse automáticamente la próxima vez que "
"arranque Tomboy."
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
msgid ""
"Integer determining the minimum number of notes to show in the Tomboy note "
"menu."
@@ -279,7 +271,7 @@ msgstr ""
"Entero determinando el número mínimo de notas que mostrar en el menú de "
"notas de Tomboy."
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
msgid ""
"Integer value indicating how frequently to perform a background sync of your "
"notes (when sync is configured). Any value less than 1 indicates that "
@@ -291,7 +283,7 @@ msgstr ""
"Cualquier valor menor que 1 indica que la autosincronización está "
"desactivada. El valor mínimo es 5. Este valor se expresa en minutos."
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
msgid ""
"Integer value indicating if there is a preference to always perform a "
"specific behavior when a conflict is detected, instead of prompting the "
@@ -305,7 +297,7 @@ msgstr ""
"usuario desea ser preguntado cuando suceda un conflicto, de tal forma que el "
"usuario manejará cada situación de conflicto caso por caso."
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
msgid ""
"Integer value indicating if there is a preference to always perform a "
"specific link updating behavior when a note is renamed, instead of prompting "
@@ -324,6 +316,10 @@ msgstr ""
"enlace con el nuevo nombre de la nota para que siga apuntando a la nota "
"renombrada."
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Última carpeta usada al exportar en HTML"
+
#: ../data/tomboy.schemas.in.h:39
msgid "Link Updating Behavior on Note Rename"
msgstr "Comportamiento al actualizar un enlace al renombrar una nota"
@@ -396,22 +392,18 @@ msgid "SSHFS Synchronization Server URL"
msgstr "URL del servidor de sincronización remota SSHFS"
#: ../data/tomboy.schemas.in.h:54
-#| msgid "Saved height of Search window"
msgid "Saved height of \"Search All Notes\" window"
msgstr "Altura guardada de la ventana «Buscar todas las notas»"
#: ../data/tomboy.schemas.in.h:55
-#| msgid "Saved horizontal position of Search window"
msgid "Saved horizontal position of \"Search All Notes\" window"
msgstr "Posición horizontal guardada de la ventana «Buscar todas las notas»"
#: ../data/tomboy.schemas.in.h:56
-#| msgid "Saved vertical position of Search window"
msgid "Saved vertical position of \"Search All Notes\" window"
msgstr "Posición vertical guardada de la ventana «Buscar todas las notas»"
#: ../data/tomboy.schemas.in.h:57
-#| msgid "Saved width of Search window"
msgid "Saved width of \"Search All Notes\" window"
msgstr "Anchura guardada de la ventana «Buscar todas las notas»"
@@ -521,9 +513,9 @@ msgid ""
"action."
msgstr ""
"Combinación de teclas global para mostrar el menú de miniaplicaciones de "
-"Tomboy. El formato sería \"<Control>a\" o \"<Shift><Alt>F1"
-"\". El analizador léxico es bastante tolerante y permite letras mayúsculas o "
-"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
+"Tomboy. El formato sería \"<Control>a\" o \"<Shift><Alt>"
+"F1\". El analizador léxico es bastante tolerante y permite letras mayúsculas "
+"o minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
"combinación de teclas para esta acción."
@@ -543,8 +535,8 @@ msgid ""
"The last setting for the 'Export linked notes' checkbox in the Export to "
"HTML plugin."
msgstr ""
-"Las última casilla de preferencias para «Exportar las notas enlazadas a HTML» "
-"en el complemento Exportar a HTML."
+"Las última casilla de preferencias para «Exportar las notas enlazadas a "
+"HTML» en el complemento Exportar a HTML."
#: ../data/tomboy.schemas.in.h:74
msgid ""
@@ -553,10 +545,10 @@ msgid ""
"Export Linked Notes' setting and is used to specify whether all notes (found "
"recursively) should be included during an export to HTML."
msgstr ""
-"El último ajuste para la casilla de «Incluir todas las notas enlazadas» en el "
-"complemento de exportar a HTML. Esta opción se usa junto con los ajustes de "
-"«Exportar las notas enlazadas a HTML» y se usa para especificar si todas las "
-"notas (encontradas recursivamente) deberían ser incluídas durante la "
+"El último ajuste para la casilla de «Incluir todas las notas enlazadas» en "
+"el complemento de exportar a HTML. Esta opción se usa junto con los ajustes "
+"de «Exportar las notas enlazadas a HTML» y se usa para especificar si todas "
+"las notas (encontradas recursivamente) deberían ser incluídas durante la "
"exportación a HTML."
#: ../data/tomboy.schemas.in.h:75
@@ -721,7 +713,8 @@ msgstr "Comenzar a sincronizar las notas"
msgid "What links here?"
msgstr "¿Qué enlaza aquí?"
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
msgid "(none)"
msgstr "(ninguna)"
@@ -775,6 +768,10 @@ msgstr "¿Desea quitar este icono?"
msgid "If you remove an icon it is permanently lost."
msgstr "Si borra un icono se perderá permanentemente."
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "Exportar a HTML"
@@ -789,10 +786,14 @@ msgid "Note exported successfully"
msgstr "Nota exportada con éxito"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
msgid "Access denied."
msgstr "Acceso denegado."
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
msgid "Folder does not exist."
msgstr "La carpeta no existe."
@@ -897,11 +898,11 @@ msgstr "Citas"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
msgstr ""
-"Cambiar la nota <span weight=\"bold\">Hoy: Pantilla</span> para personalizar "
-"el texto que las nuevas notas Hoy tendrán."
+"Cambiar la nota <b>Hoy: plantilla</b> para personalizar el texto que las "
+"nuevas notas «Hoy» tendrán."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -926,6 +927,11 @@ msgstr "Página {0} de {1}"
msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd dd/MM/yyyy, hh:mm:ss"
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Quitar enlaces rotos"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Añadir un dibujo"
@@ -988,14 +994,17 @@ msgstr "Importación de notas adhesivas completada"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "Se importaron con éxito <b>{0}</b> de <b>{1}</b> notas adhesivas."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "Se importó con éxito <b>{0}</b> de <b>{1}</b> nota adhesiva."
+msgstr[1] "Se importaron con éxito <b>{0}</b> de <b>{1}</b> notas adhesivas."
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
msgid "Untitled"
msgstr "Sin título"
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
msgid "Sticky Note: "
msgstr "Nota adhesiva: "
@@ -1108,7 +1117,88 @@ msgstr "Autorizar en el navegador (pulse para reiniciar la conexión)"
msgid "Set the default browser and try again"
msgstr "Establecer el navegador predeterminado e intentarlo de nuevo"
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+msgid "Export All Notes to "
+msgstr "Exportar todas las notas a "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+msgid "Start exporting notes to "
+msgstr "Comenzar a exportar las notas a"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+msgid "Export selected notebook to "
+msgstr "Exportar el cuaderno de notas seleccionado a"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+msgid "Start exporting notebook to "
+msgstr "Comenzar a exportar el cuaderno a"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Herramientas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exportar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Exportar sus notas."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+msgid "Export All Notes To "
+msgstr "Exportar todas las notas a "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+msgid "Export Selected Notebook To "
+msgstr "Exportar el cuaderno de notas seleccionado a "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "No se pudo exportar, acceso denegado."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "No se pudo exportar, la carpeta no existe."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "No se pudo exportar: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Error desconocido."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:215
+msgid "Unfiled Notes"
+msgstr "Notas sin archivar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Sus notas se exportaron a «{0}»."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Notas exportadas correctamente"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "No se pudieron guardar los archivos «{0}»"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:506
+msgid "Create destination folder for "
+msgstr "Crear carpeta de destino para "
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
msgstr "Buscar en todas las notas"
@@ -1177,10 +1267,6 @@ msgstr "Plantilla del cuaderno de notas de {0}"
msgid "All Notes"
msgstr "Todas las notas"
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Notas sin archivar"
-
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
msgid "Note_books"
msgstr "Cua_dernos de notas"
@@ -1220,7 +1306,7 @@ msgid "Delete the selected notebook"
msgstr "Eliminar el cuaderno de notas seleccionado"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:285
msgid "Notebooks"
msgstr "Cuadernos de notas"
@@ -1262,22 +1348,27 @@ msgstr "Cuaderno de notas"
msgid "_New notebook..."
msgstr "Cuaderno de _notas nuevo…"
-#: ../Tomboy/Note.cs:1568
+#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nota nueva {0}"
+
+#: ../Tomboy/Note.cs:1578
msgid "Really delete this note?"
msgstr "¿Desea eliminar esta nota?"
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1581
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "¿Desea eliminar esta nota?"
msgstr[1] "¿Desea eliminar estas {0} notas?"
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1592
msgid "If you delete a note it is permanently lost."
msgstr "Si borra esta nota se perderá permanentemente."
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1626
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1288,13 +1379,13 @@ msgstr ""
"espacio en disco y que tiene los permisos apropiados en {0}. Puede encontrar "
"detalles sobre el error en {1}."
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1642
msgid "Error saving note data."
msgstr "Error al guardar los datos de la nota"
#. New Note Template
#. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
msgid "New Note Template"
msgstr "Plantilla de Nota nueva"
@@ -1420,7 +1511,7 @@ msgstr ""
"automáticamente.</note-content>"
#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
msgid "Start Here"
msgstr "Comenzar aquí"
@@ -1428,14 +1519,9 @@ msgstr "Comenzar aquí"
msgid "Using Links in Tomboy"
msgstr "Usando los enlaces en Tomboy"
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nota nueva {0}"
-
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
msgid "Describe your new note here."
msgstr "Describa aquí su nota nueva."
@@ -1459,8 +1545,8 @@ msgid ""
"\n"
"If you do not rename the links, they will no longer link to anything."
msgstr ""
-"Renombrar enlaces en otras notas de «<span underline=\"single\">{0}</span>» a "
-"«<span underline=\"single\">{1}</span>»?\n"
+"Renombrar enlaces en otras notas de «<span underline=\"single\">{0}</span>» "
+"a «<span underline=\"single\">{1}</span>»?\n"
"\n"
"Si no renombra los enlaces, no apuntarán a nada."
@@ -1523,115 +1609,116 @@ msgstr "C_errar todas las notas"
msgid "Search"
msgstr "Buscar"
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Buscar en sus notas (Ctrl-Mayús-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:440
+msgid "Search your notes"
+msgstr "Buscar sus notas"
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:452
msgid "Link"
msgstr "Enlazar"
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Enlazar el texto seleccionado a una nota nueva (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:459
+msgid "Link selected text to a new note"
+msgstr "Enlazar el texto seleccionado a una nota nueva"
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:472
msgid "_Text"
msgstr "_Texto"
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:477
msgid "Set properties of text"
msgstr "Establecer las propiedades del texto"
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:482
msgid "T_ools"
msgstr "_Herramientas"
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:486
msgid "Use tools on this note"
msgstr "Usar las herramientas en esta nota"
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:494
msgid "Delete this note"
msgstr "Eliminar esta nota"
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Sincronizar las notas"
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:564
msgid "_Find..."
msgstr "_Buscar…"
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:575
msgid "Find _Next"
msgstr "Buscar _siguiente"
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:588
msgid "Find _Previous"
msgstr "Buscar _anterior"
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:676
msgid "Cannot create note"
msgstr "No se puede crear la nota"
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:757
msgid "_Find:"
msgstr "_Buscar:"
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:768
msgid "_Previous"
msgstr "_Anterior"
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:777
msgid "_Next"
msgstr "_Siguiente"
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1260
msgid "_Bold"
msgstr "_Negrita"
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1272
msgid "_Italic"
msgstr "_Cursiva"
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1284
msgid "_Strikeout"
msgstr "_Tachado"
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1296
msgid "_Highlight"
msgstr "_Resaltado"
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1309
msgid "Font Size"
msgstr "Tamaño de la tipografía"
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1312
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1329
msgid "Hu_ge"
msgstr "_Enorme"
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1337
msgid "_Large"
msgstr "_Grande"
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1345
msgid "S_mall"
msgstr "_Pequeña"
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1354
msgid "Increase Font Size"
msgstr "Aumentar el tamaño de la tipografía"
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1372
msgid "Decrease Font Size"
msgstr "Reducir el tamaño de la tipografía"
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1392
msgid "Bullets"
msgstr "Topos"
@@ -1651,11 +1738,11 @@ msgstr "Sincronización"
msgid "Add-ins"
msgstr "Complementos"
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
msgid "_Spell check while typing"
msgstr "Corrección _ortográfica al escribir"
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
msgid ""
"Misspellings will be underlined in red, with correct spelling suggestions "
"shown in the context menu."
@@ -1664,11 +1751,11 @@ msgstr ""
"las sugerencias de corrección en el menú contextual."
#. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
msgid "Highlight _WikiWords"
msgstr "Resaltar _wikipalabras"
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
msgid ""
"Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
"word will create a note with that name."
@@ -1677,31 +1764,31 @@ msgstr ""
"la palabra se creará una nota con ese nombre."
#. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
msgid "Enable auto-_bulleted lists"
msgstr "Activar listas de _topos automáticos"
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
msgid "Use custom _font"
msgstr "Usar tipogra_fía personalizada"
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
msgid "When renaming a linked note: "
msgstr "Al renombrar una nota enlazada: "
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
msgid "Ask me what to do"
msgstr "Preguntarme qué hacer"
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
msgid "Never rename links"
msgstr "No renombrar nunca los enlaces"
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
msgid "Always rename links"
msgstr "Siempre renombrar los enlaces"
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
msgid ""
"Use the new note template to specify the text that should be used when "
"creating a new note."
@@ -1709,16 +1796,16 @@ msgstr ""
"Use la plantilla de la nota nueva para especificar el texto que se debe usar "
"al crear una nota nueva."
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
msgstr "Abrir la plantilla Nota nueva"
#. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
msgid "Listen for _Hotkeys"
msgstr "_Escuchar las teclas rápidas"
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
msgid ""
"Hotkeys allow you to quickly access your notes from anywhere with a "
"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1729,82 +1816,82 @@ msgstr ""
"<b><Control><Mayús>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
msgid "Show notes _menu"
msgstr "Mostrar el _menú de notas"
#. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
msgid "Open \"_Start Here\""
msgstr "Abrir «Comen_zar aquí»"
#. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
msgid "Create _new note"
msgstr "Crear una nota _nueva"
#. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
msgid "Open \"Search _All Notes\""
msgstr "Abrir «Buscar en _todas las notas»"
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
msgid "Ser_vice:"
msgstr "_Servicio:"
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
msgid "Not configurable"
msgstr "No configurable"
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
msgid "Automaticall_y Sync in Background Every"
msgstr "Sin_cronizar automáticamente en segundo plano cada"
#. Translators: See above comment for details on
#. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
msgid "Minutes"
msgstr "Minutos"
#. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
msgid "_Advanced..."
msgstr "_Avanzado…"
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
msgid "The following add-ins are installed"
msgstr "Los siguientes complementos están instalados actualmente"
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
msgid "Get More Add-Ins..."
msgstr "Obtener más complementos…"
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
msgid "_Enable"
msgstr "_Activar"
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
msgid "_Disable"
msgstr "_Desactivar"
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
msgid "Not Implemented"
msgstr "No implementado"
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
#, csharp-format
msgid "{0} Preferences"
msgstr "{0} Preferencias"
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
msgid "Choose Note Font"
msgstr "Elegir la tipografía de la nota"
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
msgid "Other Synchronization Options"
msgstr "Otras opciones de sincronización"
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
msgid ""
"When a conflict is detected between a local note and a note on the "
"configured synchronization server:"
@@ -1812,23 +1899,23 @@ msgstr ""
"Cuando se detecta un conflicto entre una nota local y una nota en el "
"servidor de sincronización configurado:"
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
msgid "Always ask me what to do."
msgstr "Preguntarme siempre qué hacer."
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
msgid "Rename my local note."
msgstr "Renombrar mi nota local."
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
msgid "Replace my local note with the server's update."
msgstr "Reemplazar mi nota local con la actualización del servidor."
-#: ../Tomboy/PreferencesDialog.cs:1149
+#: ../Tomboy/PreferencesDialog.cs:1142
msgid "Are you sure?"
msgstr "¿Está seguro?"
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
msgid ""
"Clearing your synchronization settings is not recommended. You may be "
"forced to synchronize all of your notes again when you save new settings."
@@ -1836,25 +1923,25 @@ msgstr ""
"No se recomienda limpiar sus ajustes de sincronización. Quizá se vea forzado "
"a sincronizar todas sus notas de nuevo cuando guarde los nuevos ajustes."
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
msgid "Resetting Synchronization Settings"
msgstr "Reiniciando los ajustes de sincronización"
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
msgid ""
"You have disabled the configured synchronization service. Your "
"synchronization settings will now be cleared. You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
msgstr ""
-"Ha deshabilitado el servicio de configuración sincronizado. Sus ajustes de "
+"Ha desactivado el servicio de sincronización configurado. Sus ajustes de "
"sincronización se limpiarán. Quizá se vea forzado a sincronizar todas sus "
-"notas de nuevo cuando guarde los nuevos ajustes."
+"notas de nuevo cuando guarde los ajustes nuevos."
-#: ../Tomboy/PreferencesDialog.cs:1244
+#: ../Tomboy/PreferencesDialog.cs:1237
msgid "Connection successful"
msgstr "Conectado correctamente"
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
msgid ""
"Tomboy is ready to synchronize your notes. Would you like to synchronize "
"them now?"
@@ -1862,7 +1949,7 @@ msgstr ""
"Tomboy está preparado para sincronizar sus notas. ¿Quiere sincronizarlas "
"ahora?"
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
msgid ""
"Please check your information and try again. The log file {0} may contain "
@@ -1871,68 +1958,80 @@ msgstr ""
"Compruebe su información e inténtelo de nuevo. El archivo {0} puede contener "
"información útil sobre el error."
-#: ../Tomboy/PreferencesDialog.cs:1281
+#: ../Tomboy/PreferencesDialog.cs:1274
msgid "Error connecting"
msgstr "Error al conectar"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1350
msgid "Version:"
msgstr "Versión:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Author:"
msgstr "Autor:"
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Copyright:"
msgstr "Copyright:"
-#: ../Tomboy/PreferencesDialog.cs:1377
+#: ../Tomboy/PreferencesDialog.cs:1370
msgid "Add-in Dependencies:"
msgstr "Dependencias de los complementos:"
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
msgid "_Search:"
msgstr "_Buscar:"
-#: ../Tomboy/RecentChanges.cs:334
+#: ../Tomboy/RecentChanges.cs:359
msgid "Note"
msgstr "Nota"
-#: ../Tomboy/RecentChanges.cs:356
+#: ../Tomboy/RecentChanges.cs:381
msgid "Last Changed"
msgstr "Último cambio"
-#: ../Tomboy/RecentChanges.cs:487
+#: ../Tomboy/RecentChanges.cs:520
msgid "Matches"
msgstr "Coincidencias"
-#: ../Tomboy/RecentChanges.cs:538
+#: ../Tomboy/RecentChanges.cs:571
msgid "Title match"
msgstr "Coincidir con el título"
-#: ../Tomboy/RecentChanges.cs:541
+#: ../Tomboy/RecentChanges.cs:574
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "{0} coincidencia"
msgstr[1] "{0} coincidencias"
-#: ../Tomboy/RecentChanges.cs:555
+#: ../Tomboy/RecentChanges.cs:588
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "Total: {0} nota"
msgstr[1] "Total: {0} notas"
-#: ../Tomboy/RecentChanges.cs:566
+#: ../Tomboy/RecentChanges.cs:599
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "Coincide con: {0} nota"
msgstr[1] "Coincide con: {0} notas"
-#: ../Tomboy/RecentChanges.cs:702
+#: ../Tomboy/RecentChanges.cs:611
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"No se han encontrado resultados en el cuaderno de notas seleccionado.\n"
+"Pulse aquí para buscar en todas las notas."
+
+#: ../Tomboy/RecentChanges.cs:617
+msgid "Click here to search across all notebooks"
+msgstr "Pulse aquí para buscar en todos los cuadernos de notas"
+
+#: ../Tomboy/RecentChanges.cs:783
msgid "Notes"
msgstr "Notas"
@@ -1948,41 +2047,49 @@ msgstr "Desarrollo inicial:"
msgid "Contributors:"
msgstr "Colaboradores:"
-#: ../Tomboy/Tomboy.cs:405
+#: ../Tomboy/Tomboy.cs:412
msgid "translator-credits"
msgstr ""
"Daniel Mustieles <daniel.mustieles at gmail.com>, 2009\n"
"Jorge González <jorgegonz at svn.gnome.org>, 2004-2009"
-#: ../Tomboy/Tomboy.cs:414
+#: ../Tomboy/Tomboy.cs:421
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+"Copyright © 2004-2011 Others\n"
msgstr ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Otros\n"
+"Copyright © 2004-2011 Otros\n"
-#: ../Tomboy/Tomboy.cs:416
+#: ../Tomboy/Tomboy.cs:423
msgid "A simple and easy to use desktop note-taking application."
msgstr ""
"Una aplicación simple y fácil de usar para tomar notas en el escritorio."
-#: ../Tomboy/Tomboy.cs:426
+#: ../Tomboy/Tomboy.cs:433
msgid "Homepage"
msgstr "Página web"
-#: ../Tomboy/Tomboy.cs:544
+#: ../Tomboy/Tomboy.cs:551
+#| msgid ""
+#| "Tomboy: A simple, easy to use desktop note-taking application.\n"
+#| "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+#| "\n"
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
"\n"
+"Copyright © 2004-2011 Others\n"
msgstr ""
"Tomboy: Una aplicación simple y fácil de usar para tomar notas en el "
"escritorio.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
"\n"
+"Copyright © 2004-2011 Otros\n"
-#: ../Tomboy/Tomboy.cs:556
+#: ../Tomboy/Tomboy.cs:565
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -1998,7 +2105,7 @@ msgstr ""
" --search [texto]\t\tAbre la ventana de búsqueda de todas las notas con el "
"texto buscado.\n"
-#: ../Tomboy/Tomboy.cs:566
+#: ../Tomboy/Tomboy.cs:575
msgid ""
" --new-note\t\t\tCreate and display a new note.\n"
" --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -2014,7 +2121,7 @@ msgstr ""
" --highlight-search [texto]\tBuscar y resaltar texto coincidente en la nota "
"abierta\n"
-#: ../Tomboy/Tomboy.cs:580
+#: ../Tomboy/Tomboy.cs:589
#, csharp-format
msgid "Version {0}"
msgstr "Versión {0}"
@@ -2380,10 +2487,6 @@ msgstr ""
"La versión del servidor «{0}» está en conflicto con su nota local. ¿Qué "
"quiere hacer con su nota local?"
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Herramientas"
-
#: ../Tomboy/Synchronization/SyncUtils.cs:119
#: ../Tomboy/Synchronization/SyncUtils.cs:163
msgid "Could not enable FUSE"
@@ -2418,6 +2521,12 @@ msgstr ""
"al inicio. Añada \"modprobe fuse\" a /etc/init.d/boot.local o \"fuse\" a /"
"etc/modules."
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Exportar al último directorio usado en formato HTML"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Buscar en sus notas (Ctrl-Mayús-F)"
+
#~ msgid "SSH (sshfs FUSE)"
#~ msgstr "SSH (sshfs FUSE)"
diff --git a/po/gl.po b/po/gl.po
index 80a84d1..2ee6cbe 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: tomboy-master-po-gl-54142\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 23:05+0200\n"
-"PO-Revision-Date: 2011-04-30 23:05+0200\n"
+"POT-Creation-Date: 2011-07-04 21:46+0200\n"
+"PO-Revision-Date: 2011-07-04 21:46+0200\n"
"Last-Translator: Fran Diéguez <frandieguez at gnome.org>\n"
"Language-Team: Galician <gnome-l10n-gl at gnome.org>\n"
"Language: gl\n"
@@ -117,21 +117,21 @@ msgstr ""
"almacénaa ao saír."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Activar listas de viñetas automáticas"
-
-#: ../data/tomboy.schemas.in.h:10
msgid "Enable Middle-Click Paste On Icon."
msgstr "Activar pegar co botón do medio do rato."
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
msgid "Enable Tray Icon"
msgstr "Activar a icona da área de notificación"
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
msgid "Enable WikiWord highlighting"
msgstr "Activar o realce de palabras-wiki"
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Activar listas de viñetas automáticas."
+
#: ../data/tomboy.schemas.in.h:13
msgid "Enable closing notes with escape."
msgstr "Activar pechar notas con escape."
@@ -189,21 +189,17 @@ msgid "HTML Export All Linked Notes"
msgstr "Exportar todas as notas ligadas en HTML"
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Último directorio de exportación en HTML"
-
-#: ../data/tomboy.schemas.in.h:25
msgid "HTML Export Linked Notes"
msgstr "Exportar as notas ligadas en HTML"
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
msgid ""
"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
msgstr ""
"Se desmarca esta opción, eliminarase o diálogo de confirmación de «Eliminar "
"nota»"
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
msgid ""
"If enable_custom_font is true, the font name set here will be used as the "
"font when displaying notes."
@@ -211,7 +207,7 @@ msgstr ""
"Se enable_custom_font é verdadeiro, o nome do tipo de letra seleccionado "
"aquí usarase ao mostrar as notas."
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
msgid ""
"If enabled, all notes that were open when Tomboy quit will automatically be "
"reopened at startup."
@@ -219,13 +215,13 @@ msgstr ""
"Se escolle esta opción, todas as notas que estaban abertas cando se pechou "
"Tomboy, abriranse automaticamente ao inicio."
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
msgid "If enabled, an opened note can be closed by hitting the escape key."
msgstr ""
"Se escolle esta opción, unha nota aberta pódese pechar premendo a tecla "
"escape."
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
msgid ""
"If true, Tomboy's tray icon will be displayed in the notification area. "
"Disabling this may be useful when another application is providing the "
@@ -235,7 +231,7 @@ msgstr ""
"Desactivalo pode ser útil cando outro aplicativo fornece a funcionalidade da "
"icona da área de notificación."
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
msgid ""
"If true, misspellings will be underlined in red, and correct spelling "
"suggestions shown in the right-click menu."
@@ -243,7 +239,7 @@ msgstr ""
"Se é verdadeiro, os erros ortográficos subliñaranse en vermello e premendo "
"co botón dereito do rato mostraranse as suxestións do menú."
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
msgid ""
"If true, the desktop-global keybindings set in /apps/tomboy/"
"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -253,7 +249,7 @@ msgstr ""
"en /apps/tomboy/global_keybindings tamén se activarán, permitindo a calquera "
"aplicativo usar as opcións útiles do Tomboy."
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
msgid ""
"If true, the font name set in custom_font_face will be used as the font when "
"displaying notes. Otherwise the desktop default font will be used."
@@ -262,7 +258,7 @@ msgstr ""
"usarase como o tipo de letra para mostrar as notas. En caso contrario, "
"usarase o tipo de letra predeterminado do escritorio."
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
msgid ""
"Indicates that the Sticky Note Importer plugin has not been run, so it "
"should run automatically the next time Tomboy starts."
@@ -271,7 +267,7 @@ msgstr ""
"así que debería executarse automaticamente a próxima vez que o Tomboy se "
"inicie."
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
msgid ""
"Integer determining the minimum number of notes to show in the Tomboy note "
"menu."
@@ -279,7 +275,7 @@ msgstr ""
"Enteiro determinando o número mínimo de notas a mostrar no menú de notas de "
"Tomboy."
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
msgid ""
"Integer value indicating how frequently to perform a background sync of your "
"notes (when sync is configured). Any value less than 1 indicates that "
@@ -292,7 +288,7 @@ msgstr ""
"desactivada. O valor positivo aceptábel máis pequeno é 5. O valor está en "
"minutos."
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
msgid ""
"Integer value indicating if there is a preference to always perform a "
"specific behavior when a conflict is detected, instead of prompting the "
@@ -306,7 +302,7 @@ msgstr ""
"usuario desexa ser preguntado cando suceda un conflito, de tal maneira que o "
"usuario manexará cada situación de conflito caso por caso."
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
msgid ""
"Integer value indicating if there is a preference to always perform a "
"specific link updating behavior when a note is renamed, instead of prompting "
@@ -322,6 +318,10 @@ msgstr ""
"usuario desexa ser preguntado cando suceda un conflito, de tal maneira que o "
"usuario manexará cada situación de conflito caso por caso."
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Último cartafol usado no Exportado HTML"
+
#: ../data/tomboy.schemas.in.h:39
msgid "Link Updating Behavior on Note Rename"
msgstr "Comportamento da actualización de ligazóns no renomeado de notas"
@@ -711,7 +711,8 @@ msgstr "Comezar a sincronizar notas"
msgid "What links here?"
msgstr "Que liga aquí?"
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
msgid "(none)"
msgstr "(ningún)"
@@ -764,6 +765,10 @@ msgstr "Está seguro de que quere eliminar esta icona?"
msgid "If you remove an icon it is permanently lost."
msgstr "Se elimina unha icona perderase permanentemente."
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "Exportar a HTML"
@@ -778,10 +783,14 @@ msgid "Note exported successfully"
msgstr "Nota exportada satisfactoriamente"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
msgid "Access denied."
msgstr "Acceso denegado."
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
msgid "Folder does not exist."
msgstr "O cartafol non existe."
@@ -886,11 +895,11 @@ msgstr "Citas"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
msgstr ""
-"Cambiar a nota <span weight=\"bold\">Hoxe: Modelo</span> para personalizar o "
-"texto que as novas notas Hoxe teñan."
+"Cambiar a nota <b>Hoxe: Modelo</b> para personalizar o texto que as novas "
+"notas «Hoxe» teñan."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -915,6 +924,11 @@ msgstr "Páxina {0} de {1}"
msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "hh:mm:ss tt dddd dd/MM/yyyy"
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Quitar ligazóns rotas"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Engadir un debuxo"
@@ -977,14 +991,17 @@ msgstr "Importación de notas adhesivas completada"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "Importáronse con éxito <b>{0}</b> de <b>{1}</b> notas adhesivas."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "Importouse con éxito <b>{0}</b> de <b>{1}</b> nota adhesiva."
+msgstr[1] "Importáronse con éxito <b>{0}</b> de <b>{1}</b> notas adhesivas."
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
msgid "Untitled"
msgstr "Sen título"
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
msgid "Sticky Note: "
msgstr "Nota adhesiva: "
@@ -1097,7 +1114,88 @@ msgstr "Autorizando no navegador (prema para reiniciar a conexión)"
msgid "Set the default browser and try again"
msgstr "Configure o navegador predeterminado e probe outra vez"
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+msgid "Export All Notes to "
+msgstr "Exportar tódalas notas a"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+msgid "Start exporting notes to "
+msgstr "Comezar a exportar as notas a "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+msgid "Export selected notebook to "
+msgstr "Eliminar o caderno de notas seleccionado a "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+msgid "Start exporting notebook to "
+msgstr "Comezar a exportar o caderno a "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Ferramentas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exportar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Exportar as súas notas."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+msgid "Export All Notes To "
+msgstr "Exportar todas as notas a "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+msgid "Export Selected Notebook To "
+msgstr "Eliminar o caderno de notas seleccionado a "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Noi foi posíbel exportar, acceso denegado."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Non foi posíbel exportar, o cartafol non existe."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Non foi posíbel exportar: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Erro descoñecido."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:215
+msgid "Unfiled Notes"
+msgstr "Notas sen arquivar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "As súas notas foron exportadas a «{0}»."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Nota exportada con éxito"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Non foi posíbel gardar os ficheiros «{0}»"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:506
+msgid "Create destination folder for "
+msgstr "Crear cartafol de destino para "
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
msgstr "Buscar en todas as notas"
@@ -1166,10 +1264,6 @@ msgstr "Modelo de caderno de {0}"
msgid "All Notes"
msgstr "Todas as notas"
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Notas sen arquivar"
-
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
msgid "Note_books"
msgstr "C_adernos"
@@ -1209,7 +1303,7 @@ msgid "Delete the selected notebook"
msgstr "Eliminar o carderno seleccionado"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:285
msgid "Notebooks"
msgstr "Cadernos"
@@ -1251,22 +1345,27 @@ msgstr "Caderno"
msgid "_New notebook..."
msgstr "_Novo caderno…"
-#: ../Tomboy/Note.cs:1568
+#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nota nova {0}"
+
+#: ../Tomboy/Note.cs:1578
msgid "Really delete this note?"
msgstr "Está seguro de que quere eliminar esta nota?"
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1581
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "Está seguro de que quere eliminar esta {0} nota?"
msgstr[1] "Está seguro de que quere eliminar estas {0} notas?"
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1592
msgid "If you delete a note it is permanently lost."
msgstr "Se elimina unha nota perderase permanentemente."
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1626
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1277,13 +1376,13 @@ msgstr ""
"espazo no disco e que ten os permisos axeitados en {0}. Os detalles do erro "
"pódeos atopar en {1}."
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1642
msgid "Error saving note data."
msgstr "Produciuse un erro ao gardar os datos da nota."
#. New Note Template
#. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
msgid "New Note Template"
msgstr "Modelo de nota nova"
@@ -1408,7 +1507,7 @@ msgstr ""
"automaticamente.</note-content>"
#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
msgid "Start Here"
msgstr "Comezar aquí"
@@ -1416,14 +1515,9 @@ msgstr "Comezar aquí"
msgid "Using Links in Tomboy"
msgstr "Usando ligazóns en Tomboy"
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nota nova {0}"
-
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
msgid "Describe your new note here."
msgstr "Describa aquí a súa nova nota."
@@ -1511,115 +1605,116 @@ msgstr "P_echar todas as notas"
msgid "Search"
msgstr "Buscar"
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Buscar as súas notas (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:440
+msgid "Search your notes"
+msgstr "Buscar nas súas notas"
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:452
msgid "Link"
msgstr "Ligazón"
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Ligar o texto seleccionado a unha nota nova (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:459
+msgid "Link selected text to a new note"
+msgstr "Ligar o texto seleccionado a unha nota nova"
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:472
msgid "_Text"
msgstr "_Texto"
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:477
msgid "Set properties of text"
msgstr "Estabelecer as propiedades do texto"
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:482
msgid "T_ools"
msgstr "_Ferramentas"
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:486
msgid "Use tools on this note"
msgstr "Usar as ferramentas nesta nota"
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:494
msgid "Delete this note"
msgstr "Eliminar esta nota"
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Sincronizar notas"
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:564
msgid "_Find..."
msgstr "_Buscar…"
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:575
msgid "Find _Next"
msgstr "Buscar _seguinte"
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:588
msgid "Find _Previous"
msgstr "Buscar _anterior"
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:676
msgid "Cannot create note"
msgstr "Non foi posíbel crear a nota"
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:757
msgid "_Find:"
msgstr "_Buscar:"
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:768
msgid "_Previous"
msgstr "_Anterior"
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:777
msgid "_Next"
msgstr "_Seguinte"
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1260
msgid "_Bold"
msgstr "_Negra"
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1272
msgid "_Italic"
msgstr "_Cursiva"
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1284
msgid "_Strikeout"
msgstr "_Riscada"
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1296
msgid "_Highlight"
msgstr "_Realce"
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1309
msgid "Font Size"
msgstr "Tamaño do tipo de letra"
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1312
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1329
msgid "Hu_ge"
msgstr "_Enorme"
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1337
msgid "_Large"
msgstr "_Grande"
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1345
msgid "S_mall"
msgstr "_Pequena"
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1354
msgid "Increase Font Size"
msgstr "Incrementar o tamaño do tipo de letra"
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1372
msgid "Decrease Font Size"
msgstr "Diminuír o tamaño do tipo de letra"
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1392
msgid "Bullets"
msgstr "Viñetas"
@@ -1639,11 +1734,11 @@ msgstr "Sincronización"
msgid "Add-ins"
msgstr "Engadidos"
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
msgid "_Spell check while typing"
msgstr "_Verificar a ortografía mentres se escribe"
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
msgid ""
"Misspellings will be underlined in red, with correct spelling suggestions "
"shown in the context menu."
@@ -1652,11 +1747,11 @@ msgstr ""
"menú contextual."
#. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
msgid "Highlight _WikiWords"
msgstr "_Realzar as palabras _wiki"
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
msgid ""
"Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
"word will create a note with that name."
@@ -1665,31 +1760,31 @@ msgstr ""
"rato na palabra crearase outra nota con ese nome."
#. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
msgid "Enable auto-_bulleted lists"
msgstr "Activar listas de _topos automáticos"
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
msgid "Use custom _font"
msgstr "Usar tipo de letra _personalizado"
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
msgid "When renaming a linked note: "
msgstr "Ao renomear unha nota ligada: "
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
msgid "Ask me what to do"
msgstr "Preguntarme sempre que facer"
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
msgid "Never rename links"
msgstr "Non renomear as ligazóns nunca"
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
msgid "Always rename links"
msgstr "Renomear as ligazóns sempre"
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
msgid ""
"Use the new note template to specify the text that should be used when "
"creating a new note."
@@ -1697,16 +1792,16 @@ msgstr ""
"Usar o modelo da nota nova para especificar o texto que se debe usar ao "
"crear unha nova nota."
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
msgstr "Abrir o modelo de nota nova"
#. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
msgid "Listen for _Hotkeys"
msgstr "Escoitar as _teclas rápidas"
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
msgid ""
"Hotkeys allow you to quickly access your notes from anywhere with a "
"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1717,82 +1812,82 @@ msgstr ""
"Control><Maiús>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
msgid "Show notes _menu"
msgstr "Mostrar o _menú de notas"
#. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
msgid "Open \"_Start Here\""
msgstr "Abrir \"_Comezar aquí\""
#. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
msgid "Create _new note"
msgstr "Crear unha _nova nota"
#. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
msgid "Open \"Search _All Notes\""
msgstr "Abrir \"Buscar _todas as notas\""
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
msgid "Ser_vice:"
msgstr "Ser_vizo:"
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
msgid "Not configurable"
msgstr "Non configurábel"
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
msgid "Automaticall_y Sync in Background Every"
msgstr "_Sincronizar automaticamente en segundo plano cada"
#. Translators: See above comment for details on
#. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
msgid "Minutes"
msgstr "Minutos"
#. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
msgid "_Advanced..."
msgstr "_Avanzado…"
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
msgid "The following add-ins are installed"
msgstr "Actualmente están instalados os seguintes engadidos"
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
msgid "Get More Add-Ins..."
msgstr "Obter máis engadidos…"
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
msgid "_Enable"
msgstr "_Activar"
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
msgid "_Disable"
msgstr "_Desactivar"
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
msgid "Not Implemented"
msgstr "Sen implementar"
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
#, csharp-format
msgid "{0} Preferences"
msgstr "{0} Preferencias"
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
msgid "Choose Note Font"
msgstr "Escoller o tipo de letra das notas"
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
msgid "Other Synchronization Options"
msgstr "Outras opcións de sincronización"
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
msgid ""
"When a conflict is detected between a local note and a note on the "
"configured synchronization server:"
@@ -1800,23 +1895,23 @@ msgstr ""
"Cando se detecta un conflito entre unha nota local e unha nota no servidor "
"de sincronización configurado:"
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
msgid "Always ask me what to do."
msgstr "Preguntarme sempre que facer."
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
msgid "Rename my local note."
msgstr "Renomear a miña nota local."
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
msgid "Replace my local note with the server's update."
msgstr "Substituír a miña nota local coa actualización do servidor."
-#: ../Tomboy/PreferencesDialog.cs:1149
+#: ../Tomboy/PreferencesDialog.cs:1142
msgid "Are you sure?"
msgstr "Está seguro?"
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
msgid ""
"Clearing your synchronization settings is not recommended. You may be "
"forced to synchronize all of your notes again when you save new settings."
@@ -1825,25 +1920,25 @@ msgstr ""
"forzado a sincronizar todas as súas notas de novo cando garde a nova "
"configuración."
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
msgid "Resetting Synchronization Settings"
msgstr "Reiniciando os axustes de sincronización"
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
msgid ""
"You have disabled the configured synchronization service. Your "
"synchronization settings will now be cleared. You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
msgstr ""
-"Desactivou o servizo de configuración sincronizado. A súa configuración de "
-"sincronización limparase. Quizais se vexa forzado a sincronizar todas as "
+"Desactivou o servizo de sincronización configuración. A súa configuración "
+"de sincronización limparase. Quizais véxase forzado a sincronizar todas as "
"súas notas de novo cando garde a nova configuración"
-#: ../Tomboy/PreferencesDialog.cs:1244
+#: ../Tomboy/PreferencesDialog.cs:1237
msgid "Connection successful"
msgstr "Conexión estabelecida con éxito"
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
msgid ""
"Tomboy is ready to synchronize your notes. Would you like to synchronize "
"them now?"
@@ -1851,7 +1946,7 @@ msgstr ""
"Tomboy está preparado para sincronizar as súas notas. Quere sincronizalas "
"agora?"
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
msgid ""
"Please check your information and try again. The log file {0} may contain "
@@ -1860,68 +1955,80 @@ msgstr ""
"Comprobe a súa información e ténteo de novo. O ficheiro de rexistro {0} "
"debe conter máis información sobre o erro."
-#: ../Tomboy/PreferencesDialog.cs:1281
+#: ../Tomboy/PreferencesDialog.cs:1274
msgid "Error connecting"
msgstr "Produciuse un erro ao conectar"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1350
msgid "Version:"
msgstr "Versión:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Author:"
msgstr "Autor:"
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Copyright:"
msgstr "Dereitos de autor:"
-#: ../Tomboy/PreferencesDialog.cs:1377
+#: ../Tomboy/PreferencesDialog.cs:1370
msgid "Add-in Dependencies:"
msgstr "Dependencias dos engadidos:"
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
msgid "_Search:"
msgstr "_Buscar:"
-#: ../Tomboy/RecentChanges.cs:334
+#: ../Tomboy/RecentChanges.cs:359
msgid "Note"
msgstr "Nota"
-#: ../Tomboy/RecentChanges.cs:356
+#: ../Tomboy/RecentChanges.cs:381
msgid "Last Changed"
msgstr "Último cambio"
-#: ../Tomboy/RecentChanges.cs:487
+#: ../Tomboy/RecentChanges.cs:520
msgid "Matches"
msgstr "Coincidencias"
-#: ../Tomboy/RecentChanges.cs:538
+#: ../Tomboy/RecentChanges.cs:571
msgid "Title match"
msgstr "Coincidencia de título"
-#: ../Tomboy/RecentChanges.cs:541
+#: ../Tomboy/RecentChanges.cs:574
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "{0} coincidencia"
msgstr[1] "{0} coincidencias"
-#: ../Tomboy/RecentChanges.cs:555
+#: ../Tomboy/RecentChanges.cs:588
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "Total: {0} nota"
msgstr[1] "Total: {0} notas"
-#: ../Tomboy/RecentChanges.cs:566
+#: ../Tomboy/RecentChanges.cs:599
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "Coincidencias: {0} nota"
msgstr[1] "Coincidencias: {0} notas"
-#: ../Tomboy/RecentChanges.cs:702
+#: ../Tomboy/RecentChanges.cs:611
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Non foi posíbel atopar resultados no caderno de notas seleccionado.\n"
+"Prema aquí para buscar en tódalas notas."
+
+#: ../Tomboy/RecentChanges.cs:617
+msgid "Click here to search across all notebooks"
+msgstr "Prema aquí para buscar en tódolos cadernos de notas"
+
+#: ../Tomboy/RecentChanges.cs:783
msgid "Notes"
msgstr "Notas"
@@ -1937,41 +2044,46 @@ msgstr "Desenvolvemento primario:"
msgid "Contributors:"
msgstr "Contribuidores:"
-#: ../Tomboy/Tomboy.cs:405
+#: ../Tomboy/Tomboy.cs:412
msgid "translator-credits"
msgstr ""
"Fran Diéguez <frandieguez at ubuntu.com>, 2009, 2010.\n"
"Antón Méixome <meixome at mancomun.org>, 2009.\n"
"Ignacio Casal Quinteiro <icq at cvs.gnome.org>, 2005, 2006, 2007, 2008."
-#: ../Tomboy/Tomboy.cs:414
+#: ../Tomboy/Tomboy.cs:421
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+"Copyright © 2004-2011 Others\n"
msgstr ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Outros\n"
+"Copyright © 2004-2011 Outros\n"
-#: ../Tomboy/Tomboy.cs:416
+#: ../Tomboy/Tomboy.cs:423
msgid "A simple and easy to use desktop note-taking application."
msgstr "Un aplicativo sinxelo e fácil de usar para tomar notas no escritorio."
-#: ../Tomboy/Tomboy.cs:426
+#: ../Tomboy/Tomboy.cs:433
msgid "Homepage"
msgstr "Páxina de inicio"
-#: ../Tomboy/Tomboy.cs:544
+#: ../Tomboy/Tomboy.cs:551
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
"\n"
+"Copyright © 2004-2011 Others\n"
msgstr ""
-"Tomboy: Un aplicativo sinxelo, fácil de usar para tomar notas no "
+"Tomboy: Un aplicativo sinxelo e doado de usar para tomar notas no "
"escritorio.\n"
-"Dereitos de autor (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"Copyright © 2004-2007 Alex Graveley \n"
+"<alex at beatniksoftware.com>\n"
+"\n"
"\n"
+"Copyright © 2004-2011 Otros\n"
-#: ../Tomboy/Tomboy.cs:556
+#: ../Tomboy/Tomboy.cs:565
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -1986,7 +2098,7 @@ msgstr ""
" --search [texto]\t\tAbre a xanela buscar en todas as notas co texto a "
"buscar.\n"
-#: ../Tomboy/Tomboy.cs:566
+#: ../Tomboy/Tomboy.cs:575
msgid ""
" --new-note\t\t\tCreate and display a new note.\n"
" --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -2001,7 +2113,7 @@ msgstr ""
" --highlight-search [texto]\tBuscar e realzar o texto coincidente na nota "
"aberta.\n"
-#: ../Tomboy/Tomboy.cs:580
+#: ../Tomboy/Tomboy.cs:589
#, csharp-format
msgid "Version {0}"
msgstr "Versión {0}"
@@ -2123,11 +2235,11 @@ msgstr ""
msgid "Note title taken"
msgstr "O título da nota xa existe"
-#: ../Tomboy/Watchers.cs:549
+#: ../Tomboy/Watchers.cs:587
msgid "_Copy Link Address"
msgstr "_Copiar a ligazón do enderezo"
-#: ../Tomboy/Watchers.cs:554
+#: ../Tomboy/Watchers.cs:592
msgid "_Open Link"
msgstr "_Abrir a ligazón"
@@ -2367,10 +2479,6 @@ msgstr ""
"A versión do servidor «{0}» está en conflito coa súa nota local. Que quere "
"facer coa súa nota local?"
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Ferramentas"
-
#: ../Tomboy/Synchronization/SyncUtils.cs:119
#: ../Tomboy/Synchronization/SyncUtils.cs:163
msgid "Could not enable FUSE"
@@ -2405,6 +2513,12 @@ msgstr ""
"inicio. Engada «modprobe fuse» a /etc/init.d/boot.local ou «fuse» a /etc/"
"modules."
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Último directorio de exportación en HTML"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Buscar as súas notas (Ctrl-Shift-F)"
+
#~ msgid "SSH (sshfs FUSE)"
#~ msgstr "SSH (sshfs FUSE)"
diff --git a/po/he.po b/po/he.po
index 5653dc2..3778ce3 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-09 00:48+0300\n"
-"PO-Revision-Date: 2011-05-09 00:50+0200\n"
+"POT-Creation-Date: 2011-07-02 11:02+0300\n"
+"PO-Revision-Date: 2011-07-02 11:10+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Hebrew (he at li.org)\n"
"Language: he\n"
@@ -108,21 +108,21 @@ msgstr ""
"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Enable Auto bulleted lists."
-
-#: ../data/tomboy.schemas.in.h:10
msgid "Enable Middle-Click Paste On Icon."
msgstr "Enable Middle-Click Paste On Icon."
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
msgid "Enable Tray Icon"
msgstr "Enable Tray Icon"
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
msgid "Enable WikiWord highlighting"
msgstr "Enable WikiWord highlighting"
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Enable automatic bulleted lists."
+
#: ../data/tomboy.schemas.in.h:13
msgid "Enable closing notes with escape."
msgstr "Enable closing notes with escape."
@@ -180,20 +180,16 @@ msgid "HTML Export All Linked Notes"
msgstr "HTML Export All Linked Notes"
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "HTML Export Last Directory"
-
-#: ../data/tomboy.schemas.in.h:25
msgid "HTML Export Linked Notes"
msgstr "HTML Export Linked Notes"
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
msgid ""
"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
msgstr ""
"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
msgid ""
"If enable_custom_font is true, the font name set here will be used as the "
"font when displaying notes."
@@ -201,7 +197,7 @@ msgstr ""
"If enable_custom_font is true, the font name set here will be used as the "
"font when displaying notes."
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
msgid ""
"If enabled, all notes that were open when Tomboy quit will automatically be "
"reopened at startup."
@@ -209,11 +205,11 @@ msgstr ""
"If enabled, all notes that were open when Tomboy quit will automatically be "
"reopened at startup."
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
msgid "If enabled, an opened note can be closed by hitting the escape key."
msgstr "If enabled, an opened note can be closed by hitting the escape key."
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
msgid ""
"If true, Tomboy's tray icon will be displayed in the notification area. "
"Disabling this may be useful when another application is providing the "
@@ -223,7 +219,7 @@ msgstr ""
"Disabling this may be useful when another application is providing the "
"functionality of the tray icon."
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
msgid ""
"If true, misspellings will be underlined in red, and correct spelling "
"suggestions shown in the right-click menu."
@@ -231,7 +227,7 @@ msgstr ""
"If true, misspellings will be underlined in red, and correct spelling "
"suggestions shown in the right-click menu."
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
msgid ""
"If true, the desktop-global keybindings set in /apps/tomboy/"
"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -241,7 +237,7 @@ msgstr ""
"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
"available from any application."
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
msgid ""
"If true, the font name set in custom_font_face will be used as the font when "
"displaying notes. Otherwise the desktop default font will be used."
@@ -249,7 +245,7 @@ msgstr ""
"If true, the font name set in custom_font_face will be used as the font when "
"displaying notes. Otherwise the desktop default font will be used."
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
msgid ""
"Indicates that the Sticky Note Importer plugin has not been run, so it "
"should run automatically the next time Tomboy starts."
@@ -257,7 +253,7 @@ msgstr ""
"Indicates that the Sticky Note Importer plugin has not been run, so it "
"should run automatically the next time Tomboy starts."
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
msgid ""
"Integer determining the minimum number of notes to show in the Tomboy note "
"menu."
@@ -265,7 +261,7 @@ msgstr ""
"Integer determining the minimum number of notes to show in the Tomboy note "
"menu."
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
msgid ""
"Integer value indicating how frequently to perform a background sync of your "
"notes (when sync is configured). Any value less than 1 indicates that "
@@ -277,7 +273,7 @@ msgstr ""
"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
"minutes."
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
msgid ""
"Integer value indicating if there is a preference to always perform a "
"specific behavior when a conflict is detected, instead of prompting the "
@@ -291,7 +287,7 @@ msgstr ""
"wishes to be prompted when a conflict occurs, so that they may handle each "
"conflict situation on a case-by-case basis."
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
msgid ""
"Integer value indicating if there is a preference to always perform a "
"specific link updating behavior when a note is renamed, instead of prompting "
@@ -309,6 +305,10 @@ msgstr ""
"indicates that link text should be updated to the new note name so that it "
"will continue linking to the renamed note."
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Last Directory used in HTML Export"
+
#: ../data/tomboy.schemas.in.h:39
msgid "Link Updating Behavior on Note Rename"
msgstr "Link Updating Behavior on Note Rename"
@@ -694,7 +694,8 @@ msgstr "התחלת סנכרון הפתקיות"
msgid "What links here?"
msgstr "מה מקושר לכאן?"
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
msgid "(none)"
msgstr "(כלום)"
@@ -747,6 +748,10 @@ msgstr "האם להסיר את סמל זה?"
msgid "If you remove an icon it is permanently lost."
msgstr "אם הסמל יוסר הוא יאבד לעד."
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "יצוא לקובץ HTML"
@@ -761,10 +766,14 @@ msgid "Note exported successfully"
msgstr "הפתקית יוצאה בהצלחה"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
msgid "Access denied."
msgstr "הגישה נדחתה."
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
msgid "Folder does not exist."
msgstr "התיקייה לא קיימת."
@@ -869,11 +878,11 @@ msgstr "פגישות"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
msgstr ""
-"החלפת הפתקית <span weight=\"bold\">היום: תבנית</span> כדי להתאים את הטקסט "
-"הראשוני שיופיע בהערות \"היום\"."
+"יש לשנות את תוכן הפתקית <span weight=\"bold\">היום: תבנית</span> כדי להתאים "
+"את הטקסט הראשוני שיופיע בפתקית \"היום\" חדשה."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -898,6 +907,11 @@ msgstr "עמוד {0} מתוך {1}"
msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd dd/MM/yyyy, HH:mm:ss"
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "הסרת קישורים שבורים"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "הוספת סקיצה"
@@ -957,14 +971,17 @@ msgstr "יבוא פתקיות דביקות הסתיים"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> מתוך <b>{1}</b> פתקיות דביקות יובאו בהצלחה."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "פתקיות דביקה <b>{0}</b> מתוך <b>{1}</b> יובאו בהצלחה."
+msgstr[1] "<b>{0}</b> פתקיות דביקות מתוך <b>{1}</b> יובאו בהצלחה."
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
msgid "Untitled"
msgstr "ללא שם"
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
msgid "Sticky Note: "
msgstr "פתקית דביקה: "
@@ -1073,7 +1090,88 @@ msgstr "מתבצע אימות בדפדפן (יש ללחוץ לאיפוס ההת
msgid "Set the default browser and try again"
msgstr "הגדרת דפדפן בררת המחדל ולנסות שוב."
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+msgid "Export All Notes to "
+msgstr "יצוא כל הפתקיות אל"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+msgid "Start exporting notes to "
+msgstr "התחלת יצוא הפתקיות אל"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+msgid "Export selected notebook to "
+msgstr "יצוא הפנקס הנבחר אל"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+msgid "Start exporting notebook to "
+msgstr "התחלת יצוא הפנקס אל"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_כלים"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "יצוא"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "יצוא הפתקיות שלך."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+msgid "Export All Notes To "
+msgstr "יצוא כל הפתקיות אל"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+msgid "Export Selected Notebook To "
+msgstr "יצוא הפנקס הנבחר אל"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "לא ניתן לייצא, הגישה נדחתה."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "לא ניתן לייצא, התיקייה אינה קיימת."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "לא ניתן לייצא: {0}."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "שגיאה בלתי ידועה."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:215
+msgid "Unfiled Notes"
+msgstr "פתקיות ריקות"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "הפתקיות שלך יוצאו ל־\"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "הפתקיות יוצאו בהצלחה"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "לא ניתן לשמור את הקבצים תחת \"{0}\""
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:506
+msgid "Create destination folder for "
+msgstr "יצירת תיקיית יעד עבור"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
msgstr "חיפוש בכול הפתקיות"
@@ -1142,10 +1240,6 @@ msgstr "תבנית פתקית {0}"
msgid "All Notes"
msgstr "כל הפתקיות"
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "פתקיות ריקות"
-
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
msgid "Note_books"
msgstr "פנ_קסים"
@@ -1185,7 +1279,7 @@ msgid "Delete the selected notebook"
msgstr "מחיקת הפנקס הנבחר"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:285
msgid "Notebooks"
msgstr "פנקסים"
@@ -1226,22 +1320,27 @@ msgstr "פנקס"
msgid "_New notebook..."
msgstr "פנ_קס חדש..."
-#: ../Tomboy/Note.cs:1568
+#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "פתקית חדשה {0}"
+
+#: ../Tomboy/Note.cs:1578
msgid "Really delete this note?"
msgstr "האם למחוק את פתקית זו?"
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1581
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "האם אכן למחוק פתקית זו?"
msgstr[1] "האם אכן למחוק {0} פתקיות אלו?"
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1592
msgid "If you delete a note it is permanently lost."
msgstr "אם הפתקית תימחק היא תאבד לעד."
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1626
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1251,13 +1350,13 @@ msgstr ""
"אירעה שגיאה במהלך שמירת הפתקיות שלך. נא לבדוק שיש מספיק מקום בכונן ושיש לך "
"הרשאות מספיקות לגשת אל {0}. ניתן למצוא את פרטי השגיאה ב־{1}."
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1642
msgid "Error saving note data."
msgstr "שגיאה בשמירת נתוני הפתקית."
#. New Note Template
#. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
msgid "New Note Template"
msgstr "תבנית פתקית חדשה"
@@ -1380,7 +1479,7 @@ msgstr ""
"זאת.</note-content>"
#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
msgid "Start Here"
msgstr "התחלה מכאן"
@@ -1388,14 +1487,9 @@ msgstr "התחלה מכאן"
msgid "Using Links in Tomboy"
msgstr "שימוש בקישורים ב־Tomboy"
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "פתקית חדשה {0}"
-
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
msgid "Describe your new note here."
msgstr "ניתן לתאר את הפתקית החדשה כאן."
@@ -1483,115 +1577,116 @@ msgstr "_סגירת כל הפתקיות"
msgid "Search"
msgstr "חיפוש"
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "חיפוש בין הפתקיות שלך (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:440
+msgid "Search your notes"
+msgstr "חיפוש בפתקיות שלך"
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:452
msgid "Link"
msgstr "קישור"
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "קישור הטקסט הנבחר לפתקית חדשה (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:459
+msgid "Link selected text to a new note"
+msgstr "קישור הטקסט הנבחר לפתקית חדשה"
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:472
msgid "_Text"
msgstr "_טקסט"
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:477
msgid "Set properties of text"
msgstr "הגדרת מאפייני הטקסט"
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:482
msgid "T_ools"
msgstr "_כלים"
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:486
msgid "Use tools on this note"
msgstr "שימוש בכלים על פתקית זאת"
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:494
msgid "Delete this note"
msgstr "מחיקת הפתקית"
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "סנכרון פתקיות"
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:564
msgid "_Find..."
msgstr "_חיפוש..."
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:575
msgid "Find _Next"
msgstr "חיפוש ה_בא"
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:588
msgid "Find _Previous"
msgstr "חיפוש ה_קודם"
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:676
msgid "Cannot create note"
msgstr "לא ניתן ליצור פתקית"
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:757
msgid "_Find:"
msgstr "_חיפוש:"
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:768
msgid "_Previous"
msgstr "ה_קודם"
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:777
msgid "_Next"
msgstr "ה_בא"
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1260
msgid "_Bold"
msgstr "_מודגש"
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1272
msgid "_Italic"
msgstr "_נטוי"
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1284
msgid "_Strikeout"
msgstr "_קו חוצה"
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1296
msgid "_Highlight"
msgstr "ה_דגשה"
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1309
msgid "Font Size"
msgstr "גודל גופן"
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1312
msgid "_Normal"
msgstr "_רגיל"
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1329
msgid "Hu_ge"
msgstr "ע_נק"
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1337
msgid "_Large"
msgstr "_גדול"
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1345
msgid "S_mall"
msgstr "ק_טן"
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1354
msgid "Increase Font Size"
msgstr "הגדלת הגופן"
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1372
msgid "Decrease Font Size"
msgstr "הקטנת הגופן"
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1392
msgid "Bullets"
msgstr "תבליטים"
@@ -1611,22 +1706,22 @@ msgstr "סנכרון"
msgid "Add-ins"
msgstr "תוספים"
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
msgid "_Spell check while typing"
msgstr "בדיקת _איות בזמן ההקלדה"
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
msgid ""
"Misspellings will be underlined in red, with correct spelling suggestions "
"shown in the context menu."
msgstr "שגיאות כתיב יסומנו בקו תחתון אדום, עם הצעות תיקון שיוצגו בתפריט ההקשר."
#. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
msgid "Highlight _WikiWords"
msgstr "הדגשת מילות _ויקי"
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
msgid ""
"Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
"word will create a note with that name."
@@ -1635,46 +1730,46 @@ msgstr ""
"<b>NoSpaceFirstLetterIsCapital</b>. לחיצה על המילה תיצור פתקית בשם זהה."
#. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
msgid "Enable auto-_bulleted lists"
msgstr "יש לאפשר רשימות _תבליטים אוטומטיות"
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
msgid "Use custom _font"
msgstr "שימוש _בגופן מותאם אישית"
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
msgid "When renaming a linked note: "
msgstr "בעת שינוי שם של פתקית מקושרת:"
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
msgid "Ask me what to do"
msgstr "הצגת שאלה בפני מה לעשות"
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
msgid "Never rename links"
msgstr "לעולם לא לשנות את שמות הקישורים"
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
msgid "Always rename links"
msgstr "תמיד לשנות את שמות הקישורים"
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
msgid ""
"Use the new note template to specify the text that should be used when "
"creating a new note."
msgstr "שימוש בתבנית הפתקית החדשה עבור טקסט בררת המחדל כאשר יוצרים פתקית חדשה."
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
msgstr "פתיחת תבנית של פתקית חדשה"
#. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
msgid "Listen for _Hotkeys"
msgstr "האזנה למקשים _חמים"
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
msgid ""
"Hotkeys allow you to quickly access your notes from anywhere with a "
"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1684,104 +1779,104 @@ msgstr ""
"לדוגמה: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
msgid "Show notes _menu"
msgstr "הצגת _תפריט הפתקיות"
#. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
msgid "Open \"_Start Here\""
msgstr "פתיחת \"ה_תחלה מכאן\""
#. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
msgid "Create _new note"
msgstr "יצירת פתקית _חדשה"
#. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
msgid "Open \"Search _All Notes\""
msgstr "פתיחת \"חיפוש ב_כול הפתקיות\""
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
msgid "Ser_vice:"
msgstr "_שירות:"
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
msgid "Not configurable"
msgstr "לא ניתן לשינוי"
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
msgid "Automaticall_y Sync in Background Every"
msgstr "ביצוע _סנכרון אוטומטי ברקע בכול"
#. Translators: See above comment for details on
#. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
msgid "Minutes"
msgstr "דקות"
#. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
msgid "_Advanced..."
msgstr "מ_תקדם..."
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
msgid "The following add-ins are installed"
msgstr "התוספים הבאים מותקנים"
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
msgid "Get More Add-Ins..."
msgstr "לקבלת עוד תוספים..."
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
msgid "_Enable"
msgstr "ה_פעלה"
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
msgid "_Disable"
msgstr "_נטרול"
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
msgid "Not Implemented"
msgstr "לא ממומש"
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
#, csharp-format
msgid "{0} Preferences"
msgstr "העדפות {0}"
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
msgid "Choose Note Font"
msgstr "בחירת שם גופן"
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
msgid "Other Synchronization Options"
msgstr "אפשרויות סנכרון אחרות"
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
msgid ""
"When a conflict is detected between a local note and a note on the "
"configured synchronization server:"
msgstr "כאשר מתגלה סתירה בין פתקית מקומית לפתקית על שרת סנכרון:"
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
msgid "Always ask me what to do."
msgstr "תמיד להציג שאלה מה לעשות."
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
msgid "Rename my local note."
msgstr "שינוי שם הפתקית המקומית."
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
msgid "Replace my local note with the server's update."
msgstr "החלפת הפתקית המקומית בעדכון מהשרת."
-#: ../Tomboy/PreferencesDialog.cs:1149
+#: ../Tomboy/PreferencesDialog.cs:1142
msgid "Are you sure?"
msgstr "האם אכן לעשות זאת?"
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
msgid ""
"Clearing your synchronization settings is not recommended. You may be "
"forced to synchronize all of your notes again when you save new settings."
@@ -1789,30 +1884,30 @@ msgstr ""
"ניקוי הגדרות הסנכרון אינו מומלץ. יתכן ויהיה עליך לסנכרן שוב את כל הפתקיות "
"שלך לאחר שמירת ההגדרות החדשות."
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
msgid "Resetting Synchronization Settings"
msgstr "הגדרות הסנכרון מתאפסות"
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
msgid ""
"You have disabled the configured synchronization service. Your "
"synchronization settings will now be cleared. You may be forced to "
-"synchronize all of your notes again when you save new settings"
+"synchronize all of your notes again when you save new settings."
msgstr ""
-"כיבית את שירות הסנכרון. הגדרות הסנכרון שלך יפונו. יתכן ויהיה עליך לסנכרן שוב "
-"את כל הפתקיות שלך לאחר שמירת ההגדרות החדשות"
+"נטרלת את שירות הסנכרון. הגדרות הסנכרון שלך יימחקו. יתכן שיהיה עליך לסנכרן "
+"שוב את כל הפתקיות שלך לאחר שמירת ההגדרות החדשות."
-#: ../Tomboy/PreferencesDialog.cs:1244
+#: ../Tomboy/PreferencesDialog.cs:1237
msgid "Connection successful"
msgstr "ההתחברות הצליחה"
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
msgid ""
"Tomboy is ready to synchronize your notes. Would you like to synchronize "
"them now?"
msgstr "Tomboy מוכן לסנכרן את הפתקיות שלך. האם ברצונך לבצע סנכרון כעת?"
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
msgid ""
"Please check your information and try again. The log file {0} may contain "
@@ -1821,68 +1916,80 @@ msgstr ""
"נא לבדוק את המידע שלך ולנסות שוב. באפשרותך להיעזר במידע שב־{0} בנוגע לשגיאה "
"שקרתה."
-#: ../Tomboy/PreferencesDialog.cs:1281
+#: ../Tomboy/PreferencesDialog.cs:1274
msgid "Error connecting"
msgstr "שגיאת התחברות"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1350
msgid "Version:"
msgstr "גרסה:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Author:"
msgstr "יוצר:"
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Copyright:"
msgstr "זכויות יוצרים:"
-#: ../Tomboy/PreferencesDialog.cs:1377
+#: ../Tomboy/PreferencesDialog.cs:1370
msgid "Add-in Dependencies:"
msgstr "תלויות התוסף:"
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
msgid "_Search:"
msgstr "_חיפוש:"
-#: ../Tomboy/RecentChanges.cs:334
+#: ../Tomboy/RecentChanges.cs:359
msgid "Note"
msgstr "פתקית"
-#: ../Tomboy/RecentChanges.cs:356
+#: ../Tomboy/RecentChanges.cs:381
msgid "Last Changed"
msgstr "שונה לאחרונה"
-#: ../Tomboy/RecentChanges.cs:487
+#: ../Tomboy/RecentChanges.cs:520
msgid "Matches"
msgstr "התאמות"
-#: ../Tomboy/RecentChanges.cs:538
+#: ../Tomboy/RecentChanges.cs:571
msgid "Title match"
msgstr "התאמת כותרת"
-#: ../Tomboy/RecentChanges.cs:541
+#: ../Tomboy/RecentChanges.cs:574
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "התאמה אחת"
msgstr[1] "{0} התאמות"
-#: ../Tomboy/RecentChanges.cs:555
+#: ../Tomboy/RecentChanges.cs:588
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "סך הכול: פתקית אחת"
msgstr[1] "סך הכל: {0} פתקיות"
-#: ../Tomboy/RecentChanges.cs:566
+#: ../Tomboy/RecentChanges.cs:599
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "התאמות: פתקית אחת"
msgstr[1] "התאמות: {0} פתקיות"
-#: ../Tomboy/RecentChanges.cs:702
+#: ../Tomboy/RecentChanges.cs:611
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"לא נמצאו תוצאות בפנקס הנבחר.\n"
+"יש ללחוץ כאן כדי לחפש בין כל הפתקיות."
+
+#: ../Tomboy/RecentChanges.cs:617
+msgid "Click here to search across all notebooks"
+msgstr "יש ללחוץ כאן כדי לחפש בין כל הפנקסים"
+
+#: ../Tomboy/RecentChanges.cs:783
msgid "Notes"
msgstr "פתקיות"
@@ -1898,7 +2005,7 @@ msgstr "פיתוח עיקרי:"
msgid "Contributors:"
msgstr "תורמים"
-#: ../Tomboy/Tomboy.cs:405
+#: ../Tomboy/Tomboy.cs:412
msgid "translator-credits"
msgstr ""
"יאיר הרשקוביץ <yairhr at gmail.com>\n"
@@ -1908,33 +2015,36 @@ msgstr ""
"פרויקט תרגום GNOME לעברית:\n"
"http://gnome-il.berlios.de"
-#: ../Tomboy/Tomboy.cs:414
+#: ../Tomboy/Tomboy.cs:421
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+"Copyright © 2004-2011 Others\n"
msgstr ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+"Copyright © 2004-2011 אחרים\n"
-#: ../Tomboy/Tomboy.cs:416
+#: ../Tomboy/Tomboy.cs:423
msgid "A simple and easy to use desktop note-taking application."
msgstr "יישום פתקיות פשוט וקל לשימוש לשולחן העבודה."
-#: ../Tomboy/Tomboy.cs:426
+#: ../Tomboy/Tomboy.cs:433
msgid "Homepage"
msgstr "דף הבית"
-#: ../Tomboy/Tomboy.cs:544
+#: ../Tomboy/Tomboy.cs:551
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
"\n"
+"Copyright © 2004-2011 Others\n"
msgstr ""
"Tomboy: יישום פשוט וקל לרישום פתקים בשולחן העבודה.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"Copyright (C) 2004-2007 Alex Graveley\n"
"\n"
+"Copyright © 2004-2011 אחרים\n"
-#: ../Tomboy/Tomboy.cs:556
+#: ../Tomboy/Tomboy.cs:565
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -1948,7 +2058,7 @@ msgstr ""
" --note-path [path]\t\tLoad/store note data in this directory.\n"
" --search [text]\t\tOpen the search all notes window with the search text.\n"
-#: ../Tomboy/Tomboy.cs:566
+#: ../Tomboy/Tomboy.cs:575
msgid ""
" --new-note\t\t\tCreate and display a new note.\n"
" --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1962,7 +2072,7 @@ msgstr ""
" --start-here\t\t\tDisplay the 'Start Here' note.\n"
" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-#: ../Tomboy/Tomboy.cs:580
+#: ../Tomboy/Tomboy.cs:589
#, csharp-format
msgid "Version {0}"
msgstr "Version {0}"
@@ -2080,11 +2190,11 @@ msgstr "פתקית בשם <b>{0}</b> כבר קיימת. נא לבחור שם
msgid "Note title taken"
msgstr "שם הפתקית תפוס"
-#: ../Tomboy/Watchers.cs:549
+#: ../Tomboy/Watchers.cs:587
msgid "_Copy Link Address"
msgstr "ה_עתקת מיקום הקישור"
-#: ../Tomboy/Watchers.cs:554
+#: ../Tomboy/Watchers.cs:592
msgid "_Open Link"
msgstr "_פתיחת הקישור"
@@ -2317,10 +2427,6 @@ msgid ""
msgstr ""
"גרסת השרת \"{0}\" מתנגשת עם הפתק הנוכחי שלך. מה ברצונך לעשות עם הפתק הנוכחי?"
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_כלים"
-
#: ../Tomboy/Synchronization/SyncUtils.cs:119
#: ../Tomboy/Synchronization/SyncUtils.cs:163
msgid "Could not enable FUSE"
@@ -2353,6 +2459,12 @@ msgstr ""
"הביטוי \"modprobe fuse\" אל /etc/init.d/boot.local או את \"fuse\" אל /etc/"
"modules."
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "HTML Export Last Directory"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "חיפוש בין הפתקיות שלך (Ctrl-Shift-F)"
+
#~ msgid "SSH (sshfs FUSE)"
#~ msgstr "SSH (sshfs FUSE)"
diff --git a/po/sl.po b/po/sl.po
index d8c975b..1c6f236 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: tomboy\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-06-12 03:43+0000\n"
-"PO-Revision-Date: 2011-06-13 08:14+0100\n"
+"POT-Creation-Date: 2011-06-26 11:05+0000\n"
+"PO-Revision-Date: 2011-06-26 20:31+0100\n"
"Last-Translator: Matej Urbančič <mateju at svn.gnome.org>\n"
"Language-Team: Slovenian <gnome-si at googlegroups.com>\n"
+"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\\n\n"
"X-Poedit-Language: Slovenian\n"
"X-Poedit-Country: Slovenia\n"
@@ -552,6 +552,10 @@ msgstr "Ali želite res izbrisati to ikono?"
msgid "If you remove an icon it is permanently lost."
msgstr "V primeru da ikono izbrišete, bo ta trajno izgubljena."
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "Izvozi v HTML"
@@ -566,10 +570,14 @@ msgid "Note exported successfully"
msgstr "Sporočilce je bilo uspešno izvoženo"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
msgid "Access denied."
msgstr "Dostop je zavrnjen."
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
msgid "Folder does not exist."
msgstr "Mapa ne obstaja."
@@ -699,6 +707,11 @@ msgstr "Stran {0} od {1}"
msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd. dd.MM.yyyy, hh:mm:ss tt"
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Odstrani pokvarjene povezave"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Dodajanje shem"
@@ -866,8 +879,89 @@ msgstr "Overjanje v brskalniku (Pritisnite za ponastavitev povezave)"
msgid "Set the default browser and try again"
msgstr "Določite privzeti brskalnik in poskusite znova"
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+msgid "Export All Notes to "
+msgstr "Izvozi vsa sporočilca v"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+msgid "Start exporting notes to "
+msgstr "Začni izvažanje sporočilc na"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+msgid "Export selected notebook to "
+msgstr "Izvozi izbrano beležko na"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+msgid "Start exporting notebook to "
+msgstr "Začni izvažanje beležke na"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Orodja"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Izvozi"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Izvozi sporočilca."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+msgid "Export All Notes To "
+msgstr "Izvozi vsa sporočilca na"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+msgid "Export Selected Notebook To "
+msgstr "Izvozi izbrano beležko na"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Ni mogoče izvoziti sporočilc: dostop je zavrnjen."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Ni mogoče izvoziti sporočilc: mapa ne obstaja."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Ni mogoče izvoziti: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "neznana napaka."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:215
+msgid "Unfiled Notes"
+msgstr "Nezapolnjena sporočilca"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Sporočilca so bila izvožena na \"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Sporočilca so uspešno izvožena"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Ni mogoče shraniti datotek v \"{0}\""
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:506
+msgid "Create destination folder for "
+msgstr "Ustvari ciljno mapo za"
+
#: ../Tomboy/JumpListManager.cs:96
-#: ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
msgstr "Iskanje vseh sporočilc"
@@ -936,10 +1030,6 @@ msgstr "{0} Predloga sporočilca"
msgid "All Notes"
msgstr "Vsa sporočilca"
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Nezapolnjena sporočilca"
-
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
msgid "Note_books"
msgstr "_Beležke"
@@ -979,7 +1069,7 @@ msgid "Delete the selected notebook"
msgstr "Izbriše izbrano beležko"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:283
+#: ../Tomboy/RecentChanges.cs:285
msgid "Notebooks"
msgstr "Beležke"
@@ -1017,7 +1107,7 @@ msgid "_New notebook..."
msgstr "Nova _beležka ..."
#: ../Tomboy/Note.cs:497
-#: ../Tomboy/NoteManager.cs:449
+#: ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "Novo sporočilce {0}"
@@ -1137,7 +1227,7 @@ msgstr ""
#. Attempt to find an existing Start Here note
#: ../Tomboy/NoteManager.cs:299
-#: ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:395
msgid "Start Here"
msgstr "Začnite tukaj"
@@ -1147,8 +1237,8 @@ msgstr "Uporaba povezav v programu Tomboy"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522
-#: ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:548
+#: ../Tomboy/NoteManager.cs:641
msgid "Describe your new note here."
msgstr "Tukaj opišite svoje novo sporočilce."
@@ -1448,7 +1538,7 @@ msgid "Ser_vice:"
msgstr "_Storitev:"
#: ../Tomboy/PreferencesDialog.cs:487
-#: ../Tomboy/PreferencesDialog.cs:1114
+#: ../Tomboy/PreferencesDialog.cs:1106
msgid "Not configurable"
msgstr "Ni nastavljivo"
@@ -1475,117 +1565,117 @@ msgstr "Nameščeni so naslednji vstavki"
msgid "Get More Add-Ins..."
msgstr "Več vstavkov ..."
-#: ../Tomboy/PreferencesDialog.cs:649
+#: ../Tomboy/PreferencesDialog.cs:641
msgid "_Enable"
msgstr "_Omogoči"
-#: ../Tomboy/PreferencesDialog.cs:655
+#: ../Tomboy/PreferencesDialog.cs:647
msgid "_Disable"
msgstr "O_nemogoči"
-#: ../Tomboy/PreferencesDialog.cs:786
+#: ../Tomboy/PreferencesDialog.cs:778
msgid "Not Implemented"
msgstr "Ni podprto"
-#: ../Tomboy/PreferencesDialog.cs:800
+#: ../Tomboy/PreferencesDialog.cs:792
#, csharp-format
msgid "{0} Preferences"
msgstr "{0} Možnosti"
-#: ../Tomboy/PreferencesDialog.cs:939
+#: ../Tomboy/PreferencesDialog.cs:931
msgid "Choose Note Font"
msgstr "Izbor pisave sporočilca"
-#: ../Tomboy/PreferencesDialog.cs:983
+#: ../Tomboy/PreferencesDialog.cs:975
msgid "Other Synchronization Options"
msgstr "Druge možnosti usklajevanja"
-#: ../Tomboy/PreferencesDialog.cs:989
+#: ../Tomboy/PreferencesDialog.cs:981
msgid "When a conflict is detected between a local note and a note on the configured synchronization server:"
msgstr "Ko je zaznan spor med krajevno in oddaljeno kopijo na strežniku usklajevanja:"
-#: ../Tomboy/PreferencesDialog.cs:996
+#: ../Tomboy/PreferencesDialog.cs:988
msgid "Always ask me what to do."
msgstr "Vedno me vprašaj za potrditev dejanja."
-#: ../Tomboy/PreferencesDialog.cs:1000
+#: ../Tomboy/PreferencesDialog.cs:992
msgid "Rename my local note."
msgstr "Preimenuj krajevno sporočilce."
-#: ../Tomboy/PreferencesDialog.cs:1004
+#: ../Tomboy/PreferencesDialog.cs:996
msgid "Replace my local note with the server's update."
msgstr "Zamenjaj krajevno sporočilce s posodobljenim sporočilcem na strežniku."
-#: ../Tomboy/PreferencesDialog.cs:1150
+#: ../Tomboy/PreferencesDialog.cs:1142
msgid "Are you sure?"
msgstr "Ali ste prepričani?"
-#: ../Tomboy/PreferencesDialog.cs:1152
+#: ../Tomboy/PreferencesDialog.cs:1144
msgid "Clearing your synchronization settings is not recommended. You may be forced to synchronize all of your notes again when you save new settings."
msgstr "Čiščenje nastavitev usklajevanja ni priporočeno. Lahko se zgodi, da boste morali po shranjevanju novih nastavitev ponovno uskladiti vsa sporočilca."
-#: ../Tomboy/PreferencesDialog.cs:1165
+#: ../Tomboy/PreferencesDialog.cs:1157
msgid "Resetting Synchronization Settings"
msgstr "Ponastavljanje nastavitev usklajevanja"
-#: ../Tomboy/PreferencesDialog.cs:1167
-msgid "You have disabled the configured synchronization service. Your synchronization settings will now be cleared. You may be forced to synchronize all of your notes again when you save new settings"
-msgstr "Onemogočili ste nastavljeno storitev usklajevanja. Vaše nastavitve usklajevanja bodo sedaj počiščene. Lahko se zgodi, da boste morali vsa sporočilca znova uskladiti z novimi nastavitvami."
+#: ../Tomboy/PreferencesDialog.cs:1159
+msgid "You have disabled the configured synchronization service. Your synchronization settings will now be cleared. You may be forced to synchronize all of your notes again when you save new settings."
+msgstr "Onemogočili ste nastavitev storitev usklajevanja. Vaše nastavitve usklajevanja bodo počiščene. Lahko se zgodi, da bo treba vsa sporočilca znova uskladiti z novimi nastavitvami."
-#: ../Tomboy/PreferencesDialog.cs:1245
+#: ../Tomboy/PreferencesDialog.cs:1237
msgid "Connection successful"
msgstr "Povezava je uspešno vzpostavljena"
-#: ../Tomboy/PreferencesDialog.cs:1247
+#: ../Tomboy/PreferencesDialog.cs:1239
msgid "Tomboy is ready to synchronize your notes. Would you like to synchronize them now?"
msgstr "Program Tomboy je pripravljen na usklajevanje sporočilc. Ali želite takoj zagnati usklajevanje?"
-#: ../Tomboy/PreferencesDialog.cs:1270
+#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
msgid "Please check your information and try again. The log file {0} may contain more information about the error."
msgstr "Preverite svoje podatke in poskusite znova. Več podrobnosti je mogoče najti tudi v dnevniški datoteki {0}."
-#: ../Tomboy/PreferencesDialog.cs:1282
+#: ../Tomboy/PreferencesDialog.cs:1274
msgid "Error connecting"
msgstr "Napaka med povezovanjem"
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1350
msgid "Version:"
msgstr "Različica:"
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Author:"
msgstr "Avtor:"
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Copyright:"
msgstr "Avtorske pravice:"
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1370
msgid "Add-in Dependencies:"
msgstr "Odvisnosti vstavkov:"
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
msgid "_Search:"
msgstr "_Išči:"
-#: ../Tomboy/RecentChanges.cs:357
+#: ../Tomboy/RecentChanges.cs:359
msgid "Note"
msgstr "Sporočilce"
-#: ../Tomboy/RecentChanges.cs:379
+#: ../Tomboy/RecentChanges.cs:381
msgid "Last Changed"
msgstr "Zadnjič spremenjeno"
-#: ../Tomboy/RecentChanges.cs:510
+#: ../Tomboy/RecentChanges.cs:520
msgid "Matches"
msgstr "Zadetki"
-#: ../Tomboy/RecentChanges.cs:561
+#: ../Tomboy/RecentChanges.cs:571
msgid "Title match"
msgstr "Zadetki naslova"
-#: ../Tomboy/RecentChanges.cs:564
+#: ../Tomboy/RecentChanges.cs:574
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
@@ -1594,7 +1684,7 @@ msgstr[1] "{0} zadetek"
msgstr[2] "{0} zadetka"
msgstr[3] "{0} zadetki"
-#: ../Tomboy/RecentChanges.cs:578
+#: ../Tomboy/RecentChanges.cs:588
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
@@ -1603,7 +1693,7 @@ msgstr[1] "Skupaj: {0} sporočilce"
msgstr[2] "Skupaj: {0} sporočilci"
msgstr[3] "Skupaj: {0} sporočilca"
-#: ../Tomboy/RecentChanges.cs:589
+#: ../Tomboy/RecentChanges.cs:599
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
@@ -1612,7 +1702,19 @@ msgstr[1] "Skupaj: {0} sporočilce"
msgstr[2] "Skupaj: {0} sporočilci"
msgstr[3] "Skupaj: {0} sporočilca"
-#: ../Tomboy/RecentChanges.cs:725
+#: ../Tomboy/RecentChanges.cs:611
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Ni najdenih zadetkov v izbrani beležnici.\n"
+"Kliknite tu za iskanje med vsemi beležkami."
+
+#: ../Tomboy/RecentChanges.cs:617
+msgid "Click here to search across all notebooks"
+msgstr "Kliknite tu za iskanje med vsemi beležkami."
+
+#: ../Tomboy/RecentChanges.cs:783
msgid "Notes"
msgstr "Sporočilca"
@@ -1628,39 +1730,43 @@ msgstr "Osnovni razvoj:"
msgid "Contributors:"
msgstr "Sodelavci:"
-#: ../Tomboy/Tomboy.cs:405
+#: ../Tomboy/Tomboy.cs:412
msgid "translator-credits"
msgstr ""
"Matej Urbančič <mateju at svn.gnome.org>\n"
"Matjaž Horvat <m at owca.info>"
-#: ../Tomboy/Tomboy.cs:414
+#: ../Tomboy/Tomboy.cs:421
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+"Copyright © 2004-2011 Others\n"
msgstr ""
"Avtorske pravice © 2004-2007 Alex Graveley\n"
-"Avtorske pravice © 2004-2010 Drugi\n"
+"Avtorske pravice © 2004-2011 Drugi\n"
-#: ../Tomboy/Tomboy.cs:416
+#: ../Tomboy/Tomboy.cs:423
msgid "A simple and easy to use desktop note-taking application."
msgstr "Preprost in enostaven program za pisanje sporočilc."
-#: ../Tomboy/Tomboy.cs:426
+#: ../Tomboy/Tomboy.cs:433
msgid "Homepage"
msgstr "Domača stran"
-#: ../Tomboy/Tomboy.cs:544
+#: ../Tomboy/Tomboy.cs:551
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
"\n"
+"Copyright © 2004-2011 Others\n"
msgstr ""
"Tomboy: enostaven program za pisanje sporočilc na namizju.\n"
-"Avtorske pravice pridržane (C) 2004-2007 Alex Graveley <alex at beatniksoftware.com>\n"
+"Avtorske pravice © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
"\n"
+"Avtorske pravice © 2004-2011 Drugi razvijalci\n"
-#: ../Tomboy/Tomboy.cs:556
+#: ../Tomboy/Tomboy.cs:565
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -1674,7 +1780,7 @@ msgstr ""
" --note-path [path]\t\tNaloži/shrani podatke o sporočilcu v tej mapi.\n"
" --search [text]\t\tOdpre okno vseh sporočil z iskanim besedilom.\n"
-#: ../Tomboy/Tomboy.cs:566
+#: ../Tomboy/Tomboy.cs:575
msgid ""
" --new-note\t\t\tCreate and display a new note.\n"
" --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1688,7 +1794,7 @@ msgstr ""
" --start-here\t\t\tPrikaže sporočilce 'Začnite tukaj'.\n"
" --highlight-search [text]\tIšče in poudari besedilo v odprtem sporočilcu.\n"
-#: ../Tomboy/Tomboy.cs:580
+#: ../Tomboy/Tomboy.cs:589
#, csharp-format
msgid "Version {0}"
msgstr "Različica {0}"
@@ -1810,11 +1916,11 @@ msgstr "Sporočilce z naslovom <b>{0}</b> že obstaja. Pred nadaljevanjem izberi
msgid "Note title taken"
msgstr "Naslov sporočilca je v uporabi"
-#: ../Tomboy/Watchers.cs:589
+#: ../Tomboy/Watchers.cs:587
msgid "_Copy Link Address"
msgstr "_Kopiraj naslov povezave"
-#: ../Tomboy/Watchers.cs:594
+#: ../Tomboy/Watchers.cs:592
msgid "_Open Link"
msgstr "_Odpri povezavo"
@@ -2040,10 +2146,6 @@ msgstr "Zaznan je spor sporočilc"
msgid "The server version of \"{0}\" conflicts with your local note. What do you want to do with your local note?"
msgstr "Različica strežnika \"{0}\" je v sporu z vašim krajevnim sporočilcem. Kaj želite storiti s svojim krajevnim sporočilcem?"
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Orodja"
-
#: ../Tomboy/Synchronization/SyncUtils.cs:119
#: ../Tomboy/Synchronization/SyncUtils.cs:163
msgid "Could not enable FUSE"
diff --git a/po/sr.po b/po/sr.po
index 6c659ef..1caad1b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,23 +1,22 @@
# Serbian translation of tomboy
# Courtesy of Prevod.org team (http://prevod.org/) -- 2006, 2007.
-#
# This file is distributed under the same license as the tomboy package.
-#
# Maintainer: Горан Ракић <grakic at devbase.net>
# Милош Поповић <gpopac at gmail.com>, 2010.
-#
+# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=tomboy&component=general\n"
-"POT-Creation-Date: 2010-06-07 21:58+0000\n"
-"PO-Revision-Date: 2010-08-27 15:00+0200\n"
-"Last-Translator: Милош Поповић <gpopac at gmail.com>\n"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-05-29 17:08+0000\n"
+"PO-Revision-Date: 2011-06-13 09:15+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Serbian (sr)\n"
"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
@@ -114,7 +113,6 @@ msgid "Enable Middle-Click Paste On Icon."
msgstr "Омогући убацивање средњим кликом на икону."
#: ../data/tomboy.schemas.in.h:11
-#| msgid "TrayIcon"
msgid "Enable Tray Icon"
msgstr "Постави иконицу у обавештајну зону"
@@ -198,8 +196,8 @@ msgid ""
"If enable_custom_font is true, the font name set here will be used as the "
"font when displaying notes."
msgstr ""
-"Ако је enable_custom_font укључено, биће коришћен овде одабран скуп словних "
-"ликова при приказу белешки."
+"Ако је „enable_custom_font“ укључено, биће коришћен овде одабран скуп "
+"словних ликова при приказу белешки."
#: ../data/tomboy.schemas.in.h:28
msgid ""
@@ -220,9 +218,9 @@ msgid ""
"Disabling this may be useful when another application is providing the "
"functionality of the tray icon."
msgstr ""
-"Уколико је постављено на „true“ (тачно) приказаће се Томицина иконица у "
-"обавештајној зони панела. Искључивање ове опције је корисно уколико неки "
-"други програм обезбеди обавештајну иконицу."
+"Уколико је укључено, приказаће се Томичина иконица у обавештајној зони "
+"панела. Искључивање ове опције је корисно уколико неки други програм "
+"обезбеди обавештајну иконицу."
#: ../data/tomboy.schemas.in.h:31
msgid ""
@@ -238,7 +236,7 @@ msgid ""
"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
"available from any application."
msgstr ""
-"Ако је укључено, глобалне пречице постављене у /apps/tomboy ће бити "
+"Ако је укључено, глобалне пречице постављене у „/apps/tomboy“ ће бити "
"омогућене, што даје могућност да се неким корисним акцијама Томичиних "
"белешки приступа из других програма."
@@ -248,23 +246,24 @@ msgid ""
"displaying notes. Otherwise the desktop default font will be used."
msgstr ""
"Ако је укључено, биће коришћен скуп словних ликова наведен у "
-"custom_font_face при приказу белешки, иначе подразумевани словни лик ће бити "
-"коришћен."
+"„custom_font_face“ при приказу белешки, иначе подразумевани словни лик ће "
+"бити коришћен."
#: ../data/tomboy.schemas.in.h:34
msgid ""
"Indicates that the Sticky Note Importer plugin has not been run, so it "
"should run automatically the next time Tomboy starts."
msgstr ""
-"Индицира да увоз гномових белешку није покренут, и да треба бити покренут "
-"при следећем Томичином покретању."
+"Указује да увоз гномових белешки није покренут, и да треба бити покренут при "
+"следећем Томичином покретању."
#: ../data/tomboy.schemas.in.h:35
msgid ""
"Integer determining the minimum number of notes to show in the Tomboy note "
"menu."
msgstr ""
-"Цео број који одређује минимални број белешки које ће бити приказане у менију"
+"Цео број који одређује минимални број белешки које ће бити приказане у "
+"менију."
#: ../data/tomboy.schemas.in.h:36
msgid ""
@@ -303,11 +302,11 @@ msgid ""
msgstr ""
"Цео број који одређује да ли је пожељно да се увек примењује неко одређено "
"ажурирање веза када се белешка преименује, уместо да се пита корисник. "
-"Бројеви имају своју интерну представу. 0 значи да корисник жели да буде "
+"Бројеви имају своју интерну представу. 0 — значи да корисник жели да буде "
"питан када се преименује белешка која има друге белешке које имају везе ка "
-"њој. 1 значи да се све везе аутоматски уклањају. 2 значи да текст везе треба "
-"ажурирати на ново име белешке тако да веза ка преименованој белешци настави "
-"да постоји."
+"њој. 1 — значи да се све везе аутоматски уклањају. 2 — значи да текст везе "
+"треба ажурирати на ново име белешке тако да веза ка преименованој белешци "
+"настави да постоји."
#: ../data/tomboy.schemas.in.h:39
msgid "Link Updating Behavior on Note Rename"
@@ -315,7 +314,7 @@ msgstr "Понашање за ажурирање веза при преимен
#: ../data/tomboy.schemas.in.h:40
msgid "List of pinned notes."
-msgstr "Листа забодених белешки."
+msgstr "Листа прибодених белешки."
#: ../data/tomboy.schemas.in.h:41
msgid ""
@@ -400,7 +399,7 @@ msgstr "Одабрани додатак за сервис усклађивања
#: ../data/tomboy.schemas.in.h:59
msgid "Set to TRUE to activate"
-msgstr "Постави на TRUE да би било укључено"
+msgstr "Изаберите да би било укључено"
#: ../data/tomboy.schemas.in.h:60
msgid "Show applet menu"
@@ -435,11 +434,11 @@ msgid ""
"option to the special string \"disabled\", then there will be no keybinding "
"for this action."
msgstr ""
-"Глобална пречица за отварање и приказ нове белешке. Формат поља је као \"<"
-"Control>a\" или \"<Shift><Alt>F1\". Формат је доста слободан "
-"и дозвољава мала или велика слова као и скраћенице попут \"<Ctl>\"и "
-"\"<Ctrl>\". Ако поставиш ову опцију на посебну вредност \"disabled\","
-"тада неће постојати пречица за ову акцију."
+"Глобална пречица за отварање и приказ нове белешке. Формат поља је као „<"
+"Control>a“ или „<Shift><Alt>F1“. Формат је доста слободан и "
+"дозвољава мала или велика слова као и скраћенице попут „<Ctl>\"и \"<"
+"Ctrl>“. Ако поставите ову опцију на посебну вредност „disabled“,тада неће "
+"постојати пречица за ову акцију."
#: ../data/tomboy.schemas.in.h:67
msgid ""
@@ -450,11 +449,11 @@ msgid ""
"special string \"disabled\", then there will be no keybinding for this "
"action."
msgstr ""
-"Глобална пречица за отварање белешке \"Почетна станица\". Формат поља је као "
-"\"<Control>a\" или \"<Shift><Alt>F1\". Формат је доста "
-"слободан и дозвољава мала или велика слова као и скраћенице попут \"<"
-"Ctl>\"и \"<Ctrl>\". Ако поставиш ову опцију на посебну вредност "
-"\"disabled\",тада неће постојати пречица за ову акцију."
+"Глобална пречица за отварање белешке „Почетна станица“. Формат поља је као "
+"„<Control>a“ или „<Shift><Alt>F1“. Формат је доста "
+"слободан и дозвољава мала или велика слова као и скраћенице попут „<"
+"Ctl>“ и „<Ctrl>“. Ако поставите ову опцију на посебну вредност "
+"„disabled“,тада неће постојати пречица за ову акцију."
#: ../data/tomboy.schemas.in.h:68
msgid ""
@@ -466,10 +465,10 @@ msgid ""
"action."
msgstr ""
"Глобална пречица за отварање прозорчета за претраживање. Формат поља је као "
-"\"<Control>a\" или \"<Shift><Alt>F1\". Формат је доста "
-"слободан и дозвољава мала или велика слова као и скраћенице попут \"<"
-"Ctl>\"и \"<Ctrl>\". Ако поставиш ову опцију на посебну вредност "
-"\"disabled\",тада неће постојати пречица за ову акцију."
+"„<Control>a“ или „<Shift><Alt>F1“. Формат је доста "
+"слободан и дозвољава мала или велика слова као и скраћенице попут „<"
+"Ctl>“и „<Ctrl>“. Ако поставите ову опцију на посебну вредност "
+"„disabled“,тада неће постојати пречица за ову акцију."
#: ../data/tomboy.schemas.in.h:69
msgid ""
@@ -481,10 +480,10 @@ msgid ""
"for this action."
msgstr ""
"Глобална пречица за отварање прозорчета са скорашњим изменама. Формат поља "
-"је као \"<Control>a\" или \"<Shift><Alt>F1\". Формат је "
-"доста слободан и дозвољава мала или велика слова као и скраћенице попут "
-"\"<Ctl>\"и \"<Ctrl>\". Ако поставиш ову опцију на посебну "
-"вредност \"disabled\",тада неће постојати пречица за ову акцију."
+"је као „<Control>a“ или „<Shift><Alt>F1“. Формат је доста "
+"слободан и дозвољава мала или велика слова као и скраћенице попут „<"
+"Ctl>“ и „<Ctrl>“. Ако поставите ову опцију на посебну вредност "
+"„disabled“,тада неће постојати пречица за ову акцију."
#: ../data/tomboy.schemas.in.h:70
msgid ""
@@ -495,15 +494,15 @@ msgid ""
"special string \"disabled\", then there will be no keybinding for this "
"action."
msgstr ""
-"Глобална пречица за приказ менија програмчета. Формат поља је као \"<"
-"Control>a\" или \"<Shift><Alt>F1\". Формат је доста слободан "
-"и дозвољава мала или велика слова као и скраћенице попут \"<Ctl>\"и "
-"\"<Ctrl>\". Ако поставиш ову опцију на посебну вредност \"disabled\","
-"тада неће постојати пречица за ову акцију."
+"Глобална пречица за приказ менија програмчета. Формат поља је као „<"
+"Control>a“ или „<Shift><Alt>F1“. Формат је доста слободан и "
+"дозвољава мала или велика слова као и скраћенице попут „<Ctl>“ и „<"
+"Ctrl>“. Ако поставите ову опцију на посебну вредност „disabled“,тада неће "
+"постојати пречица за ову акцију."
#: ../data/tomboy.schemas.in.h:71
msgid "The handler for \"note://\" URLs"
-msgstr "Програм за прихватање \"note://\" УРЛ адреса"
+msgstr "Програм за прихватање „note://“ УРЛ адреса"
#: ../data/tomboy.schemas.in.h:72
msgid ""
@@ -517,7 +516,7 @@ msgid ""
"The last setting for the 'Export linked notes' checkbox in the Export to "
"HTML plugin."
msgstr ""
-"Последње подешавање за 'Извези повезане белешке' у додатку за извоз у ХТМЛ."
+"Последње подешавање за „Извези повезане белешке“ у додатку за извоз у ХТМЛ."
#: ../data/tomboy.schemas.in.h:74
msgid ""
@@ -526,9 +525,9 @@ msgid ""
"Export Linked Notes' setting and is used to specify whether all notes (found "
"recursively) should be included during an export to HTML."
msgstr ""
-"Последње подешавање за 'Извези све друге повезане белешке' у додатку за "
-"извоз у ХТМЛ. Ово подешавање се користи скупа са 'ХМЛ извози повезане "
-"белешке' подешавањем, а одређује да ли све белешке (рекурзивно откривене) "
+"Последње подешавање за „Извези све друге повезане белешке“ у додатку за "
+"извоз у ХТМЛ. Ово подешавање се користи скупа са „ХМЛ извози повезане "
+"белешке“ подешавањем, а одређује да ли све белешке (рекурзивно откривене) "
"требају бити укључене при извозу у ХТМЛ."
#: ../data/tomboy.schemas.in.h:75
@@ -537,7 +536,7 @@ msgid ""
"which is always placed at the bottom of the Tomboy note menu and also "
"accessible by hotkey."
msgstr ""
-"УРИ белешке која ће бити сматрана белешком за \"Почетну станицу\", која се "
+"УРИ белешке која ће бити сматрана белешком за „Почетну станицу“, која се "
"увек налази на дну менија у Томици и доступна је преко пречице са тастатуре."
#: ../data/tomboy.schemas.in.h:76
@@ -555,7 +554,7 @@ msgid ""
"mount a sync share."
msgstr ""
"Време (у милисекундама) које Томичине белешке чекају на одговор када се "
-"користи FUSE да се монтира дељена фасцикла.за усклађивање.с"
+"користи FUSE да се монтира дељена фасцикла.за усклађивање."
#: ../data/tomboy.schemas.in.h:78
msgid "Timestamp format"
@@ -585,7 +584,7 @@ msgid ""
"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
"user."
msgstr ""
-"Коришћење „-ac“опције wdfs-а за прихватање SSL сертификата без питања "
+"Коришћење „-ac“ опције wdfs-а за прихватање SSL сертификата без питања "
"корисника."
#: ../data/tomboy.schemas.in.h:83
@@ -743,31 +742,31 @@ msgstr "Заиста желиш да обришеш ову иконицу?"
msgid "If you remove an icon it is permanently lost."
msgstr "Ако је обришеш она ће заувек бити изгубљена."
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:66
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "Извези у ХТМЛ"
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:114
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
#, csharp-format
msgid "Your note was exported to \"{0}\"."
-msgstr "Твоја белешка је извезена у \"{0}\"."
+msgstr "Твоја белешка је извезена у „{0}“."
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:125
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
msgid "Note exported successfully"
msgstr "Белешка је успешно извезена"
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:131
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
msgid "Access denied."
msgstr "Приступ није дозвољен."
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
msgid "Folder does not exist."
msgstr "Фасцикла не постоји."
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:148
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
#, csharp-format
msgid "Could not save the file \"{0}\""
-msgstr "Не могу да сачувам датотеку \"{0}\""
+msgstr "Не могу да сачувам датотеку „{0}“"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
msgid "Destination for HTML Export"
@@ -813,7 +812,7 @@ msgstr "_Фиксна ширина"
#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
#, csharp-format
msgid "Cannot contact '{0}'"
-msgstr "Не могу да контактирам '{0}'"
+msgstr "Не могу да контактирам „{0}“"
#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
#, csharp-format
@@ -826,7 +825,7 @@ msgstr "Уметни датум и време"
#. initial newline
#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:227 ../Tomboy/Preferences.cs:154
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
msgid "dddd, MMMM d, h:mm tt"
msgstr "dddd, d. MMMM, h:mm tt"
@@ -948,7 +947,7 @@ msgstr "Нису пронађене гномове белешке"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
#, csharp-format
msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "Није пронађена погодна датотека гномових белешки у \"{0}\"."
+msgstr "Није пронађена погодна датотека гномових белешки у „{0}“."
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
msgid "Sticky Notes import completed"
@@ -1074,7 +1073,7 @@ msgstr "Пријава из Интернет прегледника (кликн
msgid "Set the default browser and try again"
msgstr "Поставите подразумевани интернет прегледник и покушајте поново"
-#: ../Tomboy/JumpListManager.cs:77 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
msgid "Search All Notes"
msgstr "Тражи кроз све белешке"
@@ -1082,16 +1081,16 @@ msgstr "Тражи кроз све белешке"
#. icons_path, (int)TomboyIcons.NewNotebook);
#. if (new_notebook != null)
#. object_collection.AddObject(new_notebook);
-#: ../Tomboy/JumpListManager.cs:87
+#: ../Tomboy/JumpListManager.cs:106
msgid "Create New Note"
msgstr "Направи нову белешку"
-#: ../Tomboy/JumpListManager.cs:117
+#: ../Tomboy/JumpListManager.cs:136
#, csharp-format
msgid "{0} (new)"
msgstr "{0} (нова)"
-#: ../Tomboy/JumpListManager.cs:139
+#: ../Tomboy/JumpListManager.cs:158
msgid "Recent Notes"
msgstr "Скорашње белешке"
@@ -1101,7 +1100,6 @@ msgid "_Window"
msgstr "_Прозор"
#: ../Tomboy/MacApplication.cs:234
-#| msgid "_Preferences"
msgid "Preferences..."
msgstr "Поставке..."
@@ -1191,11 +1189,11 @@ msgstr "Обриши одабрану свеску"
msgid "Notebooks"
msgstr "Свеске"
-#: ../Tomboy/Notebooks/NotebookManager.cs:356
+#: ../Tomboy/Notebooks/NotebookManager.cs:361
msgid "Really delete this notebook?"
msgstr "Заиста желиш да обришеш ову свеску?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:358
+#: ../Tomboy/Notebooks/NotebookManager.cs:363
msgid ""
"The notes that belong to this notebook will not be deleted, but they will no "
"longer be associated with this notebook. This action cannot be undone."
@@ -1236,14 +1234,14 @@ msgstr "Заиста желиш да обришеш ову белешку?"
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
-msgstr[0] "Заиста желиш да обришеш ову {0} белешку?"
-msgstr[1] "Заиста желиш да обришеш ове {0} белешке?"
-msgstr[2] "Заиста желиш да обришеш ових{0} белешки?"
-msgstr[3] "Заиста желиш да обришеш ових{0} белешка?"
+msgstr[0] "Заиста желите да обришете ову {0} белешку?"
+msgstr[1] "Заиста желите да обришете ове {0} белешке?"
+msgstr[2] "Заиста желите да обришете ових {0} белешки?"
+msgstr[3] "Заиста желите да обришете ову {0} белешку?"
#: ../Tomboy/Note.cs:1582
msgid "If you delete a note it is permanently lost."
-msgstr "Ако је обришеш она ће заувек бити изгубљена."
+msgstr "Ако је обришете она ће заувек бити изгубљена."
#: ../Tomboy/Note.cs:1616
#, csharp-format
@@ -1298,15 +1296,15 @@ msgid ""
"\n"
"Ciao!"
msgstr ""
-"У последњој верзији Томице, датотека са Вашим белешкама је премештена. Вас "
-"вероватно никад није занимало где су Вам белешке ускладиштене, а ако Вас ни "
+"У последњој верзији Томице, датотека са вашим белешкама је премештена. Вас "
+"вероватно никад није занимало где су вам белешке ускладиштене, а ако вас ни "
"сад не занима, продужите и <bold>избришите ову поруку</bold>. :-)\n"
"\n"
"Ваша стара фасцикла са белешкама је и даље сигурна у <link:url>{0}</link:"
"url> . Ако се вратите на стару верзију Томичиних белешки, он ће тражити "
"белешке у овој фасцикли.\n"
"\n"
-"Али ми смо умножили Ваше белешке и подешавања у нове фасцикле које ће се од "
+"Али ми смо умножили ваше белешке и подешавања у нове фасцикле које ће се од "
"сада користити:\n"
"\n"
"<list><list-item dir=\"ltr\">Белешке се могу наћи у <link:url>{1}</link:"
@@ -1343,17 +1341,18 @@ msgstr ""
"\n"
"<bold>Добродошли код Томице!</bold>\n"
"\n"
-"Користи белешку „Полазна станица“ да започнеш организацију идеја и мисли.\n"
+"Користите белешку „Полазна станица“ да започнете организацију идеја и "
+"мисли.\n"
"\n"
-"Направи нову белешку за запис идеја одабиром „Направи нову белешку“ из "
-"менија Томице у панелу Гнома. Твоја белешка ће аутоматски бити сачувана.\n"
+"Направите нову белешку за запис идеја одабиром „Направи нову белешку“ из "
+"менија Томице у панелу Гнома. Ваша белешка ће аутоматски бити сачувана.\n"
"\n"
-"Затим организуј белешке додавањем веза између сродних белешки и идеја!\n"
+"Затим организујте белешке додавањем веза између сродних белешки и идеја!\n"
"\n"
"Већ смо направили белешку која се зове <link:internal>Коришћење веза у "
-"Томици</link:internal>. Примећујеш ли како сваки пут када откуцамо <link:"
+"Томици</link:internal>. Примећујете ли како сваки пут када откуцамо <link:"
"internal>Коришћење веза у Томици</link:internal> текст аутоматски бива "
-"подвучен? Кликни на везу да отвориш белешку.</note-content>"
+"подвучен? Кликните на везу да отворите белешку.</note-content>"
#: ../Tomboy/NoteManager.cs:284
msgid ""
@@ -1372,19 +1371,19 @@ msgid ""
msgstr ""
"<note-content>Коришћење веза у Томици\n"
"\n"
-"Можеш повезати сродне белешке у Томици тако што означиш текст унутар белешке "
-"и кликнеш на дугме <bold>Веза</bold> изнад у линији алата. На тај начин ћеш "
-"направити нову белешку са тим насловом и направити везу ка њој у тренутној "
-"белешци.\n"
+"Можете повезати сродне белешке у Томици тако што ћете означити текст унутар "
+"белешке и кликнути на дугме <bold>Веза</bold> изнад у линији алата. На тај "
+"начин ћете направити нову белешку са тим насловом и направити везу ка њој у "
+"тренутној белешци.\n"
"\n"
-"Ако касније измениш наслов нове белешке, биће промењен текст осталих белешки "
-"како би се избегло прекидање веза.\n"
+"Ако касније измените наслов нове белешке, биће промењен текст осталих "
+"белешки како би се избегло прекидање веза.\n"
"\n"
-"Такође, ако укуцаш наслов неке постојеће белешке унутар постојеће, веза ка "
+"Такође, ако укуцате наслов неке постојеће белешке унутар постојеће, веза ка "
"њој ће аутоматски бити направљена.</note-content>"
#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:368
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
msgid "Start Here"
msgstr "Почетна станица"
@@ -1392,16 +1391,16 @@ msgstr "Почетна станица"
msgid "Using Links in Tomboy"
msgstr "Коришћење веза у Томици"
-#: ../Tomboy/NoteManager.cs:445
+#: ../Tomboy/NoteManager.cs:449
#, csharp-format
msgid "New Note {0}"
msgstr "{0}. белешка"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:518 ../Tomboy/NoteManager.cs:611
+#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
msgid "Describe your new note here."
-msgstr "Овде опиши твоју мисао."
+msgstr "Овде опишите вашу мисао."
#: ../Tomboy/NoteRenameDialog.cs:50
msgid "Rename Note Links?"
@@ -1423,43 +1422,43 @@ msgid ""
"\n"
"If you do not rename the links, they will no longer link to anything."
msgstr ""
-"Преименуј везе у осталим белешкама из „<span underline=\"single\">{0}</"
+"Преименујте везе у осталим белешкама из „<span underline=\"single\">{0}</"
"span>“ у „<span underline=\"single\">{1}</span>“?\n"
"\n"
"Ако не применујете везе, оне више неће показивати ни на шта."
-#: ../Tomboy/NoteRenameDialog.cs:81
+#: ../Tomboy/NoteRenameDialog.cs:83
msgid "Rename Links"
msgstr "Преименуј везе"
-#: ../Tomboy/NoteRenameDialog.cs:93
+#: ../Tomboy/NoteRenameDialog.cs:95
#: ../Tomboy/Synchronization/SyncDialog.cs:119
msgid "Note Title"
msgstr "Наслов белешке"
#. Translators: This button causes all notes in the list to be selected
-#: ../Tomboy/NoteRenameDialog.cs:116
+#: ../Tomboy/NoteRenameDialog.cs:118
msgid "Select All"
msgstr "Изабери све"
#. Translators: This button causes all notes in the list to be unselected
-#: ../Tomboy/NoteRenameDialog.cs:125
+#: ../Tomboy/NoteRenameDialog.cs:127
msgid "Select None"
-msgstr "Изабери ништа"
+msgstr "Поништи избор"
-#: ../Tomboy/NoteRenameDialog.cs:142
+#: ../Tomboy/NoteRenameDialog.cs:144
msgid "Ad_vanced"
msgstr "_Напредно"
-#: ../Tomboy/NoteRenameDialog.cs:145
+#: ../Tomboy/NoteRenameDialog.cs:147
msgid "Always show this _window"
msgstr "Увек приказуј овај _прозор"
-#: ../Tomboy/NoteRenameDialog.cs:153
+#: ../Tomboy/NoteRenameDialog.cs:155
msgid "Never rename _links"
msgstr "_Никад не преименуј везе"
-#: ../Tomboy/NoteRenameDialog.cs:161
+#: ../Tomboy/NoteRenameDialog.cs:163
msgid "Alwa_ys rename links"
msgstr "_Увек преименуј везе"
@@ -1553,11 +1552,11 @@ msgstr "_Следећа"
#: ../Tomboy/NoteWindow.cs:1258
msgid "_Bold"
-msgstr "_Масно"
+msgstr "_Подебљано"
#: ../Tomboy/NoteWindow.cs:1270
msgid "_Italic"
-msgstr "_Курзив"
+msgstr "_Искошено"
#: ../Tomboy/NoteWindow.cs:1282
msgid "_Strikeout"
@@ -1565,7 +1564,7 @@ msgstr "Пре_цртано"
#: ../Tomboy/NoteWindow.cs:1294
msgid "_Highlight"
-msgstr "_Означено"
+msgstr "_Подвучено"
#: ../Tomboy/NoteWindow.cs:1307
msgid "Font Size"
@@ -1687,8 +1686,8 @@ msgid ""
"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
"Alt>N</b>"
msgstr ""
-"Пречице омогућавају брзи приступ белешкама у сваком тренутку. Пример пречица:"
-"<b><Control><Shift>F11</b>, <b><Alt>N</b>"
+"Пречице омогућавају брзи приступ белешкама у сваком тренутку. Пример "
+"пречица: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
#: ../Tomboy/PreferencesDialog.cs:355
@@ -1698,7 +1697,7 @@ msgstr "Приказ _менија са белешкама"
#. Open Start Here keybinding...
#: ../Tomboy/PreferencesDialog.cs:372
msgid "Open \"_Start Here\""
-msgstr "Отвори \"Почетну страницу\""
+msgstr "Отвори „Почетну _страницу“"
#. Create new note keybinding...
#: ../Tomboy/PreferencesDialog.cs:389
@@ -1720,7 +1719,7 @@ msgstr "Није подесиво"
#: ../Tomboy/PreferencesDialog.cs:512
msgid "Automaticall_y Sync in Background Every"
-msgstr "Аутоматски синхронизуј белешке сваких"
+msgstr "Аутоматски усагласи белешке сваких"
#. Translators: See above comment for details on
#. this string.
@@ -1739,7 +1738,7 @@ msgstr "Следећи додаци су инсталирани"
#: ../Tomboy/PreferencesDialog.cs:622
msgid "Get More Add-Ins..."
-msgstr "Узмите још додатака..."
+msgstr "Набави још додатака..."
#: ../Tomboy/PreferencesDialog.cs:648
msgid "_Enable"
@@ -1788,7 +1787,7 @@ msgstr "Замени моју локалну белешку оном са сер
#: ../Tomboy/PreferencesDialog.cs:1149
msgid "WARNING: Are you sure?"
-msgstr "УПОЗОРЕЊЕ: Сигурно ово желиш?"
+msgstr "УПОЗОРЕЊЕ: Сигурно ово желите?"
#: ../Tomboy/PreferencesDialog.cs:1151
msgid ""
@@ -1796,7 +1795,7 @@ msgid ""
"forced to synchronize all of your notes again when you save new settings."
msgstr ""
"Уклањање поставки за усклађивање није препоручено. Може се догодити да мораш "
-"поново да ускладиш све своје белешке када сачуваш нове поставке."
+"поново да ускладите све ваше белешке када сачувате нове поставке."
#: ../Tomboy/PreferencesDialog.cs:1164
msgid "Resetting Synchronization Settings"
@@ -1808,9 +1807,9 @@ msgid ""
"synchronization settings will now be cleared. You may be forced to "
"synchronize all of your notes again when you save new settings"
msgstr ""
-"Подешени сервис за усклађивање је онемогућен. Твоје поставке за усклађивање "
-"ће сада бити обрисане. Може се догодити да мораш поново да ускладиш све "
-"своје белешке када сачуваш нове поставке"
+"Подешени сервис за усклађивање је онемогућен. Ваше поставке за усклађивање "
+"ће сада бити обрисане. Може се догодити да ћете морати поново да ускладите "
+"све ваше белешке када сачувате нове поставке."
#: ../Tomboy/PreferencesDialog.cs:1244
msgid "Success! You're connected!"
@@ -1828,7 +1827,7 @@ msgid ""
"Sorry, but something went wrong. Please check your information and try "
"again. The {0} might be useful too."
msgstr ""
-"Нажалост нешто је отишло наопако. Провери информације и покушај поново "
+"Нажалост нешто је пошло наопако. Проверите информације и покушајте поново. "
"Садржај из {0} такође може бити користан."
#: ../Tomboy/PreferencesDialog.cs:1282
@@ -1898,19 +1897,19 @@ msgstr[3] "Укупно: {0} белешка"
msgid "Notes"
msgstr "Белешке"
-#: ../Tomboy/Tomboy.cs:267
+#: ../Tomboy/Tomboy.cs:251
msgid "Cannot create new note"
msgstr "Не могу да направим нову белешку"
-#: ../Tomboy/Tomboy.cs:333
+#: ../Tomboy/Tomboy.cs:317
msgid "Primary Development:"
msgstr "Главни развој:"
-#: ../Tomboy/Tomboy.cs:339
+#: ../Tomboy/Tomboy.cs:330
msgid "Contributors:"
msgstr "Доприносиоци:"
-#: ../Tomboy/Tomboy.cs:404
+#: ../Tomboy/Tomboy.cs:405
msgid "translator-credits"
msgstr ""
"Горан Ракић <grakic at devbase.net>\n"
@@ -1918,33 +1917,33 @@ msgstr ""
"\n"
"http://prevod.org — превод на српски језик."
-#: ../Tomboy/Tomboy.cs:413
+#: ../Tomboy/Tomboy.cs:414
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2009 Others\n"
+"Copyright © 2004-2010 Others\n"
msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2009 Остали\n"
+"Ауторска права © 2004-2007 Alex Graveley\n"
+"Ауторска права © 2004-2010 Остали\n"
-#: ../Tomboy/Tomboy.cs:415
+#: ../Tomboy/Tomboy.cs:416
msgid "A simple and easy to use desktop note-taking application."
msgstr "Једноставан и згодан програмчић за хватање белешки"
-#: ../Tomboy/Tomboy.cs:425
+#: ../Tomboy/Tomboy.cs:426
msgid "Homepage"
msgstr "Веб страница"
-#: ../Tomboy/Tomboy.cs:537
+#: ../Tomboy/Tomboy.cs:544
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
"\n"
msgstr ""
"Томица: Једноставно програмче за хватање белешки.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"Ауторска права (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
"\n"
-#: ../Tomboy/Tomboy.cs:549
+#: ../Tomboy/Tomboy.cs:556
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -1960,7 +1959,7 @@ msgstr ""
" --search [текст]\t\tТражи унети текст кроз све белешке у прозору за "
"претрагу.\n"
-#: ../Tomboy/Tomboy.cs:559
+#: ../Tomboy/Tomboy.cs:566
msgid ""
" --new-note\t\t\tCreate and display a new note.\n"
" --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1972,10 +1971,10 @@ msgstr ""
" --new-note [наслов]\t\tНаправи и прикажи нову белешку, уз наслов.\n"
" --open-note [наслов/урл]\tПрикажи постојећу белешку која се поклапа са "
"насловом.\n"
-" --start-here\t\t\tПрикажи белешку 'Почетна станица'.\n"
+" --start-here\t\t\tПрикажи белешку „Почетна станица“.\n"
" --highlight-search [текст]\tПронађи и обележи текст у отвореној белешки.\n"
-#: ../Tomboy/Tomboy.cs:573
+#: ../Tomboy/Tomboy.cs:580
#, csharp-format
msgid "Version {0}"
msgstr "Верзија {0}"
@@ -1988,43 +1987,43 @@ msgstr " (нова)"
msgid "_About Tomboy"
msgstr "_О Томици"
-#: ../Tomboy/Utils.cs:143
+#: ../Tomboy/Utils.cs:189
msgid ""
"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
"installation has been completed successfully."
msgstr ""
-"\"Упутство за томичине белешке\" није пронађено. Провери да ли је "
+"„Упутство за Томичине белешке“ није пронађено. Проверите да ли је "
"инсталација програма прошла успешно."
-#: ../Tomboy/Utils.cs:152
+#: ../Tomboy/Utils.cs:198
msgid "Help not found"
msgstr "Помоћ није пронађена"
-#: ../Tomboy/Utils.cs:168
+#: ../Tomboy/Utils.cs:214
msgid "Cannot open location"
msgstr "Не могу да отворим локацију"
-#: ../Tomboy/Utils.cs:190
+#: ../Tomboy/Utils.cs:236
#, csharp-format
msgid "Today, {0}"
msgstr "Данас, {0}"
-#: ../Tomboy/Utils.cs:192
+#: ../Tomboy/Utils.cs:238
msgid "Today"
msgstr "Данас"
-#: ../Tomboy/Utils.cs:196
+#: ../Tomboy/Utils.cs:242
#, csharp-format
msgid "Yesterday, {0}"
msgstr "Јуче, {0}"
-#: ../Tomboy/Utils.cs:198
+#: ../Tomboy/Utils.cs:244
msgid "Yesterday"
msgstr "Јуче"
# bug(goran): plural!
# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:203
+#: ../Tomboy/Utils.cs:249
#, csharp-format
msgid "{0} day ago, {1}"
msgid_plural "{0} days ago, {1}"
@@ -2035,7 +2034,7 @@ msgstr[3] "Пре {0} дана, {1}"
# bug(goran): plural!
# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:207
+#: ../Tomboy/Utils.cs:253
#, csharp-format
msgid "{0} day ago"
msgid_plural "{0} days ago"
@@ -2044,18 +2043,18 @@ msgstr[1] "Пре {0} дана"
msgstr[2] "Пре {0} дана"
msgstr[3] "Пре {0} дан"
-#: ../Tomboy/Utils.cs:213
+#: ../Tomboy/Utils.cs:259
#, csharp-format
msgid "Tomorrow, {0}"
msgstr "Сутра, {0}"
-#: ../Tomboy/Utils.cs:215
+#: ../Tomboy/Utils.cs:261
msgid "Tomorrow"
msgstr "Сутра"
# bug(goran): plural!
# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:220
+#: ../Tomboy/Utils.cs:266
#, csharp-format
msgid "In {0} day, {1}"
msgid_plural "In {0} days, {1}"
@@ -2066,7 +2065,7 @@ msgstr[3] "Кроз {0} дан, {1}"
# bug(goran): plural!
# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:224
+#: ../Tomboy/Utils.cs:270
#, csharp-format
msgid "In {0} day"
msgid_plural "In {0} days"
@@ -2075,23 +2074,23 @@ msgstr[1] "Кроз {0} дана"
msgstr[2] "Кроз {0} дана"
msgstr[3] "Кроз {0} дан"
-#: ../Tomboy/Utils.cs:229
+#: ../Tomboy/Utils.cs:275
msgid "MMMM d, h:mm tt"
msgstr "d. MMMM, h:mm tt"
-#: ../Tomboy/Utils.cs:230
+#: ../Tomboy/Utils.cs:276
msgid "MMMM d"
msgstr "d. MMMM"
-#: ../Tomboy/Utils.cs:232
+#: ../Tomboy/Utils.cs:278
msgid "No Date"
msgstr "Без датума"
-#: ../Tomboy/Utils.cs:235
+#: ../Tomboy/Utils.cs:281
msgid "MMMM d yyyy, h:mm tt"
msgstr "d. MMMM yyyy, h:mm tt"
-#: ../Tomboy/Utils.cs:236
+#: ../Tomboy/Utils.cs:282
msgid "MMMM d yyyy"
msgstr "d. MMMM yyyy"
@@ -2106,8 +2105,8 @@ msgid ""
"A note with the title <b>{0}</b> already exists. Please choose another name "
"for this note before continuing."
msgstr ""
-"Белешка <b>{0}</b> већ постоји. Одабери друго име за ову белешку пре него "
-"што наставиш даље."
+"Белешка <b>{0}</b> већ постоји. Одаберите друго име за ову белешку пре него "
+"што наставите даље."
#: ../Tomboy/Watchers.cs:204
msgid "Note title taken"
@@ -2127,8 +2126,8 @@ msgid ""
"This synchronization addin is not supported on your computer. Please make "
"sure you have FUSE and {0} correctly installed and configured"
msgstr ""
-"Овај додатак за усклађивање није подржан на твом рачунару. Провери да ли су "
-"FUSE и {0} исправно инсталирани и подешени."
+"Овај додатак за усклађивање није подржан на вашем рачунару. Проверите да ли "
+"су FUSE и {0} исправно инсталирани и подешени."
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
msgid "Could not read testfile."
@@ -2140,7 +2139,7 @@ msgstr "Тест писања није успео."
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
msgid "Timeout connecting to server."
-msgstr "Време чекања за повезивање са сервером."
+msgstr "Истекло је време за повезивање са сервером."
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
msgid "Error connecting to server."
@@ -2177,11 +2176,11 @@ msgstr "Усклађивање белешки"
#: ../Tomboy/Synchronization/SyncDialog.cs:243
msgid "Synchronizing your notes..."
-msgstr "Усклађујем твоје белешке..."
+msgstr "Усклађујем ваше белешке..."
#: ../Tomboy/Synchronization/SyncDialog.cs:244
msgid "This may take a while, kick back and enjoy!"
-msgstr "Ово може потрајати, завали се и уживај!"
+msgstr "Ово може потрајати, завалите се и уживајте!"
#: ../Tomboy/Synchronization/SyncDialog.cs:246
msgid "Connecting to the server..."
@@ -2208,8 +2207,8 @@ msgid ""
"One of your other computers is currently synchronizing. Please wait 2 "
"minutes and try again."
msgstr ""
-"Неки други рачунар тренутно усклађује белешке. Сачекај 2 минута и покушај "
-"поново."
+"Неки други рачунар тренутно усклађује белешке. Сачекајте 2 минута и "
+"покушајте поново."
#: ../Tomboy/Synchronization/SyncDialog.cs:274
msgid "Preparing to download updates from server..."
@@ -2225,7 +2224,7 @@ msgstr "Шаљем белешке серверу..."
#: ../Tomboy/Synchronization/SyncDialog.cs:283
msgid "Synchronization Failed"
-msgstr "Неуспело усклађивање"
+msgstr "Усклађивање није успело"
#: ../Tomboy/Synchronization/SyncDialog.cs:284
msgid "Failed to synchronize"
@@ -2234,12 +2233,12 @@ msgstr "Нисам успео да усагласим белешке"
#: ../Tomboy/Synchronization/SyncDialog.cs:285
msgid "Could not synchronize notes. Check the details below and try again."
msgstr ""
-"Нисам могао да усагласим белешке. Провери детаље приказане испод и покушај "
-"поново."
+"Нисам могао да усагласим белешке. Проверите детаље приказане испод и "
+"покушајте поново."
#: ../Tomboy/Synchronization/SyncDialog.cs:291
msgid "Synchronization Complete"
-msgstr "Завршено усклађивање"
+msgstr "Завршено је усклађивање"
#: ../Tomboy/Synchronization/SyncDialog.cs:292
msgid "Synchronization is complete"
@@ -2256,7 +2255,7 @@ msgstr[3] "{0} белешка је ажурирана."
#: ../Tomboy/Synchronization/SyncDialog.cs:299
msgid "Your notes are now up to date."
-msgstr "Твоје белешке су сада усклађене"
+msgstr "Ваше белешке су сада усклађене"
#: ../Tomboy/Synchronization/SyncDialog.cs:303
msgid "Synchronization Canceled"
@@ -2268,7 +2267,7 @@ msgstr "Усклађивање је прекинуто"
#: ../Tomboy/Synchronization/SyncDialog.cs:305
msgid "You canceled the synchronization. You may close the window now."
-msgstr "Усклађивање је прекинуто. Сада можеш затворити прозорчић."
+msgstr "Усклађивање је прекинуто. Сада можете затворити прозорчић."
#: ../Tomboy/Synchronization/SyncDialog.cs:309
msgid "Synchronization Not Configured"
@@ -2280,7 +2279,7 @@ msgstr "Усклађивање није подешено"
#: ../Tomboy/Synchronization/SyncDialog.cs:311
msgid "Please configure synchronization in the preferences dialog."
-msgstr "Подеси поставке усклађивања у прозорчету са поставкама."
+msgstr "Подесите поставке усклађивања у прозорчету са поставкама."
#: ../Tomboy/Synchronization/SyncDialog.cs:315
msgid "Synchronization Service Error"
@@ -2292,7 +2291,7 @@ msgstr "Грешка сервиса"
#: ../Tomboy/Synchronization/SyncDialog.cs:317
msgid "Error connecting to the synchronization service. Please try again."
-msgstr "Грешка при повезивању са сервисом за усклађивање. Покушај поново."
+msgstr "Грешка при повезивању са сервисом за усклађивање. Покушајте поново."
#: ../Tomboy/Synchronization/SyncDialog.cs:334
msgid "Deleted locally"
@@ -2354,8 +2353,8 @@ msgid ""
"The server version of \"{0}\" conflicts with your local note. What do you "
"want to do with your local note?"
msgstr ""
-"Верзија белешке „{0}“ са сервера је у сукобу са локалном белешком. Шта желиш "
-"да учиниш са твојом локалном белешком?"
+"Верзија белешке „{0}“ са сервера је у сукобу са локалном белешком. Шта "
+"желите да учините са вашом локалном белешком?"
#: ../Tomboy/Synchronization/SyncManager.cs:161
msgid "_Tools"
@@ -2372,12 +2371,12 @@ msgid ""
"The FUSE module could not be loaded. Please check that it is installed "
"properly and try again."
msgstr ""
-"FUSE модул не може бити учитан. Увери се да је исправно инсталиран и покушај "
-"поново."
+"FUSE модул не може бити учитан. Уверите се да је исправно инсталиран и "
+"покушајте поново."
#: ../Tomboy/Synchronization/SyncUtils.cs:135
msgid "Enable FUSE?"
-msgstr "Омогући FUSE?"
+msgstr "Да омогућим FUSE?"
#. TODO: This message isn't entirely accurate.
#. We should fix it.
@@ -2391,9 +2390,8 @@ msgid ""
msgstr ""
"Одабрани поступак усклађивања захтева да FUSE модул буде учитан.\n"
"\n"
-"За избегавање овог прозорчета у будућности, требаш учитати FUSE при "
-"покретању. Додај „modprobe fuse“ у /etc/init.d/boot.local или „fuse“ у /etc/"
-"modules."
+"Да избегнете ово прозорче у будућности, треба да учитате FUSE при покретању. "
+"Додајте „modprobe fuse“ у /etc/init.d/boot.local или „fuse“ у /etc/modules."
#~ msgid "_Browse..."
#~ msgstr "_Разгледај..."
diff --git a/po/sr at latin.po b/po/sr at latin.po
index 0967df0..1b1212f 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -1,23 +1,22 @@
# Serbian translation of tomboy
# Courtesy of Prevod.org team (http://prevod.org/) -- 2006, 2007.
-#
# This file is distributed under the same license as the tomboy package.
-#
# Maintainer: Goran Rakić <grakic at devbase.net>
# Miloš Popović <gpopac at gmail.com>, 2010.
-#
+# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=tomboy&component=general\n"
-"POT-Creation-Date: 2010-06-07 21:58+0000\n"
-"PO-Revision-Date: 2010-08-27 15:00+0200\n"
-"Last-Translator: Miloš Popović <gpopac at gmail.com>\n"
+"product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-05-29 17:08+0000\n"
+"PO-Revision-Date: 2011-06-13 09:15+0200\n"
+"Last-Translator: Miroslav Nikolić <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Serbian (sr)\n"
"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
@@ -114,7 +113,6 @@ msgid "Enable Middle-Click Paste On Icon."
msgstr "Omogući ubacivanje srednjim klikom na ikonu."
#: ../data/tomboy.schemas.in.h:11
-#| msgid "TrayIcon"
msgid "Enable Tray Icon"
msgstr "Postavi ikonicu u obaveštajnu zonu"
@@ -198,8 +196,8 @@ msgid ""
"If enable_custom_font is true, the font name set here will be used as the "
"font when displaying notes."
msgstr ""
-"Ako je enable_custom_font uključeno, biće korišćen ovde odabran skup slovnih "
-"likova pri prikazu beleški."
+"Ako je „enable_custom_font“ uključeno, biće korišćen ovde odabran skup "
+"slovnih likova pri prikazu beleški."
#: ../data/tomboy.schemas.in.h:28
msgid ""
@@ -220,9 +218,9 @@ msgid ""
"Disabling this may be useful when another application is providing the "
"functionality of the tray icon."
msgstr ""
-"Ukoliko je postavljeno na „true“ (tačno) prikazaće se Tomicina ikonica u "
-"obaveštajnoj zoni panela. Isključivanje ove opcije je korisno ukoliko neki "
-"drugi program obezbedi obaveštajnu ikonicu."
+"Ukoliko je uključeno, prikazaće se Tomičina ikonica u obaveštajnoj zoni "
+"panela. Isključivanje ove opcije je korisno ukoliko neki drugi program "
+"obezbedi obaveštajnu ikonicu."
#: ../data/tomboy.schemas.in.h:31
msgid ""
@@ -238,7 +236,7 @@ msgid ""
"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
"available from any application."
msgstr ""
-"Ako je uključeno, globalne prečice postavljene u /apps/tomboy će biti "
+"Ako je uključeno, globalne prečice postavljene u „/apps/tomboy“ će biti "
"omogućene, što daje mogućnost da se nekim korisnim akcijama Tomičinih "
"beleški pristupa iz drugih programa."
@@ -248,23 +246,24 @@ msgid ""
"displaying notes. Otherwise the desktop default font will be used."
msgstr ""
"Ako je uključeno, biće korišćen skup slovnih likova naveden u "
-"custom_font_face pri prikazu beleški, inače podrazumevani slovni lik će biti "
-"korišćen."
+"„custom_font_face“ pri prikazu beleški, inače podrazumevani slovni lik će "
+"biti korišćen."
#: ../data/tomboy.schemas.in.h:34
msgid ""
"Indicates that the Sticky Note Importer plugin has not been run, so it "
"should run automatically the next time Tomboy starts."
msgstr ""
-"Indicira da uvoz gnomovih belešku nije pokrenut, i da treba biti pokrenut "
-"pri sledećem Tomičinom pokretanju."
+"Ukazuje da uvoz gnomovih beleški nije pokrenut, i da treba biti pokrenut pri "
+"sledećem Tomičinom pokretanju."
#: ../data/tomboy.schemas.in.h:35
msgid ""
"Integer determining the minimum number of notes to show in the Tomboy note "
"menu."
msgstr ""
-"Ceo broj koji određuje minimalni broj beleški koje će biti prikazane u meniju"
+"Ceo broj koji određuje minimalni broj beleški koje će biti prikazane u "
+"meniju."
#: ../data/tomboy.schemas.in.h:36
msgid ""
@@ -303,11 +302,11 @@ msgid ""
msgstr ""
"Ceo broj koji određuje da li je poželjno da se uvek primenjuje neko određeno "
"ažuriranje veza kada se beleška preimenuje, umesto da se pita korisnik. "
-"Brojevi imaju svoju internu predstavu. 0 znači da korisnik želi da bude "
+"Brojevi imaju svoju internu predstavu. 0 — znači da korisnik želi da bude "
"pitan kada se preimenuje beleška koja ima druge beleške koje imaju veze ka "
-"njoj. 1 znači da se sve veze automatski uklanjaju. 2 znači da tekst veze treba "
-"ažurirati na novo ime beleške tako da veza ka preimenovanoj belešci nastavi "
-"da postoji."
+"njoj. 1 — znači da se sve veze automatski uklanjaju. 2 — znači da tekst veze "
+"treba ažurirati na novo ime beleške tako da veza ka preimenovanoj belešci "
+"nastavi da postoji."
#: ../data/tomboy.schemas.in.h:39
msgid "Link Updating Behavior on Note Rename"
@@ -315,7 +314,7 @@ msgstr "Ponašanje za ažuriranje veza pri preimenovanju beleške"
#: ../data/tomboy.schemas.in.h:40
msgid "List of pinned notes."
-msgstr "Lista zabodenih beleški."
+msgstr "Lista pribodenih beleški."
#: ../data/tomboy.schemas.in.h:41
msgid ""
@@ -400,7 +399,7 @@ msgstr "Odabrani dodatak za servis usklađivanja"
#: ../data/tomboy.schemas.in.h:59
msgid "Set to TRUE to activate"
-msgstr "Postavi na TRUE da bi bilo uključeno"
+msgstr "Izaberite da bi bilo uključeno"
#: ../data/tomboy.schemas.in.h:60
msgid "Show applet menu"
@@ -435,11 +434,11 @@ msgid ""
"option to the special string \"disabled\", then there will be no keybinding "
"for this action."
msgstr ""
-"Globalna prečica za otvaranje i prikaz nove beleške. Format polja je kao \"<"
-"Control>a\" ili \"<Shift><Alt>F1\". Format je dosta slobodan "
-"i dozvoljava mala ili velika slova kao i skraćenice poput \"<Ctl>\"i "
-"\"<Ctrl>\". Ako postaviš ovu opciju na posebnu vrednost \"disabled\","
-"tada neće postojati prečica za ovu akciju."
+"Globalna prečica za otvaranje i prikaz nove beleške. Format polja je kao „<"
+"Control>a“ ili „<Shift><Alt>F1“. Format je dosta slobodan i "
+"dozvoljava mala ili velika slova kao i skraćenice poput „<Ctl>\"i \"<"
+"Ctrl>“. Ako postavite ovu opciju na posebnu vrednost „disabled“,tada neće "
+"postojati prečica za ovu akciju."
#: ../data/tomboy.schemas.in.h:67
msgid ""
@@ -450,11 +449,11 @@ msgid ""
"special string \"disabled\", then there will be no keybinding for this "
"action."
msgstr ""
-"Globalna prečica za otvaranje beleške \"Početna stanica\". Format polja je kao "
-"\"<Control>a\" ili \"<Shift><Alt>F1\". Format je dosta "
-"slobodan i dozvoljava mala ili velika slova kao i skraćenice poput \"<"
-"Ctl>\"i \"<Ctrl>\". Ako postaviš ovu opciju na posebnu vrednost "
-"\"disabled\",tada neće postojati prečica za ovu akciju."
+"Globalna prečica za otvaranje beleške „Početna stanica“. Format polja je kao "
+"„<Control>a“ ili „<Shift><Alt>F1“. Format je dosta "
+"slobodan i dozvoljava mala ili velika slova kao i skraćenice poput „<"
+"Ctl>“ i „<Ctrl>“. Ako postavite ovu opciju na posebnu vrednost "
+"„disabled“,tada neće postojati prečica za ovu akciju."
#: ../data/tomboy.schemas.in.h:68
msgid ""
@@ -466,10 +465,10 @@ msgid ""
"action."
msgstr ""
"Globalna prečica za otvaranje prozorčeta za pretraživanje. Format polja je kao "
-"\"<Control>a\" ili \"<Shift><Alt>F1\". Format je dosta "
-"slobodan i dozvoljava mala ili velika slova kao i skraćenice poput \"<"
-"Ctl>\"i \"<Ctrl>\". Ako postaviš ovu opciju na posebnu vrednost "
-"\"disabled\",tada neće postojati prečica za ovu akciju."
+"„<Control>a“ ili „<Shift><Alt>F1“. Format je dosta "
+"slobodan i dozvoljava mala ili velika slova kao i skraćenice poput „<"
+"Ctl>“i „<Ctrl>“. Ako postavite ovu opciju na posebnu vrednost "
+"„disabled“,tada neće postojati prečica za ovu akciju."
#: ../data/tomboy.schemas.in.h:69
msgid ""
@@ -481,10 +480,10 @@ msgid ""
"for this action."
msgstr ""
"Globalna prečica za otvaranje prozorčeta sa skorašnjim izmenama. Format polja "
-"je kao \"<Control>a\" ili \"<Shift><Alt>F1\". Format je "
-"dosta slobodan i dozvoljava mala ili velika slova kao i skraćenice poput "
-"\"<Ctl>\"i \"<Ctrl>\". Ako postaviš ovu opciju na posebnu "
-"vrednost \"disabled\",tada neće postojati prečica za ovu akciju."
+"je kao „<Control>a“ ili „<Shift><Alt>F1“. Format je dosta "
+"slobodan i dozvoljava mala ili velika slova kao i skraćenice poput „<"
+"Ctl>“ i „<Ctrl>“. Ako postavite ovu opciju na posebnu vrednost "
+"„disabled“,tada neće postojati prečica za ovu akciju."
#: ../data/tomboy.schemas.in.h:70
msgid ""
@@ -495,15 +494,15 @@ msgid ""
"special string \"disabled\", then there will be no keybinding for this "
"action."
msgstr ""
-"Globalna prečica za prikaz menija programčeta. Format polja je kao \"<"
-"Control>a\" ili \"<Shift><Alt>F1\". Format je dosta slobodan "
-"i dozvoljava mala ili velika slova kao i skraćenice poput \"<Ctl>\"i "
-"\"<Ctrl>\". Ako postaviš ovu opciju na posebnu vrednost \"disabled\","
-"tada neće postojati prečica za ovu akciju."
+"Globalna prečica za prikaz menija programčeta. Format polja je kao „<"
+"Control>a“ ili „<Shift><Alt>F1“. Format je dosta slobodan i "
+"dozvoljava mala ili velika slova kao i skraćenice poput „<Ctl>“ i „<"
+"Ctrl>“. Ako postavite ovu opciju na posebnu vrednost „disabled“,tada neće "
+"postojati prečica za ovu akciju."
#: ../data/tomboy.schemas.in.h:71
msgid "The handler for \"note://\" URLs"
-msgstr "Program za prihvatanje \"note://\" URL adresa"
+msgstr "Program za prihvatanje „note://“ URL adresa"
#: ../data/tomboy.schemas.in.h:72
msgid ""
@@ -517,7 +516,7 @@ msgid ""
"The last setting for the 'Export linked notes' checkbox in the Export to "
"HTML plugin."
msgstr ""
-"Poslednje podešavanje za 'Izvezi povezane beleške' u dodatku za izvoz u HTML."
+"Poslednje podešavanje za „Izvezi povezane beleške“ u dodatku za izvoz u HTML."
#: ../data/tomboy.schemas.in.h:74
msgid ""
@@ -526,9 +525,9 @@ msgid ""
"Export Linked Notes' setting and is used to specify whether all notes (found "
"recursively) should be included during an export to HTML."
msgstr ""
-"Poslednje podešavanje za 'Izvezi sve druge povezane beleške' u dodatku za "
-"izvoz u HTML. Ovo podešavanje se koristi skupa sa 'HML izvozi povezane "
-"beleške' podešavanjem, a određuje da li sve beleške (rekurzivno otkrivene) "
+"Poslednje podešavanje za „Izvezi sve druge povezane beleške“ u dodatku za "
+"izvoz u HTML. Ovo podešavanje se koristi skupa sa „HML izvozi povezane "
+"beleške“ podešavanjem, a određuje da li sve beleške (rekurzivno otkrivene) "
"trebaju biti uključene pri izvozu u HTML."
#: ../data/tomboy.schemas.in.h:75
@@ -537,7 +536,7 @@ msgid ""
"which is always placed at the bottom of the Tomboy note menu and also "
"accessible by hotkey."
msgstr ""
-"URI beleške koja će biti smatrana beleškom za \"Početnu stanicu\", koja se "
+"URI beleške koja će biti smatrana beleškom za „Početnu stanicu“, koja se "
"uvek nalazi na dnu menija u Tomici i dostupna je preko prečice sa tastature."
#: ../data/tomboy.schemas.in.h:76
@@ -555,7 +554,7 @@ msgid ""
"mount a sync share."
msgstr ""
"Vreme (u milisekundama) koje Tomičine beleške čekaju na odgovor kada se "
-"koristi FUSE da se montira deljena fascikla.za usklađivanje.s"
+"koristi FUSE da se montira deljena fascikla.za usklađivanje."
#: ../data/tomboy.schemas.in.h:78
msgid "Timestamp format"
@@ -585,7 +584,7 @@ msgid ""
"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
"user."
msgstr ""
-"Korišćenje „-ac“opcije wdfs-a za prihvatanje SSL sertifikata bez pitanja "
+"Korišćenje „-ac“ opcije wdfs-a za prihvatanje SSL sertifikata bez pitanja "
"korisnika."
#: ../data/tomboy.schemas.in.h:83
@@ -743,31 +742,31 @@ msgstr "Zaista želiš da obrišeš ovu ikonicu?"
msgid "If you remove an icon it is permanently lost."
msgstr "Ako je obrišeš ona će zauvek biti izgubljena."
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:66
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "Izvezi u HTML"
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:114
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
#, csharp-format
msgid "Your note was exported to \"{0}\"."
-msgstr "Tvoja beleška je izvezena u \"{0}\"."
+msgstr "Tvoja beleška je izvezena u „{0}“."
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:125
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
msgid "Note exported successfully"
msgstr "Beleška je uspešno izvezena"
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:131
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
msgid "Access denied."
msgstr "Pristup nije dozvoljen."
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
msgid "Folder does not exist."
msgstr "Fascikla ne postoji."
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:148
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
#, csharp-format
msgid "Could not save the file \"{0}\""
-msgstr "Ne mogu da sačuvam datoteku \"{0}\""
+msgstr "Ne mogu da sačuvam datoteku „{0}“"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
msgid "Destination for HTML Export"
@@ -813,7 +812,7 @@ msgstr "_Fiksna širina"
#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
#, csharp-format
msgid "Cannot contact '{0}'"
-msgstr "Ne mogu da kontaktiram '{0}'"
+msgstr "Ne mogu da kontaktiram „{0}“"
#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
#, csharp-format
@@ -826,7 +825,7 @@ msgstr "Umetni datum i vreme"
#. initial newline
#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:227 ../Tomboy/Preferences.cs:154
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
msgid "dddd, MMMM d, h:mm tt"
msgstr "dddd, d. MMMM, h:mm tt"
@@ -948,7 +947,7 @@ msgstr "Nisu pronađene gnomove beleške"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
#, csharp-format
msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "Nije pronađena pogodna datoteka gnomovih beleški u \"{0}\"."
+msgstr "Nije pronađena pogodna datoteka gnomovih beleški u „{0}“."
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
msgid "Sticky Notes import completed"
@@ -1074,7 +1073,7 @@ msgstr "Prijava iz Internet preglednika (kliknite da resetujete vezu)"
msgid "Set the default browser and try again"
msgstr "Postavite podrazumevani internet preglednik i pokušajte ponovo"
-#: ../Tomboy/JumpListManager.cs:77 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
msgid "Search All Notes"
msgstr "Traži kroz sve beleške"
@@ -1082,16 +1081,16 @@ msgstr "Traži kroz sve beleške"
#. icons_path, (int)TomboyIcons.NewNotebook);
#. if (new_notebook != null)
#. object_collection.AddObject(new_notebook);
-#: ../Tomboy/JumpListManager.cs:87
+#: ../Tomboy/JumpListManager.cs:106
msgid "Create New Note"
msgstr "Napravi novu belešku"
-#: ../Tomboy/JumpListManager.cs:117
+#: ../Tomboy/JumpListManager.cs:136
#, csharp-format
msgid "{0} (new)"
msgstr "{0} (nova)"
-#: ../Tomboy/JumpListManager.cs:139
+#: ../Tomboy/JumpListManager.cs:158
msgid "Recent Notes"
msgstr "Skorašnje beleške"
@@ -1101,7 +1100,6 @@ msgid "_Window"
msgstr "_Prozor"
#: ../Tomboy/MacApplication.cs:234
-#| msgid "_Preferences"
msgid "Preferences..."
msgstr "Postavke..."
@@ -1191,11 +1189,11 @@ msgstr "Obriši odabranu svesku"
msgid "Notebooks"
msgstr "Sveske"
-#: ../Tomboy/Notebooks/NotebookManager.cs:356
+#: ../Tomboy/Notebooks/NotebookManager.cs:361
msgid "Really delete this notebook?"
msgstr "Zaista želiš da obrišeš ovu svesku?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:358
+#: ../Tomboy/Notebooks/NotebookManager.cs:363
msgid ""
"The notes that belong to this notebook will not be deleted, but they will no "
"longer be associated with this notebook. This action cannot be undone."
@@ -1236,14 +1234,14 @@ msgstr "Zaista želiš da obrišeš ovu belešku?"
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
-msgstr[0] "Zaista želiš da obrišeš ovu {0} belešku?"
-msgstr[1] "Zaista želiš da obrišeš ove {0} beleške?"
-msgstr[2] "Zaista želiš da obrišeš ovih{0} beleški?"
-msgstr[3] "Zaista želiš da obrišeš ovih{0} beleška?"
+msgstr[0] "Zaista želite da obrišete ovu {0} belešku?"
+msgstr[1] "Zaista želite da obrišete ove {0} beleške?"
+msgstr[2] "Zaista želite da obrišete ovih {0} beleški?"
+msgstr[3] "Zaista želite da obrišete ovu {0} belešku?"
#: ../Tomboy/Note.cs:1582
msgid "If you delete a note it is permanently lost."
-msgstr "Ako je obrišeš ona će zauvek biti izgubljena."
+msgstr "Ako je obrišete ona će zauvek biti izgubljena."
#: ../Tomboy/Note.cs:1616
#, csharp-format
@@ -1298,15 +1296,15 @@ msgid ""
"\n"
"Ciao!"
msgstr ""
-"U poslednjoj verziji Tomice, datoteka sa Vašim beleškama je premeštena. Vas "
-"verovatno nikad nije zanimalo gde su Vam beleške uskladištene, a ako Vas ni "
+"U poslednjoj verziji Tomice, datoteka sa vašim beleškama je premeštena. Vas "
+"verovatno nikad nije zanimalo gde su vam beleške uskladištene, a ako vas ni "
"sad ne zanima, produžite i <bold>izbrišite ovu poruku</bold>. :-)\n"
"\n"
"Vaša stara fascikla sa beleškama je i dalje sigurna u <link:url>{0}</link:"
"url> . Ako se vratite na staru verziju Tomičinih beleški, on će tražiti "
"beleške u ovoj fascikli.\n"
"\n"
-"Ali mi smo umnožili Vaše beleške i podešavanja u nove fascikle koje će se od "
+"Ali mi smo umnožili vaše beleške i podešavanja u nove fascikle koje će se od "
"sada koristiti:\n"
"\n"
"<list><list-item dir=\"ltr\">Beleške se mogu naći u <link:url>{1}</link:"
@@ -1343,17 +1341,18 @@ msgstr ""
"\n"
"<bold>Dobrodošli kod Tomice!</bold>\n"
"\n"
-"Koristi belešku „Polazna stanica“ da započneš organizaciju ideja i misli.\n"
+"Koristite belešku „Polazna stanica“ da započnete organizaciju ideja i "
+"misli.\n"
"\n"
-"Napravi novu belešku za zapis ideja odabirom „Napravi novu belešku“ iz "
-"menija Tomice u panelu Gnoma. Tvoja beleška će automatski biti sačuvana.\n"
+"Napravite novu belešku za zapis ideja odabirom „Napravi novu belešku“ iz "
+"menija Tomice u panelu Gnoma. Vaša beleška će automatski biti sačuvana.\n"
"\n"
-"Zatim organizuj beleške dodavanjem veza između srodnih beleški i ideja!\n"
+"Zatim organizujte beleške dodavanjem veza između srodnih beleški i ideja!\n"
"\n"
"Već smo napravili belešku koja se zove <link:internal>Korišćenje veza u "
-"Tomici</link:internal>. Primećuješ li kako svaki put kada otkucamo <link:"
+"Tomici</link:internal>. Primećujete li kako svaki put kada otkucamo <link:"
"internal>Korišćenje veza u Tomici</link:internal> tekst automatski biva "
-"podvučen? Klikni na vezu da otvoriš belešku.</note-content>"
+"podvučen? Kliknite na vezu da otvorite belešku.</note-content>"
#: ../Tomboy/NoteManager.cs:284
msgid ""
@@ -1372,19 +1371,19 @@ msgid ""
msgstr ""
"<note-content>Korišćenje veza u Tomici\n"
"\n"
-"Možeš povezati srodne beleške u Tomici tako što označiš tekst unutar beleške "
-"i klikneš na dugme <bold>Veza</bold> iznad u liniji alata. Na taj način ćeš "
-"napraviti novu belešku sa tim naslovom i napraviti vezu ka njoj u trenutnoj "
-"belešci.\n"
+"Možete povezati srodne beleške u Tomici tako što ćete označiti tekst unutar "
+"beleške i kliknuti na dugme <bold>Veza</bold> iznad u liniji alata. Na taj "
+"način ćete napraviti novu belešku sa tim naslovom i napraviti vezu ka njoj u "
+"trenutnoj belešci.\n"
"\n"
-"Ako kasnije izmeniš naslov nove beleške, biće promenjen tekst ostalih beleški "
-"kako bi se izbeglo prekidanje veza.\n"
+"Ako kasnije izmenite naslov nove beleške, biće promenjen tekst ostalih "
+"beleški kako bi se izbeglo prekidanje veza.\n"
"\n"
-"Takođe, ako ukucaš naslov neke postojeće beleške unutar postojeće, veza ka "
+"Takođe, ako ukucate naslov neke postojeće beleške unutar postojeće, veza ka "
"njoj će automatski biti napravljena.</note-content>"
#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:368
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
msgid "Start Here"
msgstr "Početna stanica"
@@ -1392,16 +1391,16 @@ msgstr "Početna stanica"
msgid "Using Links in Tomboy"
msgstr "Korišćenje veza u Tomici"
-#: ../Tomboy/NoteManager.cs:445
+#: ../Tomboy/NoteManager.cs:449
#, csharp-format
msgid "New Note {0}"
msgstr "{0}. beleška"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:518 ../Tomboy/NoteManager.cs:611
+#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
msgid "Describe your new note here."
-msgstr "Ovde opiši tvoju misao."
+msgstr "Ovde opišite vašu misao."
#: ../Tomboy/NoteRenameDialog.cs:50
msgid "Rename Note Links?"
@@ -1423,43 +1422,43 @@ msgid ""
"\n"
"If you do not rename the links, they will no longer link to anything."
msgstr ""
-"Preimenuj veze u ostalim beleškama iz „<span underline=\"single\">{0}</"
+"Preimenujte veze u ostalim beleškama iz „<span underline=\"single\">{0}</"
"span>“ u „<span underline=\"single\">{1}</span>“?\n"
"\n"
"Ako ne primenujete veze, one više neće pokazivati ni na šta."
-#: ../Tomboy/NoteRenameDialog.cs:81
+#: ../Tomboy/NoteRenameDialog.cs:83
msgid "Rename Links"
msgstr "Preimenuj veze"
-#: ../Tomboy/NoteRenameDialog.cs:93
+#: ../Tomboy/NoteRenameDialog.cs:95
#: ../Tomboy/Synchronization/SyncDialog.cs:119
msgid "Note Title"
msgstr "Naslov beleške"
#. Translators: This button causes all notes in the list to be selected
-#: ../Tomboy/NoteRenameDialog.cs:116
+#: ../Tomboy/NoteRenameDialog.cs:118
msgid "Select All"
msgstr "Izaberi sve"
#. Translators: This button causes all notes in the list to be unselected
-#: ../Tomboy/NoteRenameDialog.cs:125
+#: ../Tomboy/NoteRenameDialog.cs:127
msgid "Select None"
-msgstr "Izaberi ništa"
+msgstr "Poništi izbor"
-#: ../Tomboy/NoteRenameDialog.cs:142
+#: ../Tomboy/NoteRenameDialog.cs:144
msgid "Ad_vanced"
msgstr "_Napredno"
-#: ../Tomboy/NoteRenameDialog.cs:145
+#: ../Tomboy/NoteRenameDialog.cs:147
msgid "Always show this _window"
msgstr "Uvek prikazuj ovaj _prozor"
-#: ../Tomboy/NoteRenameDialog.cs:153
+#: ../Tomboy/NoteRenameDialog.cs:155
msgid "Never rename _links"
msgstr "_Nikad ne preimenuj veze"
-#: ../Tomboy/NoteRenameDialog.cs:161
+#: ../Tomboy/NoteRenameDialog.cs:163
msgid "Alwa_ys rename links"
msgstr "_Uvek preimenuj veze"
@@ -1553,11 +1552,11 @@ msgstr "_Sledeća"
#: ../Tomboy/NoteWindow.cs:1258
msgid "_Bold"
-msgstr "_Masno"
+msgstr "_Podebljano"
#: ../Tomboy/NoteWindow.cs:1270
msgid "_Italic"
-msgstr "_Kurziv"
+msgstr "_Iskošeno"
#: ../Tomboy/NoteWindow.cs:1282
msgid "_Strikeout"
@@ -1565,7 +1564,7 @@ msgstr "Pre_crtano"
#: ../Tomboy/NoteWindow.cs:1294
msgid "_Highlight"
-msgstr "_Označeno"
+msgstr "_Podvučeno"
#: ../Tomboy/NoteWindow.cs:1307
msgid "Font Size"
@@ -1687,8 +1686,8 @@ msgid ""
"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
"Alt>N</b>"
msgstr ""
-"Prečice omogućavaju brzi pristup beleškama u svakom trenutku. Primer prečica:"
-"<b><Control><Shift>F11</b>, <b><Alt>N</b>"
+"Prečice omogućavaju brzi pristup beleškama u svakom trenutku. Primer "
+"prečica: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
#: ../Tomboy/PreferencesDialog.cs:355
@@ -1698,7 +1697,7 @@ msgstr "Prikaz _menija sa beleškama"
#. Open Start Here keybinding...
#: ../Tomboy/PreferencesDialog.cs:372
msgid "Open \"_Start Here\""
-msgstr "Otvori \"Početnu stranicu\""
+msgstr "Otvori „Početnu _stranicu“"
#. Create new note keybinding...
#: ../Tomboy/PreferencesDialog.cs:389
@@ -1720,7 +1719,7 @@ msgstr "Nije podesivo"
#: ../Tomboy/PreferencesDialog.cs:512
msgid "Automaticall_y Sync in Background Every"
-msgstr "Automatski sinhronizuj beleške svakih"
+msgstr "Automatski usaglasi beleške svakih"
#. Translators: See above comment for details on
#. this string.
@@ -1739,7 +1738,7 @@ msgstr "Sledeći dodaci su instalirani"
#: ../Tomboy/PreferencesDialog.cs:622
msgid "Get More Add-Ins..."
-msgstr "Uzmite još dodataka..."
+msgstr "Nabavi još dodataka..."
#: ../Tomboy/PreferencesDialog.cs:648
msgid "_Enable"
@@ -1788,7 +1787,7 @@ msgstr "Zameni moju lokalnu belešku onom sa servera."
#: ../Tomboy/PreferencesDialog.cs:1149
msgid "WARNING: Are you sure?"
-msgstr "UPOZORENJE: Sigurno ovo želiš?"
+msgstr "UPOZORENJE: Sigurno ovo želite?"
#: ../Tomboy/PreferencesDialog.cs:1151
msgid ""
@@ -1796,7 +1795,7 @@ msgid ""
"forced to synchronize all of your notes again when you save new settings."
msgstr ""
"Uklanjanje postavki za usklađivanje nije preporučeno. Može se dogoditi da moraš "
-"ponovo da uskladiš sve svoje beleške kada sačuvaš nove postavke."
+"ponovo da uskladite sve vaše beleške kada sačuvate nove postavke."
#: ../Tomboy/PreferencesDialog.cs:1164
msgid "Resetting Synchronization Settings"
@@ -1808,9 +1807,9 @@ msgid ""
"synchronization settings will now be cleared. You may be forced to "
"synchronize all of your notes again when you save new settings"
msgstr ""
-"Podešeni servis za usklađivanje je onemogućen. Tvoje postavke za usklađivanje "
-"će sada biti obrisane. Može se dogoditi da moraš ponovo da uskladiš sve "
-"svoje beleške kada sačuvaš nove postavke"
+"Podešeni servis za usklađivanje je onemogućen. Vaše postavke za usklađivanje "
+"će sada biti obrisane. Može se dogoditi da ćete morati ponovo da uskladite "
+"sve vaše beleške kada sačuvate nove postavke."
#: ../Tomboy/PreferencesDialog.cs:1244
msgid "Success! You're connected!"
@@ -1828,7 +1827,7 @@ msgid ""
"Sorry, but something went wrong. Please check your information and try "
"again. The {0} might be useful too."
msgstr ""
-"Nažalost nešto je otišlo naopako. Proveri informacije i pokušaj ponovo "
+"Nažalost nešto je pošlo naopako. Proverite informacije i pokušajte ponovo. "
"Sadržaj iz {0} takođe može biti koristan."
#: ../Tomboy/PreferencesDialog.cs:1282
@@ -1898,19 +1897,19 @@ msgstr[3] "Ukupno: {0} beleška"
msgid "Notes"
msgstr "Beleške"
-#: ../Tomboy/Tomboy.cs:267
+#: ../Tomboy/Tomboy.cs:251
msgid "Cannot create new note"
msgstr "Ne mogu da napravim novu belešku"
-#: ../Tomboy/Tomboy.cs:333
+#: ../Tomboy/Tomboy.cs:317
msgid "Primary Development:"
msgstr "Glavni razvoj:"
-#: ../Tomboy/Tomboy.cs:339
+#: ../Tomboy/Tomboy.cs:330
msgid "Contributors:"
msgstr "Doprinosioci:"
-#: ../Tomboy/Tomboy.cs:404
+#: ../Tomboy/Tomboy.cs:405
msgid "translator-credits"
msgstr ""
"Goran Rakić <grakic at devbase.net>\n"
@@ -1918,33 +1917,33 @@ msgstr ""
"\n"
"http://prevod.org — prevod na srpski jezik."
-#: ../Tomboy/Tomboy.cs:413
+#: ../Tomboy/Tomboy.cs:414
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2009 Others\n"
+"Copyright © 2004-2010 Others\n"
msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2009 Ostali\n"
+"Autorska prava © 2004-2007 Alex Graveley\n"
+"Autorska prava © 2004-2010 Ostali\n"
-#: ../Tomboy/Tomboy.cs:415
+#: ../Tomboy/Tomboy.cs:416
msgid "A simple and easy to use desktop note-taking application."
msgstr "Jednostavan i zgodan programčić za hvatanje beleški"
-#: ../Tomboy/Tomboy.cs:425
+#: ../Tomboy/Tomboy.cs:426
msgid "Homepage"
msgstr "Veb stranica"
-#: ../Tomboy/Tomboy.cs:537
+#: ../Tomboy/Tomboy.cs:544
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
"\n"
msgstr ""
"Tomica: Jednostavno programče za hvatanje beleški.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+"Autorska prava (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
"\n"
-#: ../Tomboy/Tomboy.cs:549
+#: ../Tomboy/Tomboy.cs:556
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -1960,7 +1959,7 @@ msgstr ""
" --search [tekst]\t\tTraži uneti tekst kroz sve beleške u prozoru za "
"pretragu.\n"
-#: ../Tomboy/Tomboy.cs:559
+#: ../Tomboy/Tomboy.cs:566
msgid ""
" --new-note\t\t\tCreate and display a new note.\n"
" --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1972,10 +1971,10 @@ msgstr ""
" --new-note [naslov]\t\tNapravi i prikaži novu belešku, uz naslov.\n"
" --open-note [naslov/url]\tPrikaži postojeću belešku koja se poklapa sa "
"naslovom.\n"
-" --start-here\t\t\tPrikaži belešku 'Početna stanica'.\n"
+" --start-here\t\t\tPrikaži belešku „Početna stanica“.\n"
" --highlight-search [tekst]\tPronađi i obeleži tekst u otvorenoj beleški.\n"
-#: ../Tomboy/Tomboy.cs:573
+#: ../Tomboy/Tomboy.cs:580
#, csharp-format
msgid "Version {0}"
msgstr "Verzija {0}"
@@ -1988,43 +1987,43 @@ msgstr " (nova)"
msgid "_About Tomboy"
msgstr "_O Tomici"
-#: ../Tomboy/Utils.cs:143
+#: ../Tomboy/Utils.cs:189
msgid ""
"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
"installation has been completed successfully."
msgstr ""
-"\"Uputstvo za tomičine beleške\" nije pronađeno. Proveri da li je "
+"„Uputstvo za Tomičine beleške“ nije pronađeno. Proverite da li je "
"instalacija programa prošla uspešno."
-#: ../Tomboy/Utils.cs:152
+#: ../Tomboy/Utils.cs:198
msgid "Help not found"
msgstr "Pomoć nije pronađena"
-#: ../Tomboy/Utils.cs:168
+#: ../Tomboy/Utils.cs:214
msgid "Cannot open location"
msgstr "Ne mogu da otvorim lokaciju"
-#: ../Tomboy/Utils.cs:190
+#: ../Tomboy/Utils.cs:236
#, csharp-format
msgid "Today, {0}"
msgstr "Danas, {0}"
-#: ../Tomboy/Utils.cs:192
+#: ../Tomboy/Utils.cs:238
msgid "Today"
msgstr "Danas"
-#: ../Tomboy/Utils.cs:196
+#: ../Tomboy/Utils.cs:242
#, csharp-format
msgid "Yesterday, {0}"
msgstr "Juče, {0}"
-#: ../Tomboy/Utils.cs:198
+#: ../Tomboy/Utils.cs:244
msgid "Yesterday"
msgstr "Juče"
# bug(goran): plural!
# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:203
+#: ../Tomboy/Utils.cs:249
#, csharp-format
msgid "{0} day ago, {1}"
msgid_plural "{0} days ago, {1}"
@@ -2035,7 +2034,7 @@ msgstr[3] "Pre {0} dana, {1}"
# bug(goran): plural!
# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:207
+#: ../Tomboy/Utils.cs:253
#, csharp-format
msgid "{0} day ago"
msgid_plural "{0} days ago"
@@ -2044,18 +2043,18 @@ msgstr[1] "Pre {0} dana"
msgstr[2] "Pre {0} dana"
msgstr[3] "Pre {0} dan"
-#: ../Tomboy/Utils.cs:213
+#: ../Tomboy/Utils.cs:259
#, csharp-format
msgid "Tomorrow, {0}"
msgstr "Sutra, {0}"
-#: ../Tomboy/Utils.cs:215
+#: ../Tomboy/Utils.cs:261
msgid "Tomorrow"
msgstr "Sutra"
# bug(goran): plural!
# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:220
+#: ../Tomboy/Utils.cs:266
#, csharp-format
msgid "In {0} day, {1}"
msgid_plural "In {0} days, {1}"
@@ -2066,7 +2065,7 @@ msgstr[3] "Kroz {0} dan, {1}"
# bug(goran): plural!
# http://bugzilla.gnome.org/show_bug.cgi?id=476061
-#: ../Tomboy/Utils.cs:224
+#: ../Tomboy/Utils.cs:270
#, csharp-format
msgid "In {0} day"
msgid_plural "In {0} days"
@@ -2075,23 +2074,23 @@ msgstr[1] "Kroz {0} dana"
msgstr[2] "Kroz {0} dana"
msgstr[3] "Kroz {0} dan"
-#: ../Tomboy/Utils.cs:229
+#: ../Tomboy/Utils.cs:275
msgid "MMMM d, h:mm tt"
msgstr "d. MMMM, h:mm tt"
-#: ../Tomboy/Utils.cs:230
+#: ../Tomboy/Utils.cs:276
msgid "MMMM d"
msgstr "d. MMMM"
-#: ../Tomboy/Utils.cs:232
+#: ../Tomboy/Utils.cs:278
msgid "No Date"
msgstr "Bez datuma"
-#: ../Tomboy/Utils.cs:235
+#: ../Tomboy/Utils.cs:281
msgid "MMMM d yyyy, h:mm tt"
msgstr "d. MMMM yyyy, h:mm tt"
-#: ../Tomboy/Utils.cs:236
+#: ../Tomboy/Utils.cs:282
msgid "MMMM d yyyy"
msgstr "d. MMMM yyyy"
@@ -2106,8 +2105,8 @@ msgid ""
"A note with the title <b>{0}</b> already exists. Please choose another name "
"for this note before continuing."
msgstr ""
-"Beleška <b>{0}</b> već postoji. Odaberi drugo ime za ovu belešku pre nego "
-"što nastaviš dalje."
+"Beleška <b>{0}</b> već postoji. Odaberite drugo ime za ovu belešku pre nego "
+"što nastavite dalje."
#: ../Tomboy/Watchers.cs:204
msgid "Note title taken"
@@ -2127,8 +2126,8 @@ msgid ""
"This synchronization addin is not supported on your computer. Please make "
"sure you have FUSE and {0} correctly installed and configured"
msgstr ""
-"Ovaj dodatak za usklađivanje nije podržan na tvom računaru. Proveri da li su "
-"FUSE i {0} ispravno instalirani i podešeni."
+"Ovaj dodatak za usklađivanje nije podržan na vašem računaru. Proverite da li "
+"su FUSE i {0} ispravno instalirani i podešeni."
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
msgid "Could not read testfile."
@@ -2140,7 +2139,7 @@ msgstr "Test pisanja nije uspeo."
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
msgid "Timeout connecting to server."
-msgstr "Vreme čekanja za povezivanje sa serverom."
+msgstr "Isteklo je vreme za povezivanje sa serverom."
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
msgid "Error connecting to server."
@@ -2177,11 +2176,11 @@ msgstr "Usklađivanje beleški"
#: ../Tomboy/Synchronization/SyncDialog.cs:243
msgid "Synchronizing your notes..."
-msgstr "Usklađujem tvoje beleške..."
+msgstr "Usklađujem vaše beleške..."
#: ../Tomboy/Synchronization/SyncDialog.cs:244
msgid "This may take a while, kick back and enjoy!"
-msgstr "Ovo može potrajati, zavali se i uživaj!"
+msgstr "Ovo može potrajati, zavalite se i uživajte!"
#: ../Tomboy/Synchronization/SyncDialog.cs:246
msgid "Connecting to the server..."
@@ -2208,8 +2207,8 @@ msgid ""
"One of your other computers is currently synchronizing. Please wait 2 "
"minutes and try again."
msgstr ""
-"Neki drugi računar trenutno usklađuje beleške. Sačekaj 2 minuta i pokušaj "
-"ponovo."
+"Neki drugi računar trenutno usklađuje beleške. Sačekajte 2 minuta i "
+"pokušajte ponovo."
#: ../Tomboy/Synchronization/SyncDialog.cs:274
msgid "Preparing to download updates from server..."
@@ -2225,7 +2224,7 @@ msgstr "Šaljem beleške serveru..."
#: ../Tomboy/Synchronization/SyncDialog.cs:283
msgid "Synchronization Failed"
-msgstr "Neuspelo usklađivanje"
+msgstr "Usklađivanje nije uspelo"
#: ../Tomboy/Synchronization/SyncDialog.cs:284
msgid "Failed to synchronize"
@@ -2234,12 +2233,12 @@ msgstr "Nisam uspeo da usaglasim beleške"
#: ../Tomboy/Synchronization/SyncDialog.cs:285
msgid "Could not synchronize notes. Check the details below and try again."
msgstr ""
-"Nisam mogao da usaglasim beleške. Proveri detalje prikazane ispod i pokušaj "
-"ponovo."
+"Nisam mogao da usaglasim beleške. Proverite detalje prikazane ispod i "
+"pokušajte ponovo."
#: ../Tomboy/Synchronization/SyncDialog.cs:291
msgid "Synchronization Complete"
-msgstr "Završeno usklađivanje"
+msgstr "Završeno je usklađivanje"
#: ../Tomboy/Synchronization/SyncDialog.cs:292
msgid "Synchronization is complete"
@@ -2256,7 +2255,7 @@ msgstr[3] "{0} beleška je ažurirana."
#: ../Tomboy/Synchronization/SyncDialog.cs:299
msgid "Your notes are now up to date."
-msgstr "Tvoje beleške su sada usklađene"
+msgstr "Vaše beleške su sada usklađene"
#: ../Tomboy/Synchronization/SyncDialog.cs:303
msgid "Synchronization Canceled"
@@ -2268,7 +2267,7 @@ msgstr "Usklađivanje je prekinuto"
#: ../Tomboy/Synchronization/SyncDialog.cs:305
msgid "You canceled the synchronization. You may close the window now."
-msgstr "Usklađivanje je prekinuto. Sada možeš zatvoriti prozorčić."
+msgstr "Usklađivanje je prekinuto. Sada možete zatvoriti prozorčić."
#: ../Tomboy/Synchronization/SyncDialog.cs:309
msgid "Synchronization Not Configured"
@@ -2280,7 +2279,7 @@ msgstr "Usklađivanje nije podešeno"
#: ../Tomboy/Synchronization/SyncDialog.cs:311
msgid "Please configure synchronization in the preferences dialog."
-msgstr "Podesi postavke usklađivanja u prozorčetu sa postavkama."
+msgstr "Podesite postavke usklađivanja u prozorčetu sa postavkama."
#: ../Tomboy/Synchronization/SyncDialog.cs:315
msgid "Synchronization Service Error"
@@ -2292,7 +2291,7 @@ msgstr "Greška servisa"
#: ../Tomboy/Synchronization/SyncDialog.cs:317
msgid "Error connecting to the synchronization service. Please try again."
-msgstr "Greška pri povezivanju sa servisom za usklađivanje. Pokušaj ponovo."
+msgstr "Greška pri povezivanju sa servisom za usklađivanje. Pokušajte ponovo."
#: ../Tomboy/Synchronization/SyncDialog.cs:334
msgid "Deleted locally"
@@ -2354,8 +2353,8 @@ msgid ""
"The server version of \"{0}\" conflicts with your local note. What do you "
"want to do with your local note?"
msgstr ""
-"Verzija beleške „{0}“ sa servera je u sukobu sa lokalnom beleškom. Šta želiš "
-"da učiniš sa tvojom lokalnom beleškom?"
+"Verzija beleške „{0}“ sa servera je u sukobu sa lokalnom beleškom. Šta "
+"želite da učinite sa vašom lokalnom beleškom?"
#: ../Tomboy/Synchronization/SyncManager.cs:161
msgid "_Tools"
@@ -2372,12 +2371,12 @@ msgid ""
"The FUSE module could not be loaded. Please check that it is installed "
"properly and try again."
msgstr ""
-"FUSE modul ne može biti učitan. Uveri se da je ispravno instaliran i pokušaj "
-"ponovo."
+"FUSE modul ne može biti učitan. Uverite se da je ispravno instaliran i "
+"pokušajte ponovo."
#: ../Tomboy/Synchronization/SyncUtils.cs:135
msgid "Enable FUSE?"
-msgstr "Omogući FUSE?"
+msgstr "Da omogućim FUSE?"
#. TODO: This message isn't entirely accurate.
#. We should fix it.
@@ -2391,9 +2390,8 @@ msgid ""
msgstr ""
"Odabrani postupak usklađivanja zahteva da FUSE modul bude učitan.\n"
"\n"
-"Za izbegavanje ovog prozorčeta u budućnosti, trebaš učitati FUSE pri "
-"pokretanju. Dodaj „modprobe fuse“ u /etc/init.d/boot.local ili „fuse“ u /etc/"
-"modules."
+"Da izbegnete ovo prozorče u budućnosti, treba da učitate FUSE pri pokretanju. "
+"Dodajte „modprobe fuse“ u /etc/init.d/boot.local ili „fuse“ u /etc/modules."
#~ msgid "_Browse..."
#~ msgstr "_Razgledaj..."
diff --git a/po/sv.po b/po/sv.po
index bd7aecd..f804996 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,15 +1,15 @@
# Swedish messages for tomboy.
-# Copyright (C) 2004-2010 Free Software Foundation, Inc.
+# Copyright (C) 2004-2011 Free Software Foundation, Inc.
# Sergej Kotliar <sigge at hystrix.se>, 2006.
# Christian Rose <menthos at menthos.com>, 2004, 2005.
-# Daniel Nylander <po at danielnylander.se>, 2006, 2007, 2008, 2009, 2010.
+# Daniel Nylander <po at danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: tomboy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-29 15:08+0100\n"
-"PO-Revision-Date: 2010-12-29 15:54+0100\n"
+"POT-Creation-Date: 2011-06-16 22:50+0200\n"
+"PO-Revision-Date: 2011-06-16 22:56+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"Language: sv\n"
@@ -84,37 +84,37 @@ msgid "Custom Font Face"
msgstr "Anpassat typsnitt"
#: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "Bestämmer X-koordinaten för sökfönstret; lagras när Tomboy avslutas."
+msgid "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Bestämmer X-koordinaten för \"Sök i alla anteckningar\"-fönstret; lagras när Tomboy avslutas."
#: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "Bestämmer Y-koordinaten för sökfönstret; lagras när Tomboy avslutas."
+msgid "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Bestämmer Y-koordinaten för \"Sök i alla anteckningar\"-fönstret; lagras när Tomboy avslutas."
#: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr "Bestämmer bildpunktshöjd för sökfönstret; lagras när Tomboy avslutas."
+msgid "Determines pixel height of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Bestämmer bildpunktshöjd för \"Sök i alla anteckningar\"-fönstret; lagras när Tomboy avslutas."
#: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
-msgstr "Bestämmer bildpunktsbredd för sökfönstret; lagras när Tomboy avslutas."
+msgid "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Bestämmer bildpunktsbredd för \"Sök i alla anteckningar\"-fönstret; lagras när Tomboy avslutas."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Aktivera automatiska punktlistor"
-
-#: ../data/tomboy.schemas.in.h:10
msgid "Enable Middle-Click Paste On Icon."
msgstr "Aktivera inklistring vid mittenklick på ikon."
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
msgid "Enable Tray Icon"
msgstr "Aktivera lådikon"
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
msgid "Enable WikiWord highlighting"
msgstr "Aktivera WikiOrd-färgmarkering"
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Aktivera automatiska punktlistor."
+
#: ../data/tomboy.schemas.in.h:13
msgid "Enable closing notes with escape."
msgstr "Aktivera stängning av anteckningar med escape-tangenten."
@@ -160,65 +160,65 @@ msgid "HTML Export All Linked Notes"
msgstr "HTML-exportera alla länkade anteckningar"
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "HTML-exportera senaste katalogen"
-
-#: ../data/tomboy.schemas.in.h:25
msgid "HTML Export Linked Notes"
msgstr "HTML-exportera länkade anteckningar"
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
msgstr "Om inaktiverad kommer inte bekräftelsedialogen för \"Ta bort anteckning\" att visas."
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
msgid "If enable_custom_font is true, the font name set here will be used as the font when displaying notes."
msgstr "Om enable_custom_font är sant så kommer typsnittet som ställs in här att användas för att visa anteckningar."
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
msgid "If enabled, all notes that were open when Tomboy quit will automatically be reopened at startup."
msgstr "Om aktiverad kommer alla anteckningar som var öppnade när Tomboy avslutades att öppnas igen vid nästa uppstart."
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
msgid "If enabled, an opened note can be closed by hitting the escape key."
msgstr "Om aktiverad kan en öppnad anteckning stängas genom att trycka på escape-tangenten."
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
msgid "If true, Tomboy's tray icon will be displayed in the notification area. Disabling this may be useful when another application is providing the functionality of the tray icon."
msgstr "Om sant kommer Tomboys lådikon att visas i notifieringsytan. Inaktivera denna kan vara användbart när andra program tillhandahåller samma funktionalitet som lådikonen."
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
msgid "If true, misspellings will be underlined in red, and correct spelling suggestions shown in the right-click menu."
msgstr "Om sant, så kommer felstavningar att understrykas med rött och förslag på korrekta stavningar visas i högerklicksmenyn."
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
msgid "If true, the desktop-global keybindings set in /apps/tomboy/global_keybindings will be enabled, allowing for useful Tomboy actions to be available from any application."
msgstr "Om sant, så kommer de globala tangentbordsgenvägarna satta i /apps/tomboy/global_keybindings att aktiveras, och tillåta Tomboy-genvägar från vilket program som helst"
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
msgid "If true, the font name set in custom_font_face will be used as the font when displaying notes. Otherwise the desktop default font will be used."
msgstr "Om sant, så kommer typsnittet satt i custom_font_face att användas för att visa anteckningar. Annars används skrivbordets standardtypsnitt."
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
msgid "Indicates that the Sticky Note Importer plugin has not been run, so it should run automatically the next time Tomboy starts."
msgstr "Indikerar att importeringsinsticksmodulen för Klisterlappar inte har körts, så den bör starta automatiskt nästa gång Tomboy startas."
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
msgid "Integer determining the minimum number of notes to show in the Tomboy note menu."
msgstr "Heltal som bestämmer minimalt antal anteckningar att visa i Tomboys anteckningsmeny."
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
msgid "Integer value indicating how frequently to perform a background sync of your notes (when sync is configured). Any value less than 1 indicates that autosync is disabled. The lowest acceptable positive value is 5. Value is in minutes."
msgstr "Heltalsvärde som indikerar hur ofta en bakgrundssynkronisering ska genomföras av dina anteckningar (när synkronisering är konfigurerad). Värden mindre än 1 indikerar att automatisk synkronisering är inaktiverat. Lägst möjliga positiva värde är 5. Värdet anges i minuter."
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
msgid "Integer value indicating if there is a preference to always perform a specific behavior when a conflict is detected, instead of prompting the user. The values map to an internal enumeration. 0 indicates that the user wishes to be prompted when a conflict occurs, so that they may handle each conflict situation on a case-by-case basis."
msgstr "Heltalsvärde som indikerar om det finns en inställning för att alltid genomföra ett specifikt beteende när en konflikt har upptäckts, istället för att fråga användaren. Värdena mappas till en intern numrering. 0 indikerar att användaren önskar att bli tillfrågad när en konflikt uppstår, så att användaren kan hantera konflikten från fall till fall."
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
msgid "Integer value indicating if there is a preference to always perform a specific link updating behavior when a note is renamed, instead of prompting the user. The values map to an internal enumeration. 0 indicates that the user wishes to be prompted when renaming a note may impact links that exist in other notes. 1 indicates that links should automatically be removed. 2 indicates that link text should be updated to the new note name so that it will continue linking to the renamed note."
msgstr "Heltalsvärde som indikerar om det finns en inställning för att alltid genomföra ett specifikt beteende när en anteckning byter namn, istället för att fråga användaren. Värdena mappas till en intern numrering. 0 indikerar att användaren önskar att bli tillfrågad när en anteckning kan påverka länkar som finns i andra anteckningar. 1 indikerar att länkar bör automatiskt tas bort. 2 indikerar att länktexten ska uppdateras till det nya anteckningsnamnet så att den fortfarande länkar till anteckningen med det nya namnet."
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Senaste katalog som användes i HTML-export"
+
#: ../data/tomboy.schemas.in.h:39
msgid "Link Updating Behavior on Note Rename"
msgstr "Uppdateringsbeteende för länkar vid namnbyte av anteckningar"
@@ -280,20 +280,20 @@ msgid "SSHFS Synchronization Server URL"
msgstr "Server-URL för SSHFS-synkronisering"
#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Sparad höjd för sökfönstret"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Sparad höjd för \"Sök i alla anteckningar\"-fönstret"
#: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Sparad horisontell position för sökfönstret"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Sparad horisontell position för \"Sök i alla anteckningar\"-fönstret"
#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Sparad vertikal position för sökfönstret"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Sparad vertikal position för \"Sök i alla anteckningar\"-fönstret"
#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Sparad bredd för sökfönstret"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Sparad bredd för \"Sök i alla anteckningar\"-fönstret"
#: ../data/tomboy.schemas.in.h:58
msgid "Selected Synchronization Service Addin"
@@ -497,7 +497,8 @@ msgstr "Starta synkronisering av anteckningar"
msgid "What links here?"
msgstr "Vad länkar hit?"
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
msgid "(none)"
msgstr "(ingen)"
@@ -667,8 +668,8 @@ msgid "Appointments"
msgstr "Möten"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-msgid "Change the <span weight=\"bold\">Today: Template</span> note to customize the text that new Today notes have."
-msgstr "Ändra anteckningen <span weight=\"bold\">Idag: Mall</span> för att anpassa texten som nya Idag-anteckningar använder."
+msgid "Change the <b>Today: Template</b> note to customize the text that new Today notes have."
+msgstr "Ändra anteckningen <b>Idag: Mall</b> för att anpassa texten som nya Idag-anteckningar använder."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -693,6 +694,11 @@ msgstr "Sida {0} av {1}"
msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd yyyy-MM-dd, hh.mm.ss"
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Ta bort trasiga länkar"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Lägg till en skiss"
@@ -721,8 +727,8 @@ msgid "Server or username field is empty."
msgstr "Fältet för server eller användarnamn är tomt."
#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+msgid "SSH"
+msgstr "SSH"
#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
msgid "Timeout connecting to server. Please ensure that your SSH key has been added to a running SSH daemon."
@@ -747,14 +753,16 @@ msgstr "Importeringen från Klisterlappar är färdig"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> av <b>{1}</b> klisterlappar har importerats."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> av <b>{1}</b> klisterlapp importerades."
+msgstr[1] "<b>{0}</b> av <b>{1}</b> klisterlappar importerades."
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
msgid "Untitled"
msgstr "Namnlös"
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
msgid "Sticky Note: "
msgstr "Klisterlapp: "
@@ -791,8 +799,8 @@ msgid "URL, username, or password field is empty."
msgstr "Fältet för url, användarnamn eller lösenord är tomt."
#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+msgid "WebDAV"
+msgstr "WebDAV"
#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
msgid "There was an error connecting to the server. This may be caused by using an incorrect user name and/or password."
@@ -829,12 +837,12 @@ msgstr "Servern svarar inte. Försök igen senare."
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
msgid "Authorization Failed, Try Again"
-msgstr "Auktorisering misslyckades, försök igen"
+msgstr "Auktorisering misslyckades. Försök igen"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
msgid "Tomboy Web Authorization Successful"
-msgstr "Tomboy - Webbautentisering lyckades"
+msgstr "Tomboy - Webbauktorisering lyckades"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
@@ -969,7 +977,7 @@ msgid "Delete the selected notebook"
msgstr "Ta bort det valda anteckningsblocket"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:283
msgid "Notebooks"
msgstr "Anteckningsblock"
@@ -1006,34 +1014,40 @@ msgstr "Anteckningsblock"
msgid "_New notebook..."
msgstr "_Nytt anteckningsblock..."
-#: ../Tomboy/Note.cs:1568
+#: ../Tomboy/Note.cs:497
+#: ../Tomboy/NoteManager.cs:449
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Ny anteckning {0}"
+
+#: ../Tomboy/Note.cs:1578
msgid "Really delete this note?"
msgstr "Verkligen ta bort denna anteckning?"
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1581
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "Verkligen ta bort {0} anteckning?"
msgstr[1] "Verkligen ta bort dessa {0} anteckningar?"
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1592
msgid "If you delete a note it is permanently lost."
msgstr "Om du tar bort en anteckning försvinner den för alltid."
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1626
#, csharp-format
msgid "An error occurred while saving your notes. Please check that you have sufficient disk space, and that you have appropriate rights on {0}. Error details can be found in {1}."
msgstr "Ett fel inträffade när dina anteckningar sparades. Kontrollera att du har tillräckligt mycket diskutrymme och att du har de lämpliga rättigheterna på {0}. Mer information kan hittas i {1}."
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1642
msgid "Error saving note data."
msgstr "Fel vid sparande av anteckningsdata."
#. New Note Template
#. Translators: This is 'New Note' Template, not New 'Note Template'
#: ../Tomboy/NoteManager.cs:21
-#: ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/PreferencesDialog.cs:257
msgid "New Note Template"
msgstr "Ny anteckningsmall"
@@ -1127,11 +1141,6 @@ msgstr "Börja här"
msgid "Using Links in Tomboy"
msgstr "Användning av länkar i Tomboy"
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Ny anteckning {0}"
-
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
#: ../Tomboy/NoteManager.cs:522
@@ -1221,117 +1230,118 @@ msgstr "S_täng alla anteckningar"
msgid "Search"
msgstr "Sök"
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Sök i dina anteckningar (Ctrl-Skift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:440
+msgid "Search your notes"
+msgstr "Sök i dina anteckningar"
# Hoppas detta är verbet...
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:452
msgid "Link"
msgstr "Länka"
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Länka markerad text till en ny anteckning (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:459
+msgid "Link selected text to a new note"
+msgstr "Länka markerad text till en ny anteckning"
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:472
msgid "_Text"
msgstr "_Text"
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:477
msgid "Set properties of text"
msgstr "Ställ in textegenskaper"
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:482
msgid "T_ools"
msgstr "_Verktyg"
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:486
msgid "Use tools on this note"
msgstr "Använd verktyg på denna anteckning."
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:494
msgid "Delete this note"
msgstr "Ta bort denna anteckning"
-#: ../Tomboy/NoteWindow.cs:500
+#: ../Tomboy/NoteWindow.cs:502
#: ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Synkronisera anteckningar"
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:564
msgid "_Find..."
msgstr "_Sök..."
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:575
msgid "Find _Next"
msgstr "Sök _nästa"
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:588
msgid "Find _Previous"
msgstr "Sök _föregående"
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:676
msgid "Cannot create note"
msgstr "Kan inte skapa anteckning"
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:757
msgid "_Find:"
msgstr "_Sök:"
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:768
msgid "_Previous"
msgstr "_Föregående"
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:777
msgid "_Next"
msgstr "_Nästa"
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1260
msgid "_Bold"
msgstr "_Fet"
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1272
msgid "_Italic"
msgstr "_Kursiv"
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1284
msgid "_Strikeout"
msgstr "_Genomstruken"
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1296
msgid "_Highlight"
msgstr "_Markera"
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1309
msgid "Font Size"
msgstr "Typsnittsstorlek"
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1312
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1329
msgid "Hu_ge"
msgstr "_Enorm"
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1337
msgid "_Large"
msgstr "_Stor"
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1345
msgid "S_mall"
msgstr "_Liten"
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1354
msgid "Increase Font Size"
msgstr "Öka typsnittsstorlek"
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1372
msgid "Decrease Font Size"
msgstr "Minska typsnittsstorlek"
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1392
msgid "Bullets"
msgstr "Punkter"
@@ -1351,190 +1361,190 @@ msgstr "Synkronisering"
msgid "Add-ins"
msgstr "Tillägg"
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
msgid "_Spell check while typing"
msgstr "_Stavningskontroll när text skrivs in"
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
msgid "Misspellings will be underlined in red, with correct spelling suggestions shown in the context menu."
msgstr "Felstavningar kommer att strykas under i rött, och korrekta stavningsförslag visas i sammanhangsmenyn."
#. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
msgid "Highlight _WikiWords"
msgstr "Färgmarkera _WikiOrd"
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
msgid "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the word will create a note with that name."
msgstr "Aktivera detta alternativ för att färgmarkera ord <b>SomSerUtSomDetta</b>. Att klicka på ett sådant kommer att skapa en anteckning med dess namn."
#. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
msgid "Enable auto-_bulleted lists"
msgstr "Aktivera a_utomatiska punktlistor"
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
msgid "Use custom _font"
msgstr "Använd anpassat _typsnitt"
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
msgid "When renaming a linked note: "
msgstr "När en länkad anteckning byter namn: "
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
msgid "Ask me what to do"
msgstr "Fråga mig vad som ska göras"
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
msgid "Never rename links"
msgstr "Byt aldrig namn på länkar"
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
msgid "Always rename links"
msgstr "Byt alltid namn på länkar"
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
msgid "Use the new note template to specify the text that should be used when creating a new note."
msgstr "Använd den nya anteckningsmallen för att ange texten som ska användas när en ny anteckning skapas."
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
msgstr "Öppna ny anteckningsmall"
#. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
msgid "Listen for _Hotkeys"
msgstr "Lyssna efter _snabbtangenter"
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
msgid "Hotkeys allow you to quickly access your notes from anywhere with a keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
msgstr "Snabbtangenter låter dig snabbt få tillgång till dina anteckningar varifrån som helst. Exempel på snabbtangenter: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
msgid "Show notes _menu"
msgstr "Visa antecknings_meny"
#. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
msgid "Open \"_Start Here\""
msgstr "Öppna \"_Börja här\""
#. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
msgid "Create _new note"
msgstr "Skapa _ny anteckning"
#. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
msgid "Open \"Search _All Notes\""
msgstr "Öppna \"Sök i _alla anteckningar\""
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
msgid "Ser_vice:"
msgstr "T_jänst:"
-#: ../Tomboy/PreferencesDialog.cs:486
-#: ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487
+#: ../Tomboy/PreferencesDialog.cs:1114
msgid "Not configurable"
msgstr "Inte konfigurerbar"
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
msgid "Automaticall_y Sync in Background Every"
msgstr "Synkronisera a_utomatiskt i bakgrunden var"
#. Translators: See above comment for details on
#. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
msgid "Minutes"
msgstr "Minuter"
#. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
msgid "_Advanced..."
msgstr "_Avancerat..."
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
msgid "The following add-ins are installed"
msgstr "Följande tillägg är installerade"
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
msgid "Get More Add-Ins..."
msgstr "Hämta fler tillägg..."
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:649
msgid "_Enable"
msgstr "_Aktivera"
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:655
msgid "_Disable"
msgstr "_Inaktivera"
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:786
msgid "Not Implemented"
msgstr "Inte implementerad"
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:800
#, csharp-format
msgid "{0} Preferences"
msgstr "Inställningar för {0}"
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:939
msgid "Choose Note Font"
msgstr "Välj anteckningstypsnitt"
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:983
msgid "Other Synchronization Options"
msgstr "Andra synkroniseringsalternativ"
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:989
msgid "When a conflict is detected between a local note and a note on the configured synchronization server:"
msgstr "När en konflikt upptäcks mellan en lokal anteckning och en anteckning på den konfigurerade synkroniseringsservern:"
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:996
msgid "Always ask me what to do."
msgstr "Fråga mig alltid vad som ska göras."
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:1000
msgid "Rename my local note."
msgstr "Byt namn på min lokala anteckning."
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:1004
msgid "Replace my local note with the server's update."
msgstr "Ersätt min lokal anteckning med serverns uppdatering."
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "VARNING: Är du säker?"
+#: ../Tomboy/PreferencesDialog.cs:1150
+msgid "Are you sure?"
+msgstr "Är du säker?"
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1152
msgid "Clearing your synchronization settings is not recommended. You may be forced to synchronize all of your notes again when you save new settings."
msgstr "Tömning av dina synkroniseringsinställningar rekommenderas inte. Du kan tvingas att synkronisera alla dina anteckningar igen när du sparar nya inställningar."
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1165
msgid "Resetting Synchronization Settings"
msgstr "Återställer synkroniseringsinställningar"
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1167
msgid "You have disabled the configured synchronization service. Your synchronization settings will now be cleared. You may be forced to synchronize all of your notes again when you save new settings"
msgstr "Du har inaktiverat den konfigurerade synkroniseringstjänsten. Dina synkroniseringsinställningar kommer nu att tömmas. Du kan tvingas att synkronisera alla dina anteckningar igen när du sparar nya inställningar."
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Lyckades! Du är nu ansluten!"
+#: ../Tomboy/PreferencesDialog.cs:1245
+msgid "Connection successful"
+msgstr "Anslutningen lyckades"
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1247
msgid "Tomboy is ready to synchronize your notes. Would you like to synchronize them now?"
msgstr "Tomboy är redo att synkronisera dina anteckningar. Vill du synkronisera dem nu?"
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1270
#, csharp-format
-msgid "Sorry, but something went wrong. Please check your information and try again. The {0} might be useful too."
-msgstr "Tyvärr, någonting gick fel. Kontrollera din information och försök igen. Filen {0} kan också vara behjälplig."
+msgid "Please check your information and try again. The log file {0} may contain more information about the error."
+msgstr "Kontrollera din information och försök igen. Loggfilen {0} kan innehålla mer information om felet."
#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Fel vid anslutning :("
+msgid "Error connecting"
+msgstr "Fel vid anslutning"
#: ../Tomboy/PreferencesDialog.cs:1358
msgid "Version:"
@@ -1556,40 +1566,44 @@ msgstr "Tilläggsberoenden:"
msgid "_Search:"
msgstr "_Sök:"
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:357
msgid "Note"
msgstr "Anteckning"
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:379
msgid "Last Changed"
msgstr "Senast ändrad"
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:510
msgid "Matches"
msgstr "Träffar"
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:561
+msgid "Title match"
+msgstr "Titelmatchning"
+
+#: ../Tomboy/RecentChanges.cs:564
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "{0} träff"
msgstr[1] "{0} träffar"
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:578
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "Totalt: {0} anteckning"
msgstr[1] "Totalt: {0} anteckningar"
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:589
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "Sökträffar: {0} anteckning"
msgstr[1] "Sökträffar: {0} anteckningar"
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:725
msgid "Notes"
msgstr "Anteckningar"
@@ -1601,11 +1615,11 @@ msgstr "Kan inte skapa ny anteckning"
msgid "Primary Development:"
msgstr "Primär utveckling:"
-#: ../Tomboy/Tomboy.cs:323
+#: ../Tomboy/Tomboy.cs:330
msgid "Contributors:"
msgstr "Bidragsgivare:"
-#: ../Tomboy/Tomboy.cs:401
+#: ../Tomboy/Tomboy.cs:412
msgid "translator-credits"
msgstr ""
"Daniel Nylander\n"
@@ -1615,23 +1629,23 @@ msgstr ""
"Skicka synpunkter på översättningen till\n"
"<tp-sv at listor.tp-sv.se>."
-#: ../Tomboy/Tomboy.cs:410
+#: ../Tomboy/Tomboy.cs:421
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
+"Copyright © 2004-2011 Others\n"
msgstr ""
"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Övriga\n"
+"Copyright © 2004-2011 Övriga\n"
-#: ../Tomboy/Tomboy.cs:412
+#: ../Tomboy/Tomboy.cs:423
msgid "A simple and easy to use desktop note-taking application."
msgstr "Ett enkelt och lättanvänt program för att ta anteckningar."
-#: ../Tomboy/Tomboy.cs:422
+#: ../Tomboy/Tomboy.cs:433
msgid "Homepage"
msgstr "Webbplats"
-#: ../Tomboy/Tomboy.cs:540
+#: ../Tomboy/Tomboy.cs:551
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
@@ -1641,7 +1655,7 @@ msgstr ""
"Copyright © 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
"\n"
-#: ../Tomboy/Tomboy.cs:552
+#: ../Tomboy/Tomboy.cs:563
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -1655,7 +1669,7 @@ msgstr ""
" --note-path [sökväg]\t\tLäs in/Spara anteckningsdata i denna katalog\n"
" --search [text]\t\tÖppna sökfönster för att anteckningar med angiven text.\n"
-#: ../Tomboy/Tomboy.cs:562
+#: ../Tomboy/Tomboy.cs:573
msgid ""
" --new-note\t\t\tCreate and display a new note.\n"
" --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1669,7 +1683,7 @@ msgstr ""
" --start-here\t\t\tVisa \"Börja här\"-anteckningen.\n"
" --highlight-search [text]\tSök och färgmarkera text i den öppnade anteckningen\n"
-#: ../Tomboy/Tomboy.cs:576
+#: ../Tomboy/Tomboy.cs:587
#, csharp-format
msgid "Version {0}"
msgstr "Version {0}"
@@ -2041,10 +2055,27 @@ msgstr ""
"\n"
"För att undvika att få den här prompten i framtiden bör du läsa in FUSE vid uppstart. Lägg till \"modprobe fuse\" till /etc/init.d/boot.local eller \"fuse\" till /etc/modules."
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "HTML-exportera senaste katalogen"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Sök i dina anteckningar (Ctrl-Skift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Lyckades! Du är nu ansluten!"
+
#~ msgid "_Browse..."
#~ msgstr "_Bläddra..."
+
#~ msgid "D-BUS remote control disabled.\n"
#~ msgstr "D-BUS-fjärrkontroll inaktiverad.\n"
+
#~ msgid ""
#~ "Tomboy: unsupported option '{0}'\n"
#~ "Try 'tomboy --help' for more information.\n"
@@ -2053,92 +2084,136 @@ msgstr ""
#~ "Tomboy: ogiltig flagga \"{0}\"\n"
#~ "Prova \"tomboy --help\" för mer information.\n"
#~ "D-BUS-fjärrkontroll inaktiverad."
+
#~ msgid "Click Here After Authorizing"
#~ msgstr "Klicka här efter auktorisering"
+
#~ msgid "Processing..."
#~ msgstr "Behandlar..."
+
#~ msgid "_Connect to Server"
#~ msgstr "_Anslut till server"
+
#~ msgid "C_ase Sensitive"
#~ msgstr "Skiftlä_geskänslig"
+
#~ msgid "Really delete these notes?"
#~ msgstr "Verkligen ta bort dessa anteckningar?"
+
#~ msgid "Add-in"
#~ msgstr "Tillägg"
+
#~ msgid "Version"
#~ msgstr "Version"
+
#~ msgid "Other"
#~ msgstr "Annat"
+
#~ msgid "Preparing pages..."
#~ msgstr "Förbereder sidor..."
+
#~ msgid "Rendering page %d of %d..."
#~ msgstr "Renderar sida %d av %d..."
+
#~ msgid "Printing page %d of %d..."
#~ msgstr "Skriver ut sida %d av %d..."
+
#~ msgid "Print preview"
#~ msgstr "Förhandsgranska utskrift"
+
#~ msgid "%A %x, %X"
#~ msgstr "%A %x, %X"
+
#~ msgid "Configuration"
#~ msgstr "Konfiguration"
+
#~ msgid "Configuration options for the print job"
#~ msgstr "Konfigurationsalternativ för utskriftsjobbet"
+
#~ msgid "Source Buffer"
#~ msgstr "Källbuffert"
+
#~ msgid "GtkTextBuffer object to print"
#~ msgstr "GtkTextBuffer-objekt att skriv ut"
+
#~ msgid "Tabs Width"
#~ msgstr "Tabulatorbredd"
+
#~ msgid "Width in equivalent space characters of tabs"
#~ msgstr "Tabulatorbredd i motsvarande blankstegstecken"
+
#~ msgid "Wrap Mode"
#~ msgstr "Radbrytning"
+
#~ msgid "Word wrapping mode"
#~ msgstr "Radbrytningsläge"
+
#~ msgid "Highlight"
#~ msgstr "Färgmarkera"
+
#~ msgid "Whether to print the document with highlighted syntax"
#~ msgstr "Huruvida dokumentet ska skrivas ut med färgmarkerad syntax"
+
#~ msgid "Font"
#~ msgstr "Typsnitt"
+
#~ msgid "GnomeFont name to use for the document text (deprecated)"
#~ msgstr "GnomeFont-namn att använda för dokumenttexten (föråldrad)"
+
#~ msgid "Font Description"
#~ msgstr "Typsnittsbeskrivning"
+
#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
#~ msgstr "Typsnitt att använda för dokumenttexten (t.ex. \"Monospace 10\")"
+
#~ msgid "Numbers Font"
#~ msgstr "Typsnitt för nummer"
+
#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
#~ msgstr "GnomeFont-namn att använda för radnumren (föråldrad)"
+
#~ msgid "Font description to use for the line numbers"
#~ msgstr "Typsnittsbeskrivning att använda för radnumren"
+
#~ msgid "Print Line Numbers"
#~ msgstr "Skriv ut radnummer"
+
#~ msgid "Interval of printed line numbers (0 means no numbers)"
#~ msgstr "Intervall för utskrivna radnummer (0 betyder inga nummer)"
+
#~ msgid "Print Header"
#~ msgstr "Skriv ut sidhuvud"
+
#~ msgid "Whether to print a header in each page"
#~ msgstr "Huruvida ett sidhuvud ska skrivas ut på varje sida"
+
#~ msgid "Print Footer"
#~ msgstr "Skriv ut sidfot"
+
#~ msgid "Whether to print a footer in each page"
#~ msgstr "Huruvida en sidfot ska skrivas ut på varje sida"
+
#~ msgid "Header and Footer Font"
#~ msgstr "Typsnitt för sidhuvud och -fot"
+
#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
#~ msgstr "GnomeFont-namn att använda för sidhuvud och -fot (föråldrad)"
+
#~ msgid "Header and Footer Font Description"
#~ msgstr "Typsnittsbeskrivning för sidhuvud och -fot"
+
#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
#~ msgstr "Typsnitt att använda för sidhuvud och -fot (t.ex. \"Monospace 10\")"
+
#~ msgid "NoteOfTheDay"
#~ msgstr "Dagens anteckning"
+
#~ msgid "_Open New Note Template..."
#~ msgstr "_Öppna mall för ny anteckning..."
+
#~ msgid "Case _sensitive"
#~ msgstr "Skiftläges_känslig"
+
#~ msgid ""
#~ "<note-content>Tagging In Tomboy\n"
#~ "\n"
@@ -2152,73 +2227,106 @@ msgstr ""
#~ "Tryck på <bold>Tab</bold> i taggraden för att automatiskt komplettera "
#~ "till passande tagg. Tryck på <bold>Enter</bold> för att bekräfta den "
#~ "visade taggen.</note-content>"
+
#~ msgid "Tags in Tomboy"
#~ msgstr "Taggar i Tomboy"
+
#~ msgid "Delete"
#~ msgstr "Ta bort"
+
#~ msgid "Add/Remove note tags"
#~ msgstr "Lägg till/ta bort anteckningstaggar"
+
#~ msgid "Tags:"
#~ msgstr "Taggar:"
+
#~ msgid "Path:"
#~ msgstr "Sökväg:"
+
#~ msgid "Local File System Path"
#~ msgstr "Lokal filsystemssökväg"
+
#~ msgid ""
#~ "Your notes are up to date. See the details below or close the window."
#~ msgstr ""
#~ "Dina anteckningar är uppdaterade. Se detaljerna nedan eller stäng "
#~ "fönstret."
+
#~ msgid "Downloading updates from server"
#~ msgstr "Hämtar uppdateringar från servern"
+
#~ msgid "Downloading new note from server"
#~ msgstr "Hämtar ny anteckning från servern"
+
#~ msgid "To Do List"
#~ msgstr "Att göra-lista"
+
#~ msgid "New _Task"
#~ msgstr "Ny _uppgift"
+
#~ msgid "Create a new task"
#~ msgstr "Skapa en ny uppgift"
+
#~ msgid "_Options..."
#~ msgstr "Al_ternativ..."
+
#~ msgid "Open the selected task"
#~ msgstr "Öppna den valda uppgiften"
+
#~ msgid "Delete the selected task"
#~ msgstr "Ta bort den valda uppgiften"
+
#~ msgid "Open Associated _Note"
#~ msgstr "Öppna associerad ant_eckning"
+
#~ msgid "Open the note containing the task"
#~ msgstr "Öppna anteckning som innehåller uppgiften"
+
#~ msgid "Tasks Help"
#~ msgstr "Uppgiftshjälp"
+
#~ msgid "Summary"
#~ msgstr "Sammanfattning"
+
#~ msgid "Due Date"
#~ msgstr "Slutdatum"
+
#~ msgid "Completion Date"
#~ msgstr "Färdig den"
+
#~ msgid "Priority"
#~ msgstr "Prioritet"
+
#~ msgid "None"
#~ msgstr "Inget"
+
#~ msgid "Low"
#~ msgstr "Låg"
+
#~ msgid "Normal"
#~ msgstr "Normal"
+
#~ msgid "High"
#~ msgstr "Hög"
+
#~ msgid "Total: {0} task"
+
#~ msgid_plural "Total: {0} tasks"
#~ msgstr[0] "Totalt: {0} uppgift"
#~ msgstr[1] "Totalt: {0} uppgifter"
+
#~ msgid "New Task {0}"
#~ msgstr "Ny uppgift {0}"
+
#~ msgid "Really delete this task?"
#~ msgstr "Verkligen ta bort denna uppgift?"
+
#~ msgid "If you delete a task it is permanently lost."
#~ msgstr "Om du tar bort en uppgift försvinner den för alltid."
+
#~ msgid "Learn About Tomboy"
#~ msgstr "Läs mer om Tomboy"
+
#~ msgid ""
#~ "Click on the Tomboy icon in your panel and select \"Start Here\". You'll "
#~ "see more instructions on how to use Tomboy inside the \"Start Here\" "
@@ -2233,146 +2341,212 @@ msgstr ""
#~ "\n"
#~ "När du har öppnat anteckningen \"Börja här\" kan du markera den här "
#~ "uppgiften som färdig."
+
#~ msgid "Task Options"
#~ msgstr "Alternativ för uppgifter"
+
#~ msgid "_Summary:"
#~ msgstr "_Sammanfattning:"
+
#~ msgid "_Details:"
#~ msgstr "_Detaljer:"
+
#~ msgid "_Complete"
#~ msgstr "_Färdig"
+
#~ msgid "Due Date:"
#~ msgstr "Slutdatum:"
+
#~ msgid "Priority:"
#~ msgstr "Prioritet:"
+
#~ msgid "todo"
#~ msgstr "attgöra"
+
#~ msgid "Open To Do List"
#~ msgstr "Öppna Att göra-lista"
+
#~ msgid "To Do Options"
#~ msgstr "Alternativ för Att göra"
+
#~ msgid "Mark Undone"
#~ msgstr "Markera som ofärdig"
+
#~ msgid "Mark Complete"
#~ msgstr "Markera som färdig"
+
#~ msgid "All registered repositories"
#~ msgstr "Alla registrerade förråd"
+
#~ msgid "Are you sure you want to cancel the installation?"
#~ msgstr "Är du säker på att du vill avbryta installationen?"
+
#~ msgid "The following packages will be uninstalled:"
#~ msgstr "Följande paket kommer att avinstalleras:"
+
#~ msgid ""
#~ "There are other add-ins that depend on the previous ones which will also "
#~ "be uninstalled:"
#~ msgstr ""
#~ "Det finns andra tillägg som är beroende av de föregående tilläggen, vilka "
#~ "också kommer att avinstalleras:"
+
#~ msgid ""
#~ "The selected add-ins can't be installed because there are dependency "
#~ "conflicts."
#~ msgstr ""
#~ "De valda tilläggen kan inte installeras på grund av att det finns "
#~ "beroendekonflikter."
+
#~ msgid "The following packages will be installed:"
#~ msgstr "Följande paket kommer att installeras:"
+
#~ msgid " (in user directory)"
#~ msgstr " (i användarkatalogen)"
+
#~ msgid "The following packages need to be uninstalled:"
#~ msgstr "Följande paket behöver avinstalleras:"
+
#~ msgid "The following dependencies could not be resolved:"
#~ msgstr "Följande beroenden kunde inte lösas:"
+
#~ msgid "The installation has been successfully completed."
#~ msgstr "Installationen lyckades."
+
#~ msgid "The installation failed!"
#~ msgstr "Installationen misslyckades!"
+
#~ msgid "The uninstallation has been successfully completed."
#~ msgstr "Avinstallationen lyckades."
+
#~ msgid "The uninstallation failed!"
#~ msgstr "Avinstallationen misslyckades!"
+
#~ msgid "Repository"
#~ msgstr "Förråd"
+
#~ msgid "Some of the required add-ins were not found"
#~ msgstr "Några av de nödvändiga tilläggen kunde inte hittas"
+
#~ msgid "Installation failed"
#~ msgstr "Installationen misslyckades"
+
#~ msgid "Name"
#~ msgstr "Namn"
+
#~ msgid "Url"
#~ msgstr "Url"
+
#~ msgid "Exception occurred: {0}"
#~ msgstr "Undantag inträffade: {0}"
+
#~ msgid "MonoDevelop Package"
#~ msgstr "MonoDevelop-paket"
+
#~ msgid "Add-in Installation"
#~ msgstr "Tilläggsinstallation"
+
#~ msgid "<b>Select the add-ins to install and click on Next</b>"
#~ msgstr "<b>Välj tilläggen att installera och klicka på Nästa</b>"
+
#~ msgid "Install from:"
#~ msgstr "Installera från:"
+
#~ msgid "_Repositories..."
#~ msgstr "_Förråd..."
+
#~ msgid "Show all packages"
#~ msgstr "Visa alla paket"
+
#~ msgid "Show new versions only"
#~ msgstr "Visa endast nya versioner"
+
#~ msgid "Show updates only"
#~ msgstr "Visa endast uppdateringar"
+
#~ msgid "_Unselect All"
#~ msgstr "A_vmarkera allt"
+
#~ msgid "label124"
#~ msgstr "etikett124"
+
#~ msgid "Overall Progress:"
#~ msgstr "Totalt förlopp:"
+
#~ msgid "Add-in Manager"
#~ msgstr "Tilläggshanterare"
+
#~ msgid "Additional extensions are required to perform this operation."
#~ msgstr ""
#~ "Ytterligare tillägg är nödvändiga för att genomföra den här åtgärden."
+
#~ msgid "The following add-ins will be installed:"
#~ msgstr "Följande tillägg kommer att installeras:"
+
#~ msgid "MonoDevelop Add-in Manager"
#~ msgstr "Hanterare för MonoDevelop-tillägg"
+
#~ msgid "<big><b>MonoDevelop Add-in Manager</b></big>"
#~ msgstr "<big><b>Hanterare för MonoDevelop-tillägg</b></big>"
+
#~ msgid "The following add-ins are currently installed:"
#~ msgstr "Följande tillägg är för närvarande installerade:"
+
#~ msgid "_Install Add-ins..."
#~ msgstr "_Installera tillägg..."
+
#~ msgid "_Uninstall..."
#~ msgstr "_Avinstallera..."
+
#~ msgid "Disable"
#~ msgstr "Inaktivera"
+
#~ msgid "MonoDevelop"
#~ msgstr "MonoDevelop"
+
#~ msgid "Add-in Repository Management"
#~ msgstr "Hantering av tilläggsförråd"
+
#~ msgid "Add New Repository"
#~ msgstr "Lägg till nytt förråd"
+
#~ msgid "Select the location of the repository you want to register:"
#~ msgstr "Välj platsen för förrådet som du vill registrera:"
+
#~ msgid "Register an on-line repository"
#~ msgstr "Registrera ett förråd på nätet"
+
#~ msgid "Url:"
#~ msgstr "Url:"
+
#~ msgid "Register a local repository"
#~ msgstr "Registrera ett lokalt förråd"
+
#~ msgid "(provided by {0})"
#~ msgstr "(tillhandahålls av {0})"
+
#~ msgid "Disabled add-ins can't be loaded."
#~ msgstr "Inaktiverade tillägg kan inte läsas in."
+
#~ msgid "Loading {0} add-in"
#~ msgstr "Läser in tillägget {0}"
+
#~ msgid "The required addin '{0}' is disabled."
#~ msgstr "Det nödvändiga tillägget \"{0}\" är inaktiverat."
+
#~ msgid "The required addin '{0}' is not installed."
#~ msgstr "Det nödvändiga tillägget \"{0}\" är inte installerat."
+
#~ msgid "Currently enabled plugins."
#~ msgstr "För närvarande aktiverade insticksmoduler."
+
#~ msgid "List containing the names of currently enabled plugins."
#~ msgstr ""
#~ "Lista innehållande namnen på de för närvarande aktiverade insticksmoduler."
+
#~ msgid "Cannot fully disable {0}."
#~ msgstr "Kan inte fullständigt inaktivera {0}."
+
#~ msgid ""
#~ "Cannot fully disable {0} as there still are at least {1} reference to "
#~ "this addin. This indicates a programming error. Contact the addin's "
@@ -2391,10 +2565,13 @@ msgstr ""
#~ "tilläggets Dispose-metod misslyckas att koppla från alla "
#~ "händelsehanterare. Minnesprofileraren heap-shot ({2}) kan hjälpa till att "
#~ "identifiera läckande referenser."
+
#~ msgid "<b><span foreground=\"red\">"
#~ msgstr "<b><span foreground=\"red\">"
+
#~ msgid "Tomboy Project"
#~ msgstr "Tomboy-projektet"
+
#~ msgid ""
#~ "Cannot fully disable {0} as there still are at least {1} reference to "
#~ "this plugin. This indicates a programming error. Contact the plugin's "
@@ -2413,110 +2590,150 @@ msgstr ""
#~ "insticksmodulens Dispose-metod misslyckas att koppla från alla "
#~ "händelsehanterare. Minnesprofileraren heap-shot ({2}) kan hjälpa till att "
#~ "identifiera läckande referenser."
+
#~ msgid "Plugins"
#~ msgstr "Insticksmoduler"
+
#~ msgid "Written by:"
#~ msgstr "Skrivet av:"
+
#~ msgid "Web site:"
#~ msgstr "Webbsida:"
+
#~ msgid "Settings"
#~ msgstr "Inställningar"
+
#~ msgid "_Open Plugins Folder"
#~ msgstr "_Öppna insticksmodulmappen"
+
#~ msgid "{0} Settings"
#~ msgstr "Inställningar för {0}"
+
#~ msgid ""
#~ " --check-plugin-unloading\tCheck if plugins are unloaded properly.\n"
#~ msgstr ""
#~ " --check-plugin-unloading\tKontrollera om insticksmoduler är korrekt "
#~ "urlästa.\n"
+
#~ msgid "</span></b>\n"
#~ msgstr "</span></b>\n"
+
#~ msgid "Homepage & Donations"
#~ msgstr "Hemsida och donationer"
+
#~ msgid "Default Plugins"
#~ msgstr "Standardinsticksmoduler"
+
#~ msgid "Directory containing system-installed Plugins"
#~ msgstr ""
#~ "Katalog som innehåller de insticksmoduler som är installerade på systemet"
+
#~ msgid "Use the following:"
#~ msgstr "Använd följande:"
+
#~ msgid "NotD: "
#~ msgstr "Dagens anteckning:"
+
#~ msgid "Welcome to Tomboy!"
#~ msgstr "Välkommen till Tomboy!"
+
#~ msgid ""
#~ "Use this page as a Start Page for organizing your notes and keeping "
#~ "unorganized ideas around."
#~ msgstr ""
#~ "Använd denna sida som en startsida för att organisera dina anteckningar "
#~ "och hålla reda på oorganiserade idéer."
+
#~ msgid "Quick and handy note-taker"
#~ msgstr "Snabbt och praktiskt anteckningsverktyg"
+
#~ msgid "_Open Table of Contents"
#~ msgstr "_Öppna innehållsförteckning"
+
#~ msgid "Find"
#~ msgstr "Sök"
+
#~ msgid "ToC"
#~ msgstr "Innehåll"
+
#~ msgid "Open Table of Contents"
#~ msgstr "Öppna innehållsförteckning"
+
#~ msgid "Open \"_Table of Contents\""
#~ msgstr "Öppna \"_Innehållsförteckning\""
+
#~ msgid "Table of Contents"
#~ msgstr "Innehållsförteckning"
+
#~ msgid "_Table of Contents"
#~ msgstr "Innehålls_förteckning"
+
#~ msgid "_Search..."
#~ msgstr "_Sök..."
-#~ msgid "S_earch notes"
-#~ msgstr "S_ök anteckningar"
+
#~ msgid ""
#~ "<b>Table of Contents</b> lists all your notes.\n"
#~ "Double click to open a note."
#~ msgstr ""
#~ "<b>Innehållsförteckningen</b> är en lista på dina anteckningar.\n"
#~ "Dubbelklicka på en anteckning för att öppna den."
+
#~ msgid "Search Note"
#~ msgstr "Sök i anteckning"
+
#~ msgid "Search _Results"
#~ msgstr "Sök_resultat"
+
#~ msgid "No notes found"
#~ msgstr "Inga anteckningar hittade"
+
#~ msgid "_Search Notes..."
#~ msgstr "_Sök anteckningar..."
+
#~ msgid "%A %D, %I:%M %p"
#~ msgstr "%A·%D,·%I:%M·%p"
+
#~ msgid "_About Tomboy..."
#~ msgstr "_Om Tomboy..."
+
#~ msgid "Run Plugin actions"
#~ msgstr "Kör åtgärder i insticksmoduler"
+
#~ msgid "_Recent Changes"
#~ msgstr "_Senaste ändringar"
+
#~ msgid "Related to: "
#~ msgstr "Relaterad till: "
+
#~ msgid "<b>_Bold</b>"
#~ msgstr "<b>_Fet</b>"
+
#~ msgid "<i>_Italic</i>"
#~ msgstr "<i>_Kursiv</i>"
+
#~ msgid "<s>_Strikeout</s>"
#~ msgstr "<s>_Genomstruken</s>"
+
#~ msgid "Recent changes"
#~ msgstr "Senaste ändringar"
+
#~ msgid "Search Results"
#~ msgstr "Sökresultat"
+
#~ msgid "Related to:"
#~ msgstr "Relaterad till:"
#, fuzzy
#~ msgid "({0} matches)"
#~ msgstr "Inga träffar."
+
#~ msgid "Text"
#~ msgstr "Text"
+
#~ msgid "Previous"
#~ msgstr "Föregående"
+
#~ msgid "translator_credits"
#~ msgstr ""
#~ "Christian Rose\n"
#~ "Skicka synpunkter på översättningen till sv at li.org"
-
diff --git a/test/Makefile.in b/test/Makefile.in
index 44d1996..4c8fb04 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -209,7 +209,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/tomboy.spec b/tomboy.spec
index 7b9826f..36609ea 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 1.7.0
+Version: 1.7.1
Release: 1
Epoch: 0
Summary: Tomboy is a desktop note-taking application for Linux and Unix.
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list