[Pkg-cli-apps-commits] [SCM] sparkleshare branch, master, updated. debian/0.4.2-1-3-gc33134b
Carlos Martín Nieto
carlos at cmartin.tk
Tue Jan 10 16:12:06 UTC 2012
The following commit has been merged in the master branch:
commit 4b28c63979199d05081fd0cff2bf99a756ac752f
Author: Carlos Martín Nieto <carlos at cmartin.tk>
Date: Tue Jan 10 02:17:00 2012 +0100
Imported Upstream version 0.6.0
diff --git a/Makefile.in b/Makefile.in
old mode 100644
new mode 100755
index caff2bc..7394ae5
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,15 +32,14 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in \
$(top_srcdir)/build/m4/shave/shave-libtool.in \
$(top_srcdir)/build/m4/shave/shave.in $(top_srcdir)/configure \
AUTHORS NEWS config.guess config.sub install-sh ltmain.sh \
missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -130,6 +129,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -149,6 +150,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -162,6 +164,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -185,17 +188,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/NEWS b/NEWS
index ea1378f..081fa55 100755
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+0.6.0 for Linux and Mac (Sat Dec 24 2011):
+
+ Hylke:
+ - Several fixes for annoying bugs and crashes
+ - Fix freeze on quit on Mac
+ - Show project and history size in the event log
+
+
0.4.2 for Linux and Mac (Fri Dec 2 2011):
Hylke: Fix crash trying to add a project
diff --git a/README b/README
deleted file mode 100644
index bd8cb03..0000000
--- a/README
+++ /dev/null
@@ -1,145 +0,0 @@
-# SparkleShare
-
-SparkleShare is a collaboration and sharing tool that is designed to keep
-things simple and to stay out of your way. It allows you to instantly sync
-with any Git repository you have access to.
-
-SparkleShare currently works on Linux and Mac. A Windows port and mobile
-device support are planned for the future.
-
-
-# License
-
-SparkleShare is free software and licensed under the GNU GPLv3 or later. You
-are welcome to change and redistribute it under certain conditions. For more
-information see the LICENSE file or visit http://www.gnu.org/licenses/gpl-3.0.html
-
-
-# Run on Linux
-
-Requirements:
-
- - git >= 1.7.0
- - gtk-sharp2
- - gvfs
- - intltool
- - libnotify
- - mono-core >= 2.8
- - notify-sharp
- - nautilus-python
- - openssh
- - pygtk
- - webkitgtk
- - webkit-sharp
-
-Run the service, either click the SparkleShare launcher or:
-
- $ sparkleshare start
-
-You can stop the service via the graphical interface or by typing:
-
- $ sparkleshare stop
-
-For help:
-
- $ sparkleshare --help
-
-Note:
-
- SparkleShare creates its own RSA keypair in ~/config/sparkleshare/ and uses
- that for authentication. Please mind this if you're planning to set up your
- own server by hand.
-
-
-# Build on Linux
-
-Installing the build dependencies on Debian or Ubuntu:
-
- $ sudo apt-get install gtk-sharp2 mono-runtime mono-devel monodevelop \
- libndesk-dbus1.0-cil-dev nant libnotify-cil-dev libgtk2.0-cil-dev mono-mcs mono-gmcs \
- libwebkit-cil-dev intltool libtool python-nautilus libndesk-dbus-glib1.0-cil-dev
-
-For Ubuntu libappindicator support, run the following before building:
-
- $ sudo apt-get install libappindicator0.1-cil-dev
-
-On Fedora:
-
- $ sudo yum install gtk-sharp2-devel mono-core mono-devel monodevelop \
- ndesk-dbus-devel ndesk-dbus-glib-devel nautilus-python-devel nant \
- notify-sharp-devel webkit-sharp-devel webkitgtk-devel libtool intltool \
- gnome-doc-utils
-
-You can build and install SparkleShare like this:
-
- $ ./configure --prefix=/usr (or ./autogen.sh if you build from the repository)
- $ make
- $ sudo make install
-
-Note:
-
- Use '--prefix=/usr' if you want the Nautilus extension to work.
-
-
-# Run on Mac
-
-Just double-click the SparkleShare bundle.
-
-
-# Build on Mac
-
-Install Xcode, the Mono Framework, MonoDevelop and the MonoMac plugin (you can find it in MonoDevelop => Add-in Manager).
-
-You may need to adjust some environment variables to let the build environment tools find mono:
-
- $ export PATH=/Library/Frameworks/Mono.framework/Versions/Current/bin:$PATH
- $ export PKG_CONFIG=/Library/Frameworks/Mono.framework/Versions/Current/bin/pkg-config
- $ export PKG_CONFIG_PATH=/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig
-
-Install git, automake, and intltool using MacPorts:
-
- $ sudo port install git-core automake intltool
-
-Start the first part of the build:
-
- $ ./autogen.sh --enable-gtkui=no
- $ make
-
-Now that you have compiled the libraries, open 'SparkleShare/Mac/SparkleShare.sln' in
-MonoDevelop and start the build.
-
-To create the SparkleShare.app, make sure the project is focused and select Project from the menu bar
-and click "Create Mac Installer...". Make sure to select "Don't link assemblies".
-
-Save the SparkleShare.app somewhere. Paste the contents of
-the following file in SparkleShare.app/Contents/MonoBundle/config:
-https://raw.github.com/gist/1aeffa61bac73fc08eca/0c0f09ef9e36864c35f34fd5e8bf4f99886be193/gistfile1.txt
-
-Copy /Library/Frameworks/Mono.framework/Versions/Current/lib/libintl.dylib
-to SparkleShare.app/Contents/Resources
-
-Now you should have a working bundle that you can run.
-
-
-# Info
-
-Official website:
-http://www.sparkleshare.org/
-
-Source code:
-http://github.com/SparkleShare/
-
-IRC Channel:
-#sparkleshare on irc.gnome.org
-
-Wiki:
-http://github.com/hbons/SparkleShare/wiki/
-
-Report issues:
-http://github.com/hbons/SparkleShare/issues/
-
-Translation project:
-http://www.transifex.net/projects/p/sparkleshare/
-
-
-Now have fun and create cool things together! :)
diff --git a/SparkleLib/AssemblyInfo.cs b/SparkleLib/AssemblyInfo.cs
old mode 100644
new mode 100755
index 73ec2ee..4c39e97
--- a/SparkleLib/AssemblyInfo.cs
+++ b/SparkleLib/AssemblyInfo.cs
@@ -7,5 +7,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: AssemblyVersion("0.4.2")]
+[assembly: AssemblyVersion("0.6.0")]
[assembly: AssemblyTitle ("SparkleShare")]
diff --git a/SparkleLib/Defines.cs b/SparkleLib/Defines.cs
old mode 100644
new mode 100755
index 080de40..3359420
--- a/SparkleLib/Defines.cs
+++ b/SparkleLib/Defines.cs
@@ -20,11 +20,11 @@ namespace SparkleLib {
public class Defines {
- public const string VERSION = "0.4.2";
- public const string LOCALE_DIR = "/usr/local/share/locale";
- public const string DATAROOTDIR = "/usr/local/share";
+ public const string VERSION = "0.6.0";
+ public const string LOCALE_DIR = "/usr/share/locale";
+ public const string DATAROOTDIR = "/usr/share";
public const string GETTEXT_PACKAGE = "sparkleshare";
- public const string PREFIX = "/usr/local";
+ public const string PREFIX = "/usr";
}
}
diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs
index 79ad2a8..f924195 100755
--- a/SparkleLib/Git/SparkleFetcherGit.cs
+++ b/SparkleLib/Git/SparkleFetcherGit.cs
@@ -90,7 +90,7 @@ namespace SparkleLib {
this.git.StartInfo.RedirectStandardError = true;
this.git.Start ();
-
+
double percentage = 1.0;
Regex progress_regex = new Regex (@"([0-9]+)%", RegexOptions.Compiled);
@@ -163,7 +163,7 @@ namespace SparkleLib {
public override void Stop ()
{
- if (this.git != null) {
+ if (this.git != null && !this.git.HasExited) {
this.git.Kill ();
this.git.Dispose ();
}
@@ -270,6 +270,7 @@ namespace SparkleLib {
}
}
+
public class SparkleGit : Process {
public SparkleGit (string path, string args) : base ()
diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index dd90378..e1c8c16 100755
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -59,6 +59,24 @@ namespace SparkleLib {
}
+ public override double Size {
+ get {
+ return CalculateSize (
+ new DirectoryInfo (LocalPath)
+ );
+ }
+ }
+
+
+ public override double HistorySize {
+ get {
+ return CalculateSize (
+ new DirectoryInfo (Path.Combine (LocalPath, ".git"))
+ );
+ }
+ }
+
+
public override string [] UnsyncedFilePaths {
get {
List<string> file_paths = new List<string> ();
@@ -137,10 +155,12 @@ namespace SparkleLib {
public override bool SyncUp ()
{
- Add ();
+ if (AnyDifferences) {
+ Add ();
- string message = FormatCommitMessage ();
- Commit (message);
+ string message = FormatCommitMessage ();
+ Commit (message);
+ }
SparkleGit git = new SparkleGit (LocalPath, "push origin master");
git.Start ();
@@ -228,14 +248,14 @@ namespace SparkleLib {
// Removes unneeded objects
- private void CollectGarbage ()
+/* private void CollectGarbage ()
{
SparkleGit git = new SparkleGit (LocalPath, "gc");
git.Start ();
git.WaitForExit ();
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Garbage collected.");
- }
+ } */
// Commits the made changes
@@ -580,6 +600,10 @@ namespace SparkleLib {
foreach (string added in Added) {
file_name = added.Trim ("\"".ToCharArray ());
+
+ if (file_name.EndsWith (".empty"))
+ file_name = file_name.Substring (0, file_name.Length - 6);
+
message += "+ ‘" + file_name + "’" + n;
count++;
@@ -589,6 +613,10 @@ namespace SparkleLib {
foreach (string modified in Modified) {
file_name = modified.Trim ("\"".ToCharArray ());
+
+ if (file_name.EndsWith (".empty"))
+ file_name = file_name.Substring (0, file_name.Length - 6);
+
message += "/ ‘" + file_name + "’" + n;
count++;
@@ -598,6 +626,10 @@ namespace SparkleLib {
foreach (string removed in Removed) {
file_name = removed.Trim ("\"".ToCharArray ());
+
+ if (file_name.EndsWith (".empty"))
+ file_name = file_name.Substring (0, file_name.Length - 6);
+
message += "- ‘" + file_name + "’" + n;
count++;
@@ -624,5 +656,38 @@ namespace SparkleLib {
base.CreateInitialChangeSet ();
SyncUp ();
}
+
+
+ // Recursively gets a folder's size in bytes
+ public override double CalculateSize (DirectoryInfo parent)
+ {
+ if (!Directory.Exists (parent.ToString ()))
+ return 0;
+
+ double size = 0;
+
+ // Ignore the temporary 'rebase-apply' and '.tmp' directories. This prevents potential
+ // crashes when files are being queried whilst the files have already been deleted.
+ if (parent.Name.Equals ("rebase-apply") ||
+ parent.Name.Equals (".tmp"))
+ return 0;
+
+ try {
+ foreach (FileInfo file in parent.GetFiles()) {
+ if (!file.Exists)
+ return 0;
+
+ size += file.Length;
+ }
+
+ foreach (DirectoryInfo directory in parent.GetDirectories ())
+ size += CalculateSize (directory);
+
+ } catch (Exception) {
+ return 0;
+ }
+
+ return size;
+ }
}
}
diff --git a/SparkleLib/Makefile.in b/SparkleLib/Makefile.in
index f3c2078..818f5a1 100644
--- a/SparkleLib/Makefile.in
+++ b/SparkleLib/Makefile.in
@@ -39,8 +39,7 @@ DIST_COMMON = $(srcdir)/AssemblyInfo.cs.in $(srcdir)/Defines.cs.in \
$(top_srcdir)/build/build.rules.mk
subdir = SparkleLib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -101,6 +100,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -120,6 +121,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -133,6 +135,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -156,17 +159,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs
index ed19402..1b301f8 100755
--- a/SparkleLib/SparkleConfig.cs
+++ b/SparkleLib/SparkleConfig.cs
@@ -32,12 +32,14 @@ namespace SparkleLib {
"sparkleshare");
public static SparkleConfig DefaultConfig = new SparkleConfig (ConfigPath, "config.xml");
-
-
public string FullPath;
- public string HomePath = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
- public string TmpPath;
+ public string HomePath {
+ get {
+ return Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+ }
+ }
+
public string FoldersPath {
get {
@@ -48,11 +50,16 @@ namespace SparkleLib {
}
}
+ public string TmpPath {
+ get {
+ return Path.Combine (FoldersPath, ".tmp");
+ }
+ }
+
public SparkleConfig (string config_path, string config_file_name)
{
FullPath = System.IO.Path.Combine (config_path, config_file_name);
- TmpPath = Path.Combine (FoldersPath, ".tmp");
if (!Directory.Exists (config_path)) {
Directory.CreateDirectory (config_path);
@@ -89,6 +96,8 @@ namespace SparkleLib {
} finally {
Load (FullPath);
}
+
+ ConfigureSSH ();
}
@@ -151,6 +160,52 @@ namespace SparkleLib {
}
+ private void ConfigureSSH ()
+ {
+ string path = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+
+ if (!(SparkleBackend.Platform == PlatformID.Unix ||
+ SparkleBackend.Platform == PlatformID.MacOSX)) {
+
+ path = Environment.ExpandEnvironmentVariables ("%HOMEDRIVE%%HOMEPATH%");
+ }
+
+ string ssh_config_path = Path.Combine (path, ".ssh");
+ string ssh_config_file_path = SparkleHelpers.CombineMore (path, ".ssh", "config");
+ string ssh_config = "IdentityFile " +
+ Path.Combine (SparkleConfig.ConfigPath, "sparkleshare." + User.Email + ".key");
+
+ if (!Directory.Exists (ssh_config_path))
+ Directory.CreateDirectory (ssh_config_path);
+
+ if (File.Exists (ssh_config_file_path)) {
+ string current_config = File.ReadAllText (ssh_config_file_path);
+ if (current_config.Contains (ssh_config))
+ return;
+
+ if (current_config.EndsWith ("\n\n"))
+ ssh_config = "# SparkleShare's key\n" + ssh_config;
+ else if (current_config.EndsWith ("\n"))
+ ssh_config = "\n# SparkleShare's key\n" + ssh_config;
+ else
+ ssh_config = "\n\n# SparkleShare's key\n" + ssh_config;
+
+ TextWriter writer = File.AppendText (ssh_config_file_path);
+ writer.Write (ssh_config + "\n");
+ writer.Close ();
+
+ } else {
+ File.WriteAllText (ssh_config_file_path, ssh_config);
+ }
+
+ //UnixFileSystemInfo file_info = new UnixFileInfo (ssh_config_file_path);
+ //file_info.FileAccessPermissions = (FileAccessPermissions.UserRead |
+ // FileAccessPermissions.UserWrite); TODO
+
+ SparkleHelpers.DebugInfo ("Config", "Added key to " + ssh_config_file_path);
+ }
+
+
public List<string> Folders {
get {
List<string> folders = new List<string> ();
diff --git a/SparkleLib/SparkleFetcherBase.cs b/SparkleLib/SparkleFetcherBase.cs
index 6e01c74..da69976 100755
--- a/SparkleLib/SparkleFetcherBase.cs
+++ b/SparkleLib/SparkleFetcherBase.cs
@@ -22,8 +22,6 @@ using System.Security.AccessControl;
using System.Text.RegularExpressions;
using System.Threading;
-//using Mono.Unix;
-
namespace SparkleLib {
// Sets up a fetcher that can get remote folders
@@ -141,28 +139,25 @@ namespace SparkleLib {
string ssh_config_path = Path.Combine (path, ".ssh");
string ssh_config_file_path = SparkleHelpers.CombineMore (path, ".ssh", "config");
- string ssh_config = Environment.NewLine + "# <SparkleShare>" +
- Environment.NewLine + "Host " + host +
- Environment.NewLine + "\tStrictHostKeyChecking no" +
- Environment.NewLine + "# </SparkleShare>";
+ string ssh_config = "\n# <SparkleShare>" +
+ "\nHost " + host +
+ "\n\tStrictHostKeyChecking no" +
+ "\n# </SparkleShare>";
if (!Directory.Exists (ssh_config_path))
Directory.CreateDirectory (ssh_config_path);
if (File.Exists (ssh_config_file_path)) {
TextWriter writer = File.AppendText (ssh_config_file_path);
- writer.WriteLine (ssh_config);
+ writer.Write (ssh_config);
writer.Close ();
} else {
File.WriteAllText (ssh_config_file_path, ssh_config);
}
- //UnixFileSystemInfo file_info = new UnixFileInfo (ssh_config_file_path);
- //file_info.FileAccessPermissions = (FileAccessPermissions.UserRead |
- // FileAccessPermissions.UserWrite); TODO
-
- SparkleHelpers.DebugInfo ("Fetcher", "Disabled host key checking " + host);
+ Chmod644 (ssh_config_file_path);
+ SparkleHelpers.DebugInfo ("Fetcher", "Disabled host key checking for " + host);
}
@@ -182,7 +177,7 @@ namespace SparkleLib {
string current_ssh_config = File.ReadAllText (ssh_config_file_path);
current_ssh_config = current_ssh_config.Trim ();
- string [] lines = current_ssh_config.Split (Environment.NewLine.ToCharArray ());
+ string [] lines = current_ssh_config.Split ('\n');
string new_ssh_config = "";
bool in_sparkleshare_section = false;
@@ -200,7 +195,7 @@ namespace SparkleLib {
if (in_sparkleshare_section)
continue;
- new_ssh_config += line + Environment.NewLine;
+ new_ssh_config += line + "\n"; // do not use Environment.NewLine because file is in unix format
}
if (string.IsNullOrEmpty (new_ssh_config.Trim ())) {
@@ -208,10 +203,7 @@ namespace SparkleLib {
} else {
File.WriteAllText (ssh_config_file_path, new_ssh_config.Trim ());
-
- //UnixFileSystemInfo file_info = new UnixFileInfo (ssh_config_file_path);
- //file_info.FileAccessPermissions = (FileAccessPermissions.UserRead |
- // FileAccessPermissions.UserWrite); TODO
+ Chmod644 (ssh_config_file_path);
}
}
@@ -229,5 +221,15 @@ namespace SparkleLib {
else
return null;
}
+
+
+ private void Chmod644 (string file_path)
+ {
+ // Hack to be able to set the permissions on a file
+ // that OpenSSH still likes without resorting to Mono.Unix
+ FileInfo file_info = new FileInfo (file_path);
+ file_info.Attributes = FileAttributes.ReadOnly;
+ file_info.Attributes = FileAttributes.Normal;
+ }
}
}
diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index f9f8087..5b1a902 100755
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -64,8 +64,12 @@ namespace SparkleLib {
public abstract string CurrentRevision { get; }
public abstract bool SyncUp ();
public abstract bool SyncDown ();
+ public abstract double CalculateSize (DirectoryInfo parent);
public abstract bool HasUnsyncedChanges { get; set; }
+ public abstract double Size { get; }
+ public abstract double HistorySize { get; }
+
public delegate void SyncStatusChangedEventHandler (SyncStatus new_status);
public event SyncStatusChangedEventHandler SyncStatusChanged;
@@ -116,7 +120,7 @@ namespace SparkleLib {
// In the unlikely case that we haven't synced up our
// changes or the server was down, sync up again
- if (HasUnsyncedChanges)
+ if (HasUnsyncedChanges && !IsSyncing && this.server_online)
SyncUpBase ();
};
@@ -180,7 +184,7 @@ namespace SparkleLib {
}
- public virtual bool CheckForRemoteChanges () // HasRemoteChanges { get; } ?
+ public virtual bool CheckForRemoteChanges () // TODO: HasRemoteChanges { get; }
{
return true;
}
@@ -309,7 +313,7 @@ namespace SparkleLib {
this.sizebuffer.RemoveAt (0);
DirectoryInfo dir_info = new DirectoryInfo (LocalPath);
- this.sizebuffer.Add (CalculateFolderSize (dir_info));
+ this.sizebuffer.Add (CalculateSize (dir_info));
if (this.sizebuffer.Count >= 4 &&
this.sizebuffer [0].Equals (this.sizebuffer [1]) &&
@@ -432,8 +436,9 @@ namespace SparkleLib {
HasUnsyncedChanges = true;
SyncDownBase ();
+ DisableWatching ();
- if (SyncUp ()) {
+ if (this.server_online && SyncUp ()) {
HasUnsyncedChanges = false;
if (SyncStatusChanged != null)
@@ -442,6 +447,8 @@ namespace SparkleLib {
this.listener.AnnounceBase (new SparkleAnnouncement (Identifier, CurrentRevision));
} else {
+ this.server_online = false;
+
if (SyncStatusChanged != null)
SyncStatusChanged (SyncStatus.Error);
}
@@ -520,7 +527,7 @@ namespace SparkleLib {
public void DisableWatching ()
{
- lock (watch_lock) {
+ lock (this.watch_lock) {
this.watcher.EnableRaisingEvents = false;
this.local_timer.Stop ();
}
@@ -529,7 +536,7 @@ namespace SparkleLib {
public void EnableWatching ()
{
- lock (watch_lock) {
+ lock (this.watch_lock) {
this.watcher.EnableRaisingEvents = true;
this.local_timer.Start ();
}
@@ -585,33 +592,6 @@ namespace SparkleLib {
}
- // Recursively gets a folder's size in bytes
- private double CalculateFolderSize (DirectoryInfo parent)
- {
- if (!System.IO.Directory.Exists (parent.ToString ()))
- return 0;
-
- double size = 0;
-
- // Ignore the temporary 'rebase-apply' directory. This prevents potential
- // crashes when files are being queried whilst the files have already been deleted.
- if (parent.Name.Equals ("rebase-apply"))
- return 0;
-
- foreach (FileInfo file in parent.GetFiles ()) {
- if (!file.Exists)
- return 0;
-
- size += file.Length;
- }
-
- foreach (DirectoryInfo directory in parent.GetDirectories())
- size += CalculateFolderSize (directory);
-
- return size;
- }
-
-
// Creates a SHA-1 hash of input
private string SHA1 (string s)
{
diff --git a/SparkleShare/Mac/._Growl.framework b/SparkleShare/Mac/._Growl.framework
deleted file mode 100755
index 5f01920..0000000
Binary files a/SparkleShare/Mac/._Growl.framework and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/.DS_Store b/SparkleShare/Mac/Growl.framework/.DS_Store
deleted file mode 100644
index 0b9e24f..0000000
Binary files a/SparkleShare/Mac/Growl.framework/.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/._.DS_Store b/SparkleShare/Mac/Growl.framework/._.DS_Store
deleted file mode 100644
index 460d887..0000000
Binary files a/SparkleShare/Mac/Growl.framework/._.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/._Versions b/SparkleShare/Mac/Growl.framework/._Versions
deleted file mode 100755
index 5f01920..0000000
Binary files a/SparkleShare/Mac/Growl.framework/._Versions and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Headers/.DS_Store b/SparkleShare/Mac/Growl.framework/Headers/.DS_Store
deleted file mode 100644
index 4d12275..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Headers/.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Headers/._.DS_Store b/SparkleShare/Mac/Growl.framework/Headers/._.DS_Store
deleted file mode 100644
index 460d887..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Headers/._.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/.DS_Store
deleted file mode 100644
index 826ea4b..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/._.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/._.DS_Store
deleted file mode 100644
index 460d887..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/._.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/._A b/SparkleShare/Mac/Growl.framework/Versions/._A
deleted file mode 100755
index 5f01920..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/._A and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/A/.DS_Store
deleted file mode 100644
index 70cb690..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/A/.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/._.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/A/._.DS_Store
deleted file mode 100644
index 460d887..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/A/._.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/._Headers b/SparkleShare/Mac/Growl.framework/Versions/A/._Headers
deleted file mode 100755
index 5f01920..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/A/._Headers and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/Headers/.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/A/Headers/.DS_Store
deleted file mode 100644
index 4d12275..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/A/Headers/.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/Headers/._.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/A/Headers/._.DS_Store
deleted file mode 100644
index 460d887..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/A/Headers/._.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/Current/.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/Current/.DS_Store
deleted file mode 100644
index 70cb690..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/Current/.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/Current/._.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/Current/._.DS_Store
deleted file mode 100644
index 460d887..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/Current/._.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/Current/._Headers b/SparkleShare/Mac/Growl.framework/Versions/Current/._Headers
deleted file mode 100755
index 5f01920..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/Current/._Headers and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/Current/Headers/.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/Current/Headers/.DS_Store
deleted file mode 100644
index 4d12275..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/Current/Headers/.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Growl.framework/Versions/Current/Headers/._.DS_Store b/SparkleShare/Mac/Growl.framework/Versions/Current/Headers/._.DS_Store
deleted file mode 100644
index 460d887..0000000
Binary files a/SparkleShare/Mac/Growl.framework/Versions/Current/Headers/._.DS_Store and /dev/null differ
diff --git a/SparkleShare/Mac/Makefile.in b/SparkleShare/Mac/Makefile.in
old mode 100644
new mode 100755
index 877d04e..04a805a
--- a/SparkleShare/Mac/Makefile.in
+++ b/SparkleShare/Mac/Makefile.in
@@ -34,8 +34,7 @@ POST_UNINSTALL = :
subdir = SparkleShare/Mac
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -74,6 +73,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -106,6 +108,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -129,17 +132,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/SparkleShare/Mac/SparkleController.cs b/SparkleShare/Mac/SparkleController.cs
index 4bc7ce0..3b4f0e4 100755
--- a/SparkleShare/Mac/SparkleController.cs
+++ b/SparkleShare/Mac/SparkleController.cs
@@ -209,12 +209,5 @@ namespace SparkleShare {
url = url.Replace ("%20", " ");
NSWorkspace.SharedWorkspace.OpenFile (url);
}
-
-
- new public void Quit ()
- {
- this.watcher.Dispose ();
- base.Quit ();
- }
}
}
diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs
index 17d7056..997cf6b 100755
--- a/SparkleShare/Mac/SparkleEventLog.cs
+++ b/SparkleShare/Mac/SparkleEventLog.cs
@@ -35,14 +35,17 @@ namespace SparkleShare {
PolicyDelegate = new SparkleWebPolicyDelegate ()
};
- private NSBox Separator = new NSBox (new RectangleF (0, 579, 480, 1)) {
+ private NSBox separator = new NSBox (new RectangleF (0, 579, 480, 1)) {
BorderColor = NSColor.LightGray,
BoxType = NSBoxType.NSBoxCustom
};
private NSPopUpButton popup_button;
private NSProgressIndicator progress_indicator;
-
+ private NSTextField size_label;
+ private NSTextField size_label_value;
+ private NSTextField history_label;
+ private NSTextField history_label_value;
public SparkleEventLog (IntPtr handle) : base (handle) { }
@@ -64,7 +67,54 @@ namespace SparkleShare {
HasShadow = true;
BackingType = NSBackingStore.Buffered;
- ContentView.AddSubview (Separator);
+
+ this.size_label = new NSTextField () {
+ Alignment = NSTextAlignment.Right,
+ BackgroundColor = NSColor.WindowBackground,
+ Bordered = false,
+ Editable = false,
+ Frame = new RectangleF (0, 588, 60, 20),
+ StringValue = "Size:",
+ Font = SparkleUI.BoldFont
+ };
+
+ this.size_label_value = new NSTextField () {
+ Alignment = NSTextAlignment.Left,
+ BackgroundColor = NSColor.WindowBackground,
+ Bordered = false,
+ Editable = false,
+ Frame = new RectangleF (60, 588, 75, 20),
+ StringValue = Controller.Size,
+ Font = SparkleUI.Font
+ };
+
+
+ this.history_label = new NSTextField () {
+ Alignment = NSTextAlignment.Right,
+ BackgroundColor = NSColor.WindowBackground,
+ Bordered = false,
+ Editable = false,
+ Frame = new RectangleF (130, 588, 60, 20),
+ StringValue = "History:",
+ Font = SparkleUI.BoldFont
+ };
+
+ this.history_label_value = new NSTextField () {
+ Alignment = NSTextAlignment.Left,
+ BackgroundColor = NSColor.WindowBackground,
+ Bordered = false,
+ Editable = false,
+ Frame = new RectangleF (190, 588, 75, 20),
+ StringValue = Controller.HistorySize,
+ Font = SparkleUI.Font
+ };
+
+
+ ContentView.AddSubview (this.size_label);
+ ContentView.AddSubview (this.size_label_value);
+ ContentView.AddSubview (this.history_label);
+ ContentView.AddSubview (this.history_label_value);
+ ContentView.AddSubview (this.separator);
this.progress_indicator = new NSProgressIndicator () {
@@ -102,6 +152,14 @@ namespace SparkleShare {
ContentView.AddSubview (this.progress_indicator);
});
};
+
+ Controller.UpdateSizeInfoEvent += delegate (string size, string history_size) {
+ InvokeOnMainThread (delegate {
+ Console.WriteLine (size + " " + history_size);
+ this.size_label_value.StringValue = size;
+ this.history_label_value.StringValue = history_size;
+ });
+ };
}
@@ -122,7 +180,7 @@ namespace SparkleShare {
this.popup_button.Font = NSFontManager.SharedFontManager.FontWithFamily
("Lucida Grande", NSFontTraitMask.Condensed, 0, NSFont.SmallSystemFontSize);
- this.popup_button.AddItem ("All Folders");
+ this.popup_button.AddItem ("All Projects");
this.popup_button.Menu.AddItem (NSMenuItem.SeparatorItem);
this.popup_button.AddItems (folders);
diff --git a/SparkleShare/Mac/SparkleMacWatcher.cs b/SparkleShare/Mac/SparkleMacWatcher.cs
index 1acf262..75123de 100755
--- a/SparkleShare/Mac/SparkleMacWatcher.cs
+++ b/SparkleShare/Mac/SparkleMacWatcher.cs
@@ -28,8 +28,9 @@ namespace SparkleShare {
public delegate void ChangedEventHandler (string path);
public event ChangedEventHandler Changed;
- private DirectoryInfo last_changed;
+ private FileSystemInfo last_changed;
private Thread thread;
+ private int poll_count = 0;
public SparkleMacWatcher (string path)
@@ -50,7 +51,8 @@ namespace SparkleShare {
Changed (relative_path);
}
- Thread.Sleep (2500);
+ Thread.Sleep (7500);
+ this.poll_count++;
}
}));
@@ -73,7 +75,20 @@ namespace SparkleShare {
}
}
- } catch (Exception) { }
+ if (this.poll_count >= 8) {
+ foreach (FileInfo info in parent.GetFiles ()) {
+ if (!info.FullName.Contains ("/.")) {
+ if (DateTime.Compare (info.LastWriteTime, this.last_changed.LastWriteTime) > 0)
+ this.last_changed = info;
+ }
+ }
+
+ this.poll_count = 0;
+ }
+
+ } catch (Exception) {
+ // Don't care...
+ }
}
diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs
index 863031c..d37da9e 100755
--- a/SparkleShare/Mac/SparkleSetup.cs
+++ b/SparkleShare/Mac/SparkleSetup.cs
@@ -72,8 +72,8 @@ namespace SparkleShare {
case PageType.Setup: {
Header = "Welcome to SparkleShare!";
- Description = "Before we can create a SparkleShare folder on this " +
- "computer, we need some information from you.";
+ Description = "We'll need some info to mark your changes in the event log. " +
+ "Don't worry, this stays between you and your peers.";
FullNameLabel = new NSTextField () {
@@ -150,6 +150,11 @@ namespace SparkleShare {
Buttons.Add (ContinueButton);
+ Controller.CheckSetupPage (
+ FullNameTextField.StringValue,
+ EmailTextField.StringValue
+ );
+
break;
}
diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj
index 8f909d7..aad0d95 100755
--- a/SparkleShare/Mac/SparkleShare.csproj
+++ b/SparkleShare/Mac/SparkleShare.csproj
@@ -11,7 +11,7 @@
<RootNamespace>SparkleShare</RootNamespace>
<AssemblyName>SparkleShare</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <ReleaseVersion>0.4.2</ReleaseVersion>
+ <ReleaseVersion>0.6.0</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -24,8 +24,7 @@
<ConsolePause>false</ConsolePause>
<CustomCommands>
<CustomCommands>
- <Command type="AfterBuild" command="mkdir -p ${TargetDir}/${SolutionName}.app/Contents/Frameworks; cp -r Growl.framework ${TargetDir}/${SolutionName}.app/Contents/Frameworks" externalConsole="true" />
- <Command type="AfterBuild" command="mkdir -p ${TargetDir}/${SolutionName}.app/Contents/Resources; cp -r git ${TargetDir}/${SolutionName}.app/Contents/Resources" externalConsole="true" />
+ <Command type="AfterBuild" command="mkdir -p ${TargetDir}/${SolutionName}.app/Contents/Frameworks; cp -r Growl.framework ${TargetDir}/${SolutionName}.app/Contents/Frameworks;mkdir -p ${TargetDir}/${SolutionName}.app/Contents/Resources; cp -r git ${TargetDir}/${SolutionName}.app/Contents/Resources" externalConsole="true" />
</CustomCommands>
</CustomCommands>
</PropertyGroup>
@@ -60,7 +59,7 @@
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System.Net" />
- <Reference Include="SparkleLib, Version=0.4.1.0, Culture=neutral, PublicKeyToken=null">
+ <Reference Include="SparkleLib, Version=0.6.0.0, Culture=neutral, PublicKeyToken=null">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\SparkleLib.dll</HintPath>
</Reference>
diff --git a/SparkleShare/Mac/SparkleShare.sln b/SparkleShare/Mac/SparkleShare.sln
index 0ddce70..d22cce4 100644
--- a/SparkleShare/Mac/SparkleShare.sln
+++ b/SparkleShare/Mac/SparkleShare.sln
@@ -16,6 +16,6 @@ Global
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = SparkleShare.csproj
- version = 0.4.2
+ version = 0.6.0
EndGlobalSection
EndGlobal
diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
index 55563d6..7e57f66 100755
--- a/SparkleShare/Mac/SparkleStatusIcon.cs
+++ b/SparkleShare/Mac/SparkleStatusIcon.cs
@@ -119,6 +119,8 @@ namespace SparkleShare {
break;
case IconState.Error:
+
+ Animation.Stop ();
StateText = _("Not everything is synced");
StateMenuItem.Title = StateText;
@@ -240,7 +242,7 @@ namespace SparkleShare {
RecentEventsMenuItem = new NSMenuItem () {
Title = "Open Recent Events",
- Enabled = true
+ Enabled = (Controller.Folders.Length > 0)
};
if (Controller.Folders.Length > 0) {
diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs
index d636c40..1e512d4 100755
--- a/SparkleShare/Mac/SparkleUI.cs
+++ b/SparkleShare/Mac/SparkleUI.cs
@@ -37,6 +37,7 @@ namespace SparkleShare {
public static SparkleBubbles Bubbles;
public static SparkleAbout About;
public static NSFont Font;
+ public static NSFont BoldFont;
public SparkleUI ()
@@ -59,6 +60,9 @@ namespace SparkleShare {
Font = NSFontManager.SharedFontManager.FontWithFamily
("Lucida Grande", NSFontTraitMask.Condensed, 0, 13);
+ BoldFont = NSFontManager.SharedFontManager.FontWithFamily
+ ("Lucida Grande", NSFontTraitMask.Bold, 0, 13);
+
StatusIcon = new SparkleStatusIcon ();
Bubbles = new SparkleBubbles ();
@@ -104,6 +108,7 @@ namespace SparkleShare {
NSApplication.SharedApplication.DockTile.BadgeLabel = null;
}
+
public override void WillTerminate (NSNotification notification)
{
Program.Controller.Quit ();
diff --git a/SparkleShare/Makefile.in b/SparkleShare/Makefile.in
index 7cfc728..c68d533 100644
--- a/SparkleShare/Makefile.in
+++ b/SparkleShare/Makefile.in
@@ -41,8 +41,7 @@ DIST_COMMON = $(dist_Applications_DATA) $(dist_man_MANS) \
$(top_srcdir)/build/build.rules.mk
subdir = SparkleShare
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -148,6 +147,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -167,6 +168,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -180,6 +182,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -203,17 +206,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/SparkleShare/Nautilus/Makefile.in b/SparkleShare/Nautilus/Makefile.in
old mode 100644
new mode 100755
index b11dca2..4453be7
--- a/SparkleShare/Nautilus/Makefile.in
+++ b/SparkleShare/Nautilus/Makefile.in
@@ -37,8 +37,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/sparkleshare-nautilus-extension.py.in \
$(srcdir)/sparkleshare-nautilus3-extension.py.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -100,6 +99,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -119,6 +120,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -132,6 +134,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -155,17 +158,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py b/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
old mode 100644
new mode 100755
index 3e71040..ec474f4
--- a/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
+++ b/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
@@ -29,7 +29,7 @@ import gtk
SPARKLESHARE_PATH = os.path.join (os.path.expanduser ('~'), "SparkleShare")
import gettext
-gettext.bindtextdomain('sparkleshare', '/usr/local/share/locale')
+gettext.bindtextdomain('sparkleshare', '/usr/share/locale')
gettext.textdomain('sparkleshare')
_ = gettext.gettext
diff --git a/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py b/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py
old mode 100644
new mode 100755
index e88ca50..9f21c8e
--- a/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py
+++ b/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py
@@ -26,7 +26,7 @@ from gi.repository import Nautilus, GObject, Gtk, Gdk
SPARKLESHARE_PATH = os.path.join (os.path.expanduser ('~'), "SparkleShare")
import gettext
-gettext.bindtextdomain('sparkleshare', '/usr/local/share/locale')
+gettext.bindtextdomain('sparkleshare', '/usr/share/locale')
gettext.textdomain('sparkleshare')
_ = gettext.gettext
diff --git a/SparkleShare/Program.cs b/SparkleShare/Program.cs
index b091709..573dbd0 100755
--- a/SparkleShare/Program.cs
+++ b/SparkleShare/Program.cs
@@ -110,12 +110,12 @@ namespace SparkleShare {
// Strange magic needed by SetProcessName ()
- [DllImport ("libc")]
- private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5);
+// [DllImport ("libc")]
+// private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5);
// Sets the Unix process name to 'sparkleshare' instead of 'mono'
- private static void SetProcessName (string name)
+/* private static void SetProcessName (string name)
{
try {
if (prctl (15, Encoding.ASCII.GetBytes (name + "\0"), IntPtr.Zero, IntPtr.Zero, IntPtr.Zero) != 0)
@@ -125,6 +125,6 @@ namespace SparkleShare {
} catch (EntryPointNotFoundException) {
Console.WriteLine ("SetProcessName: Entry point not found");
}
- }
+ } */
}
}
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 1552d5c..fd6c652 100755
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -35,7 +35,6 @@ namespace SparkleShare {
public abstract class SparkleControllerBase {
public List <SparkleRepoBase> Repositories;
- public string FolderSize;
public readonly string SparklePath = SparkleConfig.DefaultConfig.FoldersPath;
public event OnQuitWhileSyncingHandler OnQuitWhileSyncing;
@@ -53,9 +52,6 @@ namespace SparkleShare {
public event FolderListChangedHandler FolderListChanged;
public delegate void FolderListChangedHandler ();
- public event FolderSizeChangedHandler FolderSizeChanged;
- public delegate void FolderSizeChangedHandler (string folder_size);
-
public event AvatarFetchedHandler AvatarFetched;
public delegate void AvatarFetchedHandler ();
@@ -85,6 +81,8 @@ namespace SparkleShare {
private SparkleFetcherBase fetcher;
private List<string> failed_avatars = new List<string> ();
+ private Object avatar_lock = new Object ();
+
// Short alias for the translations
public static string _ (string s)
@@ -107,8 +105,6 @@ namespace SparkleShare {
if (CreateSparkleShareFolder ())
AddToBookmarks ();
- FolderSize = GetFolderSize ();
-
if (FirstRun)
SparkleConfig.DefaultConfig.SetConfigOption ("notifications", bool.TrueString);
else
@@ -128,11 +124,6 @@ namespace SparkleShare {
if (FolderListChanged != null)
FolderListChanged ();
-
- FolderSize = GetFolderSize ();
-
- if (FolderSizeChanged != null)
- FolderSizeChanged (FolderSize);
};
@@ -161,8 +152,8 @@ namespace SparkleShare {
public bool AcceptInvitation (string server, string folder, string token)
{
// The location of the user's public key for SparkleShare
- string public_key_file_path = SparkleHelpers.CombineMore (SparkleConfig.DefaultConfig.HomePath, ".ssh",
- "sparkleshare." + UserEmail + ".key.pub");
+ string public_key_file_path = SparkleHelpers.CombineMore (SparkleConfig.DefaultConfig.HomePath,
+ ".ssh", "sparkleshare." + UserEmail + ".key.pub");
if (!File.Exists (public_key_file_path))
return false;
@@ -532,31 +523,34 @@ namespace SparkleShare {
// Fires events for the current syncing state
public void UpdateState ()
{
+ bool has_syncing_repos = false;
+ bool has_unsynced_repos = false;
+
foreach (SparkleRepoBase repo in Repositories) {
if (repo.Status == SyncStatus.SyncDown ||
repo.Status == SyncStatus.SyncUp ||
repo.IsBuffering) {
- if (OnSyncing != null)
- OnSyncing ();
-
- return;
+ has_syncing_repos = true;
} else if (repo.HasUnsyncedChanges) {
- if (OnError != null)
- OnError ();
-
- return;
+ has_unsynced_repos = true;
}
}
- if (OnIdle != null)
- OnIdle ();
- FolderSize = GetFolderSize ();
+ if (has_syncing_repos) {
+ if (OnSyncing != null)
+ OnSyncing ();
- if (FolderSizeChanged != null)
- FolderSizeChanged (FolderSize);
+ } else if (has_unsynced_repos) {
+ if (OnError != null)
+ OnError ();
+
+ } else {
+ if (OnIdle != null)
+ OnIdle ();
+ }
}
@@ -650,11 +644,6 @@ namespace SparkleShare {
if (FolderListChanged != null)
FolderListChanged ();
-
- FolderSize = GetFolderSize ();
-
- if (FolderSizeChanged != null)
- FolderSizeChanged (FolderSize);
}
@@ -686,51 +675,37 @@ namespace SparkleShare {
}
- private string GetFolderSize ()
+ public string GetSize (string folder_name)
{
- double folder_size = CalculateFolderSize (
- new DirectoryInfo (SparkleConfig.DefaultConfig.FoldersPath));
+ double folder_size = 0;
+ /* TODO
+ foreach (SparkleRepoBase repo in
+ Repositories.GetRange (0, Repositories.Count)) {
- return FormatFolderSize (folder_size);
+ folder_size += repo.Size + repo.HistorySize;
+ }
+ */
+ return FormatSize (folder_size);
}
- // Recursively gets a folder's size in bytes
- private double CalculateFolderSize (DirectoryInfo parent)
+ public string GetHistorySize (string folder_name)
{
- if (!Directory.Exists (parent.ToString ()))
- return 0;
-
- double size = 0;
-
- // Ignore the temporary 'rebase-apply' and '.tmp' directories. This prevents potential
- // crashes when files are being queried whilst the files have already been deleted.
- if (parent.Name.Equals ("rebase-apply") ||
- parent.Name.Equals (".tmp"))
- return 0;
-
- try {
- foreach (FileInfo file in parent.GetFiles()) {
- if (!file.Exists)
- return 0;
+ double folder_size = 0;
+ /* TODO
+ foreach (SparkleRepoBase repo in
+ Repositories.GetRange (0, Repositories.Count)) {
- size += file.Length;
- }
-
- foreach (DirectoryInfo directory in parent.GetDirectories())
- size += CalculateFolderSize (directory);
-
- } catch (Exception) {
- return 0;
+ folder_size += repo.Size + repo.HistorySize;
}
-
- return size;
+ */
+ return FormatSize (folder_size);
}
// Format a file size nicely with small caps.
// Example: 1048576 becomes "1 ᴍʙ"
- private string FormatFolderSize (double byte_count)
+ public string FormatSize (double byte_count)
{
if (byte_count >= 1099511627776)
return String.Format ("{0:##.##} ᴛʙ", Math.Round (byte_count / 1099511627776, 1));
@@ -912,7 +887,10 @@ namespace SparkleShare {
// if not empty
if (buffer.Length > 255) {
avatar_fetched = true;
- File.WriteAllBytes (avatar_file_path, buffer);
+
+ lock (this.avatar_lock)
+ File.WriteAllBytes (avatar_file_path, buffer);
+
SparkleHelpers.DebugInfo ("Controller", "Fetched gravatar for " + email);
}
@@ -1014,28 +992,24 @@ namespace SparkleShare {
try {
Directory.Move (tmp_folder, target_folder_path);
- } catch (Exception e) {
- SparkleHelpers.DebugInfo ("Controller", "Error moving folder: " + e.Message);
- }
- SparkleConfig.DefaultConfig.AddFolder (target_folder_name, this.fetcher.RemoteUrl, backend);
- AddRepository (target_folder_path);
+ SparkleConfig.DefaultConfig.AddFolder (target_folder_name, this.fetcher.RemoteUrl, backend);
+ AddRepository (target_folder_path);
- if (FolderFetched != null)
- FolderFetched (warnings);
+ if (FolderFetched != null)
+ FolderFetched (warnings);
- FolderSize = GetFolderSize ();
+ if (FolderListChanged != null)
+ FolderListChanged ();
- if (FolderSizeChanged != null)
- FolderSizeChanged (FolderSize);
+ this.fetcher.Dispose ();
- if (FolderListChanged != null)
- FolderListChanged ();
+ if (Directory.Exists (tmp_path))
+ Directory.Delete (tmp_path, true);
- this.fetcher.Dispose ();
-
- if (Directory.Exists (tmp_path))
- Directory.Delete (tmp_path, true);
+ } catch (Exception e) {
+ SparkleHelpers.DebugInfo ("Controller", "Error moving folder: " + e.Message);
+ }
};
diff --git a/SparkleShare/SparkleEventLog.cs b/SparkleShare/SparkleEventLog.cs
index 16afffa..ed28ba7 100755
--- a/SparkleShare/SparkleEventLog.cs
+++ b/SparkleShare/SparkleEventLog.cs
@@ -29,6 +29,7 @@ namespace SparkleShare {
public SparkleEventLogController Controller = new SparkleEventLogController ();
+ private Label size_label;
private HBox layout_horizontal;
private ComboBox combo_box;
private EventBox content_wrapper;
@@ -58,6 +59,11 @@ namespace SparkleShare {
DeleteEvent += Close;
+ this.size_label = new Label () {
+ Markup = "<b>Size:</b> " + Controller.Size + " " +
+ "<b>History:</b> " + Controller.HistorySize
+ };
+
VBox layout_vertical = new VBox (false, 0);
this.spinner = new SparkleSpinner (22);
this.content_wrapper = new EventBox ();
@@ -85,9 +91,9 @@ namespace SparkleShare {
this.spinner.Start ();
- this.layout_horizontal = new HBox (true, 0);
- this.layout_horizontal.PackStart (new Label (""), true, true, 0);
- this.layout_horizontal.PackStart (new Label (""), true, true, 0);
+ this.layout_horizontal = new HBox (false, 0);
+ this.layout_horizontal.PackStart (this.size_label, true, true, 0);
+ this.layout_horizontal.PackStart (new Label (" "), false, false, 0);
layout_vertical.PackStart (this.layout_horizontal, false, false, 0);
layout_vertical.PackStart (CreateShortcutsBar (), false, false, 0);
@@ -123,6 +129,15 @@ namespace SparkleShare {
this.content_wrapper.ShowAll ();
});
};
+
+ Controller.UpdateSizeInfoEvent += delegate (string size, string history_size) {
+ Application.Invoke (delegate {
+ this.size_label.Markup = "<b>Size:</b> " + size + " " +
+ "<b>History:</b> " + history_size;
+
+ this.size_label.ShowAll ();
+ });
+ };
}
@@ -142,7 +157,7 @@ namespace SparkleShare {
ListStore store = new ListStore (typeof (string));
- store.AppendValues (_("All Folders"));
+ store.AppendValues (_("All Projects"));
store.AppendValues ("---");
foreach (string folder in folders)
diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
index cdd2ae1..9e9cb22 100755
--- a/SparkleShare/SparkleEventLogController.cs
+++ b/SparkleShare/SparkleEventLogController.cs
@@ -34,9 +34,14 @@ namespace SparkleShare {
public event UpdateChooserEventHandler UpdateChooserEvent;
public delegate void UpdateChooserEventHandler (string [] folders);
+ public event UpdateSizeInfoEventHandler UpdateSizeInfoEvent;
+ public delegate void UpdateSizeInfoEventHandler (string size, string history_size);
+
public event ContentLoadingEventHandler ContentLoadingEvent;
public delegate void ContentLoadingEventHandler ();
+ private string selected_folder;
+
public string SelectedFolder {
get {
@@ -63,6 +68,9 @@ namespace SparkleShare {
if (UpdateContentEvent != null)
UpdateContentEvent (html);
+
+ if (UpdateSizeInfoEvent != null)
+ UpdateSizeInfoEvent (Size, HistorySize);
}));
thread.Start ();
@@ -82,8 +90,35 @@ namespace SparkleShare {
}
}
+ public string Size {
+ get {
+ double size = 0;
- private string selected_folder;
+ foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
+ if (this.selected_folder == null)
+ size += repo.Size;
+ else if (this.selected_folder.Equals (repo.Name))
+ return Program.Controller.FormatSize (repo.Size);
+ }
+
+ return Program.Controller.FormatSize (size);
+ }
+ }
+
+ public string HistorySize {
+ get {
+ double size = 0;
+
+ foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
+ if (this.selected_folder == null)
+ size += repo.HistorySize;
+ else if (this.selected_folder.Equals (repo.Name))
+ return Program.Controller.FormatSize (repo.HistorySize);
+ }
+
+ return Program.Controller.FormatSize (size);
+ }
+ }
public SparkleEventLogController ()
@@ -96,6 +131,9 @@ namespace SparkleShare {
Program.Controller.OnIdle += delegate {
if (UpdateContentEvent != null)
UpdateContentEvent (HTML);
+
+ if (UpdateSizeInfoEvent != null)
+ UpdateSizeInfoEvent (Size, HistorySize);
};
Program.Controller.FolderListChanged += delegate {
@@ -110,11 +148,9 @@ namespace SparkleShare {
if (UpdateContentEvent != null)
UpdateContentEvent (HTML);
- };
- Program.Controller.NotificationRaised += delegate {
- if (UpdateContentEvent != null)
- UpdateContentEvent (HTML);
+ if (UpdateSizeInfoEvent != null)
+ UpdateSizeInfoEvent (Size, HistorySize);
};
}
diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs
index 49654f5..1a314f8 100755
--- a/SparkleShare/SparkleSetup.cs
+++ b/SparkleShare/SparkleSetup.cs
@@ -34,15 +34,6 @@ namespace SparkleShare {
private string SecondaryTextColor;
private string SecondaryTextColorSelected;
- private Entry NameEntry;
- private Entry EmailEntry;
- private SparkleEntry AddressEntry;
- private SparkleEntry PathEntry;
-
- private Button NextButton;
- private Button SyncButton;
-
- private Table Table;
private ProgressBar progress_bar = new ProgressBar ();
@@ -73,53 +64,71 @@ namespace SparkleShare {
case PageType.Setup: {
Header = _("Welcome to SparkleShare!");
- Description = _("Before we can create a SparkleShare folder on this " +
- "computer, we need a few bits of information from you.");
+ Description = "We'll need some info to mark your changes in the event log. " +
+ "Don't worry, this stays between you and your peers.";
- Table = new Table (4, 2, true) {
- RowSpacing = 6
+
+ Table table = new Table (2, 3, true) {
+ RowSpacing = 6,
+ ColumnSpacing = 6
};
Label name_label = new Label ("<b>" + _("Full Name:") + "</b>") {
UseMarkup = true,
- Xalign = 0
+ Xalign = 1
};
- NameEntry = new Entry (Controller.GuessedUserName);
- NameEntry.Changed += delegate {
- Controller.CheckSetupPage (NameEntry.Text, EmailEntry.Text);
+ Entry name_entry = new Entry (Controller.GuessedUserName) {
+ Xalign = 0
};
- EmailEntry = new Entry (Controller.GuessedUserEmail);
- EmailEntry.Changed += delegate {
- Controller.CheckSetupPage (NameEntry.Text, EmailEntry.Text);
+ Entry email_entry = new Entry (Controller.GuessedUserEmail) {
+ Xalign = 0
+ };
+
+ name_entry.Changed += delegate {
+ Controller.CheckSetupPage (name_entry.Text, email_entry.Text);
+ };
+
+ email_entry.Changed += delegate {
+ Controller.CheckSetupPage (name_entry.Text, email_entry.Text);
};
Label email_label = new Label ("<b>" + _("Email:") + "</b>") {
UseMarkup = true,
- Xalign = 0
+ Xalign = 1
};
- Table.Attach (name_label, 0, 1, 0, 1);
- Table.Attach (NameEntry, 1, 2, 0, 1);
- Table.Attach (email_label, 0, 1, 1, 2);
- Table.Attach (EmailEntry, 1, 2, 1, 2);
+ table.Attach (name_label, 0, 1, 0, 1);
+ table.Attach (name_entry, 1, 2, 0, 1);
+ table.Attach (email_label, 0, 1, 1, 2);
+ table.Attach (email_entry, 1, 2, 1, 2);
+
+ VBox wrapper = new VBox (false, 9);
+ wrapper.PackStart (table, true, false, 0);
- NextButton = new Button (_("Next")) {
+ Button continue_button = new Button (_("Continue")) {
Sensitive = false
};
- NextButton.Clicked += delegate (object o, EventArgs args) {
- string full_name = NameEntry.Text;
- string email = EmailEntry.Text;
+ continue_button.Clicked += delegate (object o, EventArgs args) {
+ string full_name = name_entry.Text;
+ string email = email_entry.Text;
Controller.SetupPageCompleted (full_name, email);
};
- AddButton (NextButton);
- Add (Table);
+ AddButton (continue_button);
+ Add (wrapper);
+
- Controller.CheckSetupPage (NameEntry.Text, EmailEntry.Text);
+ Controller.UpdateSetupContinueButtonEvent += delegate (bool button_enabled) {
+ Application.Invoke (delegate {
+ continue_button.Sensitive = button_enabled;
+ });
+ };
+
+ Controller.CheckSetupPage (name_entry.Text, email_entry.Text);
break;
}
@@ -163,8 +172,8 @@ namespace SparkleShare {
tree.AppendColumn (service_column);
- PathEntry = new SparkleEntry ();
- AddressEntry = new SparkleEntry ();
+ SparkleEntry path_entry = new SparkleEntry ();
+ SparkleEntry address_entry = new SparkleEntry ();
// Select the first plugin by default
@@ -175,20 +184,20 @@ namespace SparkleShare {
Controller.ChangeAddressFieldEvent += delegate (string text,
string example_text, FieldState state) {
- Console.WriteLine ("> " + text);
+
Application.Invoke (delegate {
- AddressEntry.Text = text;
- AddressEntry.Sensitive = (state == FieldState.Enabled);
+ address_entry.Text = text;
+ address_entry.Sensitive = (state == FieldState.Enabled);
if (string.IsNullOrEmpty (example_text))
- AddressEntry.ExampleText = null;
+ address_entry.ExampleText = null;
else
- AddressEntry.ExampleText = example_text;
+ address_entry.ExampleText = example_text;
if (string.IsNullOrEmpty (text))
- AddressEntry.ExampleTextActive = true;
+ address_entry.ExampleTextActive = true;
else
- AddressEntry.ExampleTextActive = false;
+ address_entry.ExampleTextActive = false;
});
};
@@ -196,18 +205,18 @@ namespace SparkleShare {
string example_text, FieldState state) {
Application.Invoke (delegate {
- PathEntry.Text = text;
- PathEntry.Sensitive = (state == FieldState.Enabled);
+ path_entry.Text = text;
+ path_entry.Sensitive = (state == FieldState.Enabled);
if (string.IsNullOrEmpty (example_text))
- PathEntry.ExampleText = null;
+ path_entry.ExampleText = null;
else
- PathEntry.ExampleText = example_text;
+ path_entry.ExampleText = example_text;
if (string.IsNullOrEmpty (text))
- PathEntry.ExampleTextActive = true;
+ path_entry.ExampleTextActive = true;
else
- PathEntry.ExampleTextActive = false;
+ path_entry.ExampleTextActive = false;
});
};
@@ -236,10 +245,10 @@ namespace SparkleShare {
SparklePlugin plugin = (SparklePlugin) model.GetValue (iter, 2);
if (plugin.Address != null) {
- AddressEntry.Sensitive = false;}
+ address_entry.Sensitive = false;}
if (plugin.Path != null)
- PathEntry.Sensitive = false;
+ path_entry.Sensitive = false;
// TODO: Scroll to the selection
@@ -249,43 +258,46 @@ namespace SparkleShare {
}
}));
- AddressEntry.Completion = new EntryCompletion();
+ address_entry.Completion = new EntryCompletion();
ListStore server_store = new ListStore (typeof (string));
foreach (string host in Program.Controller.PreviousHosts)
server_store.AppendValues (host);
- AddressEntry.Completion.Model = server_store;
- AddressEntry.Completion.TextColumn = 0;
+ address_entry.Completion.Model = server_store;
+ address_entry.Completion.TextColumn = 0;
- AddressEntry.Changed += delegate {
- Controller.CheckAddPage (AddressEntry.Text, PathEntry.Text, tree.SelectedRow);
+ address_entry.Changed += delegate {
+ Controller.CheckAddPage (address_entry.Text, path_entry.Text, tree.SelectedRow);
};
layout_address.PackStart (new Label () {
- Markup = "<b>" + _("Address") + "</b>",
- Xalign = 0
- }, true, true, 0);
+ Markup = "<b>" + _("Address") + "</b>",
+ Xalign = 0
+ }, true, true, 0);
- layout_address.PackStart (AddressEntry, true, true, 0);
+ layout_address.PackStart (address_entry, true, true, 0);
- PathEntry.Completion = new EntryCompletion();
+ path_entry.Completion = new EntryCompletion();
ListStore folder_store = new ListStore (typeof (string));
//foreach (string host in Program.Controller.FolderPaths)
// folder_store.AppendValues (host);
- PathEntry.Completion.Model = folder_store;
- PathEntry.Completion.TextColumn = 0;
+ path_entry.Completion.Model = folder_store;
+ path_entry.Completion.TextColumn = 0;
- PathEntry.Changed += delegate {
- Controller.CheckAddPage (AddressEntry.Text, PathEntry.Text, tree.SelectedRow);
+ path_entry.Changed += delegate {
+ Controller.CheckAddPage (address_entry.Text, path_entry.Text, tree.SelectedRow);
};
- layout_path.PackStart (new Label () { Markup = "<b>" + _("Remote Path") + "</b>", Xalign = 0 },
- true, true, 0);
- layout_path.PackStart (PathEntry, true, true, 0);
+ layout_path.PackStart (new Label () {
+ Markup = "<b>" + _("Remote Path") + "</b>",
+ Xalign = 0
+ }, true, true, 0);
+
+ layout_path.PackStart (path_entry, true, true, 0);
layout_fields.PackStart (layout_address);
layout_fields.PackStart (layout_path);
@@ -304,19 +316,19 @@ namespace SparkleShare {
};
// Sync button
- SyncButton = new Button (_("Add"));
+ Button add_button = new Button (_("Add"));
- SyncButton.Clicked += delegate {
- string server = AddressEntry.Text;
- string folder_name = PathEntry.Text;
+ add_button.Clicked += delegate {
+ string server = address_entry.Text;
+ string folder_name = path_entry.Text;
Controller.AddPageCompleted (server, folder_name);
};
AddButton (cancel_button);
- AddButton (SyncButton);
+ AddButton (add_button);
- Controller.CheckAddPage (AddressEntry.Text, PathEntry.Text, tree.SelectedRow);
+ Controller.CheckAddPage (address_entry.Text, path_entry.Text, tree.SelectedRow);
break;
}
@@ -454,16 +466,23 @@ namespace SparkleShare {
if (warnings != null) {
- Image warning_image = new Image (SparkleUIHelpers.GetIcon ("dialog-warning", 24));
+ Image warning_image = new Image (
+ SparkleUIHelpers.GetIcon ("dialog-warning", 24)
+ );
+
Label warning_label = new Label (warnings [0]) {
- Xalign = 0
+ Xalign = 0,
+ Wrap = true
};
HBox warning_layout = new HBox (false, 0);
warning_layout.PackStart (warning_image, false, false, 0);
- warning_layout.PackStart (warning_label, true, true, 0);
+ warning_layout.PackStart (warning_label, true, true, 15);
+
+ VBox warning_wrapper = new VBox (false, 0);
+ warning_wrapper.PackStart (warning_layout, false, false, 0);
- Add (warning_layout);
+ Add (warning_wrapper);
} else {
Add (null);
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index a1ab402..591eb00 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -289,6 +289,9 @@ namespace SparkleShare {
}
+ // TODO: public void WindowClosed () { }
+
+
public void FinishedPageCompleted ()
{
this.previous_address = "";
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index f299641..5778f4a 100755
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -113,6 +113,8 @@ namespace SparkleShare {
case IconState.Error:
+ Animation.Stop ();
+
StateText = _("Not everything is synced");
UpdateStateText ();
CreateMenu ();
@@ -159,8 +161,7 @@ namespace SparkleShare {
else
FrameNumber = 0;
- string icon_name = "process-syncing-sparkleshare-";
-
+ string icon_name = "process-syncing-sparkleshare";
for (int i = 0; i <= FrameNumber; i++)
icon_name += "i";
@@ -168,7 +169,7 @@ namespace SparkleShare {
#if HAVE_APP_INDICATOR
this.indicator.IconName = icon_name;
#else
- this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon (icon_name, 24);
+ this.status_icon.Pixbuf = AnimationFrames [FrameNumber];
#endif
});
};
@@ -260,9 +261,8 @@ namespace SparkleShare {
Menu.Add (new SeparatorMenuItem ());
MenuItem recent_events_item = new MenuItem (_("Open Recent Events"));
-
- if (Program.Controller.Folders.Count < 1)
- recent_events_item.Sensitive = false;
+
+ recent_events_item.Sensitive = (Controller.Folders.Length > 0);
recent_events_item.Activated += delegate {
Application.Invoke (delegate {
diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs
index 30ab040..e322348 100755
--- a/SparkleShare/SparkleStatusIconController.cs
+++ b/SparkleShare/SparkleStatusIconController.cs
@@ -18,6 +18,8 @@
using System;
using System.IO;
+using SparkleLib;
+
namespace SparkleShare {
public enum IconState {
@@ -46,17 +48,18 @@ namespace SparkleShare {
public string FolderSize {
get {
- return Program.Controller.FolderSize;
+ double size = 0;
+
+ foreach (SparkleRepoBase repo in Program.Controller.Repositories)
+ size += repo.Size + repo.HistorySize;
+
+ return Program.Controller.FormatSize (size);
}
}
+
public SparkleStatusIconController ()
{
- Program.Controller.FolderSizeChanged += delegate {
- if (UpdateMenuEvent != null)
- UpdateMenuEvent (CurrentState);
- };
-
Program.Controller.FolderListChanged += delegate {
if (UpdateMenuEvent != null)
UpdateMenuEvent (CurrentState);
diff --git a/SparkleShare/SparkleUIHelpers.cs b/SparkleShare/SparkleUIHelpers.cs
index 2ad40ff..7bcc2eb 100755
--- a/SparkleShare/SparkleUIHelpers.cs
+++ b/SparkleShare/SparkleUIHelpers.cs
@@ -42,10 +42,12 @@ namespace SparkleShare {
IconTheme icon_theme = new IconTheme ();
icon_theme.AppendSearchPath (
- Path.Combine (SparkleUI.AssetsPath, "icons"));
+ Path.Combine (SparkleUI.AssetsPath, "icons")
+ );
icon_theme.AppendSearchPath (
- Path.Combine (SparkleConfig.ConfigPath, "icons"));
+ Path.Combine (SparkleConfig.ConfigPath, "icons")
+ );
try {
return icon_theme.LoadIcon (name, size, IconLookupFlags.GenericFallback);
diff --git a/aclocal.m4 b/aclocal.m4
old mode 100644
new mode 100755
index 533d84d..24776ff
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,12 +13,69 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
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'.])])
+dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
+AC_DEFUN([GNOME_DOC_DEFINES],
+[
+AC_ARG_WITH([help-dir],
+ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
+ [with_help_dir='${datadir}/gnome/help'])
+HELP_DIR="$with_help_dir"
+AC_SUBST(HELP_DIR)
+
+AC_ARG_WITH([omf-dir],
+ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
+ [with_omf_dir='${datadir}/omf'])
+OMF_DIR="$with_omf_dir"
+AC_SUBST(OMF_DIR)
+
+AC_ARG_WITH([help-formats],
+ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
+ [with_help_formats=''])
+DOC_USER_FORMATS="$with_help_formats"
+AC_SUBST(DOC_USER_FORMATS)
+
+AC_ARG_ENABLE([scrollkeeper],
+ [AC_HELP_STRING([--disable-scrollkeeper],
+ [do not make updates to the scrollkeeper database])],,
+ enable_scrollkeeper=yes)
+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
+
+dnl disable scrollkeeper automatically for distcheck
+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+
+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
+])
+
+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+#
+AC_DEFUN([GNOME_DOC_INIT],
+[AC_REQUIRE([AC_PROG_LN_S])dnl
+
+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
+
+AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
+ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
+
+if test "$gdu_cv_have_gdu" = "yes"; then
+ AC_MSG_RESULT([yes])
+ ifelse([$2],,[:],[$2])
+else
+ AC_MSG_RESULT([no])
+ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
+fi
+
+GNOME_DOC_DEFINES
+])
+
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
# serial 40 IT_PROG_INTLTOOL
@@ -213,9 +270,8 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
+# nls.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -233,21 +289,20 @@ dnl Authors:
dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-AC_PREREQ([2.50])
+AC_PREREQ(2.50)
AC_DEFUN([AM_NLS],
[
AC_MSG_CHECKING([whether NLS is requested])
dnl Default is enabled NLS
- AC_ARG_ENABLE([nls],
+ AC_ARG_ENABLE(nls,
[ --disable-nls do not use Native Language Support],
USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT([$USE_NLS])
- AC_SUBST([USE_NLS])
+ AC_MSG_RESULT($USE_NLS)
+ AC_SUBST(USE_NLS)
])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
#
@@ -275,10 +330,7 @@ AC_DEFUN([AM_NLS],
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
@@ -291,6 +343,7 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
+
fi[]dnl
])# PKG_PROG_PKG_CONFIG
@@ -299,20 +352,21 @@ fi[]dnl
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_default([$2], [:])
+ m4_ifval([$2], [$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
+
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -365,7 +419,6 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
@@ -375,7 +428,7 @@ if test $pkg_failed = yes; then
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- m4_default([$4], [AC_MSG_ERROR(
+ ifelse([$4], , [AC_MSG_ERROR(dnl
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -383,24 +436,25 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])[]dnl
- ])
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
- ])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- $3
+ ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES
@@ -1391,7 +1445,6 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([build/m4/gnome-doc-utils.m4])
m4_include([build/m4/shave/shave.m4])
m4_include([build/m4/shamrock/expansions.m4])
m4_include([build/m4/shamrock/gnome-doc.m4])
diff --git a/build/Makefile.in b/build/Makefile.in
old mode 100644
new mode 100755
index 25166a0..dd44fb8
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -34,8 +34,7 @@ POST_UNINSTALL = :
subdir = build
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -114,6 +113,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -146,6 +148,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -169,17 +172,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/build/m4/Makefile.in b/build/m4/Makefile.in
old mode 100644
new mode 100755
index aabd0df..3f96346
--- a/build/m4/Makefile.in
+++ b/build/m4/Makefile.in
@@ -34,8 +34,7 @@ POST_UNINSTALL = :
subdir = build/m4
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -74,6 +73,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -106,6 +108,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -129,17 +132,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/build/m4/gnome-doc-utils.m4 b/build/m4/gnome-doc-utils.m4
deleted file mode 100644
index 3fc25ec..0000000
--- a/build/m4/gnome-doc-utils.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_DEFUN([GNOME_DOC_INIT], [AC_MSG_NOTICE([])])
diff --git a/configure b/configure
index 2bd6373..6154ffd 100755
--- a/configure
+++ b/configure
@@ -1,22 +1,18 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for SparkleShare 0.4.2.
-#
+# Generated by GNU Autoconf 2.63 for SparkleShare 0.6.0.
#
# 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 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -24,15 +20,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
esac
+
fi
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
as_nl='
'
export as_nl
@@ -40,13 +44,7 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -57,7 +55,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in #(
+ case $arg in
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,6 +78,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -89,16 +94,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
IFS=$as_save_IFS
;;
@@ -110,16 +114,12 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
+ { (exit 1); exit 1; }
fi
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
done
PS1='$ '
PS2='> '
@@ -131,305 +131,330 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+$as_unset CDPATH
+
if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
- setopt NO_GLOB_SUBST
+ if (eval ":") 2>/dev/null; then
+ as_have_required=yes
else
- case \`(set -o) 2>/dev/null\` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
+ as_have_required=no
fi
-"
- as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
+
+ if test $as_have_required = yes && (eval ":
+(as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
else
- exitcode=1; echo positional parameters were not saved.
+ exitcode=1
+ echo as_func_ret_success failed.
fi
-test x\$exitcode = x0 || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
- as_have_required=yes
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
else
- as_have_required=no
+ exitcode=1
+ echo positional parameters were not saved.
fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+ as_lineno_1=\$LINENO
+ as_lineno_2=\$LINENO
+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+ :
else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
+ as_candidate_shells=
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- as_found=:
- case $as_dir in #(
+ case $as_dir in
/*)
for as_base in sh bash ksh sh5; do
- # Try only shells that exist, to save several forks.
- as_shell=$as_dir/$as_base
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
- CONFIG_SHELL=$as_shell as_have_required=yes
- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
- break 2
-fi
-fi
+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
done;;
esac
- as_found=false
done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
IFS=$as_save_IFS
- if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
+ for as_shell in $as_candidate_shells $SHELL; do
+ # Try only shells that exist, to save several forks.
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
- else
- $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
- fi
- exit 1
-fi
fi
+
+
+:
+_ASEOF
+}; then
+ CONFIG_SHELL=$as_shell
+ as_have_required=yes
+ if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
+
+:
+(as_func_return () {
+ (exit $1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
}
-as_unset=as_fn_unset
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
+if as_func_ret_success; then
+ :
else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+ :
else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+test $exitcode = 0) || { (exit 1); exit 1; }
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$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
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} # as_fn_error
+(
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
+_ASEOF
+}; then
+ break
+fi
+
+fi
+
+ done
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+ if test $as_have_required = no; then
+ echo This script requires a shell more modern than all the
+ echo shells that I found on your system. Please install a
+ echo modern shell, or manually run the script under such a
+ echo shell if you do have one.
+ { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
else
- as_expr=false
+ exitcode=1
+ echo as_func_success failed.
fi
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
else
- as_basename=false
+ exitcode=1
+ echo as_func_ret_success failed.
fi
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
else
- as_dirname=false
+ exitcode=1
+ echo positional parameters were not saved.
fi
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+test \$exitcode = 0") || {
+ echo No shell found that supports shell functions.
+ echo Please tell bug-autoconf at gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
+}
+
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- as_lineno_1=$LINENO as_lineno_1a=$LINENO
- as_lineno_2=$LINENO as_lineno_2a=$LINENO
- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -446,7 +471,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
@@ -456,18 +482,29 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
exit
}
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
-n*)
- case `echo 'xy\c'` in
+ case `echo 'x\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T=' ';;
+ *) ECHO_C='\c';;
esac;;
*)
ECHO_N='-n';;
esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -497,7 +534,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
+ as_mkdir_p=:
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -516,10 +553,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in #(
+ case $1 in
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -533,11 +570,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
+
+exec 7<&0 </dev/null 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`
@@ -552,14 +589,14 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='SparkleShare'
PACKAGE_TARNAME='sparkleshare'
-PACKAGE_VERSION='0.4.2'
-PACKAGE_STRING='SparkleShare 0.4.2'
+PACKAGE_VERSION='0.6.0'
+PACKAGE_STRING='SparkleShare 0.6.0'
PACKAGE_BUGREPORT=''
-PACKAGE_URL=''
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
@@ -625,12 +662,15 @@ MONO_MODULE_LIBS
MONO_MODULE_CFLAGS
HAVE_GNOME_DOC_UTILS_FALSE
HAVE_GNOME_DOC_UTILS_TRUE
+DISTCHECK_CONFIGURE_FLAGS
+DOC_USER_FORMATS
+OMF_DIR
+HELP_DIR
+LN_S
ENABLE_SK_FALSE
ENABLE_SK_TRUE
GNOME_DOC_UTILS_LIBS
GNOME_DOC_UTILS_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
expanded_datadir
expanded_bindir
expanded_libdir
@@ -740,7 +780,6 @@ bindir
program_transform_name
prefix
exec_prefix
-PACKAGE_URL
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
@@ -755,6 +794,10 @@ enable_maintainer_mode
enable_nls
enable_dependency_tracking
enable_user_help
+with_help_dir
+with_omf_dir
+with_help_formats
+enable_scrollkeeper
enable_debug
enable_release
enable_gtkui
@@ -772,11 +815,8 @@ LDFLAGS
LIBS
CPPFLAGS
PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
GNOME_DOC_UTILS_CFLAGS
GNOME_DOC_UTILS_LIBS
-GNOME_DOC_UTILS_LIBS
MONO_MODULE_CFLAGS
MONO_MODULE_LIBS
NOTIFY_SHARP_CFLAGS
@@ -791,14 +831,10 @@ GTKSHARP_A11Y_CFLAGS
GTKSHARP_A11Y_LIBS
WEBKIT_SHARP_CFLAGS
WEBKIT_SHARP_LIBS
-NOTIFY_SHARP_CFLAGS
-NOTIFY_SHARP_LIBS
APP_INDICATOR_CFLAGS
APP_INDICATOR_LIBS
NUNIT_CFLAGS
NUNIT_LIBS
-NUNIT_CFLAGS
-NUNIT_LIBS
NAUTILUS_PYTHON_CFLAGS
NAUTILUS_PYTHON_LIBS
NAUTILUS3_PYTHON_CFLAGS
@@ -865,9 +901,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.
@@ -912,7 +947,8 @@ 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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ { (exit 1); exit 1; }; }
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -938,7 +974,8 @@ 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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ { (exit 1); exit 1; }; }
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1142,7 +1179,8 @@ 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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ { (exit 1); exit 1; }; }
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1158,7 +1196,8 @@ 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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ { (exit 1); exit 1; }; }
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1188,17 +1227,17 @@ 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_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# 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'" ;;
- esac
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1207,7 +1246,7 @@ Try \`$0 --help' for more information"
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
esac
@@ -1215,13 +1254,15 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+ { (exit 1); exit 1; }; }
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_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+ { (exit 1); exit 1; }; } ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1244,7 +1285,8 @@ 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_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; }
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1258,8 +1300,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
@@ -1274,9 +1316,11 @@ 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_echo "$as_me: error: working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+ { (exit 1); exit 1; }; }
# Find the source files, if location was not specified.
@@ -1315,11 +1359,13 @@ 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_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { (exit 1); exit 1; }; }
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_echo "$as_me: error: $ac_msg" >&2
+ { (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1345,7 +1391,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 SparkleShare 0.4.2 to adapt to many kinds of systems.
+\`configure' configures SparkleShare 0.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1359,7 +1405,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
@@ -1411,7 +1457,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of SparkleShare 0.4.2:";;
+ short | recursive ) echo "Configuration of SparkleShare 0.6.0:";;
esac
cat <<\_ACEOF
@@ -1424,16 +1470,25 @@ Optional Features:
--disable-nls do not use Native Language Support
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
- --enable-user-help Enable building the user-help [[default=auto]]
- --enable-debug Use 'DEBUG' Configuration [default=YES]
- --enable-release Use 'RELEASE' Configuration [default=NO]
+ --enable-user-help Enable building the user-help [default=auto]
+ --disable-scrollkeeper do not make updates to the scrollkeeper database
+ --enable-debug Use 'DEBUG' Configuration default=YES
+ --enable-release Use 'RELEASE' Configuration default=NO
--disable-gtkui Do not build the Gtk+ user interface
--enable-appindicator=[no/auto/yes]
Build support for application indicators
--enable-tests Enable NUnit tests
--disable-nautilus-extension
Do not install the Nautilus plugin
- --enable-shave use shave to make the build pretty [[default=yes]]
+ --enable-shave use shave to make the build pretty [default=yes]
+
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-help-dir=DIR path to help docs
+ --with-omf-dir=DIR path to OMF files
+ --with-help-formats=FORMATS
+ list of formats
Some influential environment variables:
CC C compiler command
@@ -1441,13 +1496,9 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
PKG_CONFIG path to pkg-config utility
- PKG_CONFIG_PATH
- directories to add to pkg-config's search path
- PKG_CONFIG_LIBDIR
- path overriding pkg-config's built-in search path
GNOME_DOC_UTILS_CFLAGS
C compiler flags for GNOME_DOC_UTILS, overriding pkg-config
GNOME_DOC_UTILS_LIBS
@@ -1499,7 +1550,6 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to the package provider.
_ACEOF
ac_status=$?
fi
@@ -1562,176 +1612,22 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-SparkleShare configure 0.4.2
-generated by GNU Autoconf 2.68
+SparkleShare configure 0.6.0
+generated by GNU Autoconf 2.63
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
exit
fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
- if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by SparkleShare $as_me 0.4.2, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by SparkleShare $as_me 0.6.0, which was
+generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1767,8 +1663,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
- done
+ $as_echo "PATH: $as_dir"
+done
IFS=$as_save_IFS
} >&5
@@ -1805,9 +1701,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
2)
- as_fn_append ac_configure_args1 " '$ac_arg'"
+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1823,13 +1719,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- as_fn_append ac_configure_args " '$ac_arg'"
+ ac_configure_args="$ac_configure_args '$ac_arg'"
;;
esac
done
done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -1841,9 +1737,11 @@ trap 'exit_status=$?
{
echo
- $as_echo "## ---------------- ##
+ cat <<\_ASBOX
+## ---------------- ##
## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -1852,13 +1750,13 @@ trap 'exit_status=$?
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
+ *) $as_unset $ac_var ;;
esac ;;
esac
done
@@ -1877,9 +1775,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
@@ -1892,9 +1792,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
@@ -1908,9 +1810,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
@@ -1924,39 +1828,37 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
-$as_echo "/* confdefs.h */" > confdefs.h
-
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
@@ -1965,12 +1867,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
@@ -1981,23 +1878,19 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ if test -r "$ac_site_file"; then
+ { $as_echo "$as_me:$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
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special files
- # actually), so we avoid doing that. DJGPP emulates it as a regular file.
- if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+ if test -f "$cache_file"; then
+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -2005,7 +1898,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -2020,11 +1913,11 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
@@ -2034,17 +1927,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
@@ -2056,20 +1949,43 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$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:$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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -2097,7 +2013,9 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
fi
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_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { (exit 1); exit 1; }; }
fi
# These three variables are undocumented and unsupported,
@@ -2123,10 +2041,10 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2134,11 +2052,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
- ./ | .// | /[cC]/* | \
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2175,7 +2093,7 @@ case $as_dir/ in #((
;;
esac
- done
+done
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
@@ -2191,7 +2109,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2202,7 +2120,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
@@ -2213,11 +2131,15 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+ { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+ { (exit 1); exit 1; }; };;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+ { (exit 1); exit 1; }; };;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2239,8 +2161,11 @@ 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
-alias in your environment" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&5
+$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&2;}
+ { (exit 1); exit 1; }; }
fi
test "$2" = conftest.file
@@ -2249,10 +2174,13 @@ then
# Ok.
:
else
- as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+$as_echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -2280,7 +2208,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -2301,9 +2229,9 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -2314,24 +2242,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
$as_echo "$STRIP" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2341,9 +2269,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -2354,24 +2282,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
$as_echo "$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2380,7 +2308,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -2393,10 +2321,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if ${ac_cv_path_mkdir+:} false; then :
+ if test "${ac_cv_path_mkdir+set}" = set; then
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2404,7 +2332,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
+ for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -2416,12 +2344,11 @@ do
esac
done
done
- done
+done
IFS=$as_save_IFS
fi
- test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -2429,10 +2356,11 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
@@ -2445,9 +2373,9 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -2458,24 +2386,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
$as_echo "$AWK" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2483,11 +2411,11 @@ fi
test -n "$AWK" && break
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; 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
@@ -2495,7 +2423,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;;
@@ -2505,11 +2433,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2529,7 +2457,9 @@ 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_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exit 1; }; }
fi
fi
@@ -2545,7 +2475,7 @@ fi
# Define the identity of the package.
PACKAGE='sparkleshare'
- VERSION='0.4.2'
+ VERSION='0.6.0'
cat >>confdefs.h <<_ACEOF
@@ -2580,7 +2510,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
AMTAR=${AMTAR-"${am_missing_run}tar"}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
@@ -2653,13 +2583,13 @@ do
done
rm -rf conftest.dir
-if ${am_cv_prog_tar_ustar+:} false; then :
+if test "${am_cv_prog_tar_ustar+set}" = set; then
$as_echo_n "(cached) " >&6
else
am_cv_prog_tar_ustar=$_am_tool
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
$as_echo "$am_cv_prog_tar_ustar" >&6; }
@@ -2667,16 +2597,16 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
+if test "${enable_maintainer_mode+set}" = set; then
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
USE_MAINTAINER_MODE=no
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+ { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
@@ -2690,14 +2620,14 @@ fi
-ASM_VERSION=0.4.2
+ASM_VERSION=0.6.0
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -2710,14 +2640,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -2726,32 +2656,34 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
$as_echo "$PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$PKG_CONFIG" = "xno"; then
- as_fn_error $? "You need to install pkg-config" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: You need to install pkg-config" >&5
+$as_echo "$as_me: error: You need to install pkg-config" >&2;}
+ { (exit 1); exit 1; }; }
fi
ACLOCAL_AMFLAGS="-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+ { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
$as_echo_n "checking whether NLS is requested... " >&6; }
# Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
+if test "${enable_nls+set}" = set; then
enableval=$enable_nls; USE_NLS=$enableval
else
USE_NLS=yes
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+ { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
$as_echo "$USE_NLS" >&6; }
@@ -2767,7 +2699,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
@@ -2795,12 +2727,12 @@ if test "$am__include" = "#"; then
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
+if test "${enable_dependency_tracking+set}" = set; then
enableval=$enable_dependency_tracking;
fi
@@ -2825,9 +2757,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -2838,24 +2770,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2865,9 +2797,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -2878,24 +2810,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2904,7 +2836,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -2918,9 +2850,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -2931,24 +2863,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2958,9 +2890,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -2972,18 +2904,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -3002,10 +2934,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3017,9 +2949,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3030,24 +2962,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3061,9 +2993,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3074,24 +3006,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3104,7 +3036,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3115,37 +3047,57 @@ fi
fi
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
+{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -3161,8 +3113,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -3178,17 +3130,17 @@ do
done
rm -f $ac_rmfiles
-if { { ac_try="$ac_link_default"
+if { (ac_try="$ac_link_default"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -3205,7 +3157,7 @@ do
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -3224,41 +3176,84 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
else
ac_file=''
fi
-if test -z "$ac_file"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+ if { ac_try='./$ac_file'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "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; }
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+ fi
+ fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3273,83 +3268,32 @@ for ac_file in conftest.exe conftest conftest.*; do
esac
done
else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
- { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if { ac_try='./conftest$ac_cv_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- 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.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -3361,17 +3305,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
@@ -3384,23 +3328,31 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
fi
+
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -3414,16 +3366,37 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- ac_compiler_gnu=no
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
@@ -3432,16 +3405,20 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -3452,11 +3429,35 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -3467,12 +3468,36 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
else
- ac_c_werror_flag=$ac_save_c_werror_flag
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -3483,17 +3508,42 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -3510,14 +3560,18 @@ else
CFLAGS=
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -3574,9 +3628,32 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
fi
+
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -3587,19 +3664,17 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
$as_echo "none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3609,9 +3684,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3719,7 +3794,7 @@ else
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -3739,31 +3814,35 @@ fi
case "$am__api_version" in
1.01234)
- as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+ { (exit 1); exit 1; }; }
;;
*)
;;
esac
if test -n "0.40.6"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.6" >&5
+ { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.6" >&5
$as_echo_n "checking for intltool >= 0.40.6... " >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.6 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ { $as_echo "$as_me:$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.40.6 or later." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.6 or later." >&5
+$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.6 or later." >&2;}
+ { (exit 1); exit 1; }; }
fi
# Extract the first word of "intltool-update", so it can be a program name with args.
set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
@@ -3776,14 +3855,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -3791,19 +3870,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
$as_echo "$INTLTOOL_UPDATE" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "intltool-merge", so it can be a program name with args.
set dummy intltool-merge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
@@ -3816,14 +3895,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -3831,19 +3910,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
$as_echo "$INTLTOOL_MERGE" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "intltool-extract", so it can be a program name with args.
set dummy intltool-extract; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
@@ -3856,14 +3935,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -3871,16 +3950,18 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
$as_echo "$INTLTOOL_EXTRACT" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
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_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+ { (exit 1); exit 1; }; }
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 $< $@'
@@ -4002,9 +4083,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
@@ -4017,14 +4098,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -4032,19 +4113,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
$as_echo "$XGETTEXT" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
@@ -4057,14 +4138,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -4072,19 +4153,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+ { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
$as_echo "$MSGMERGE" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
+if test "${ac_cv_path_MSGFMT+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
@@ -4097,14 +4178,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -4112,19 +4193,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
$as_echo "$MSGFMT" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
+if test "${ac_cv_path_GMSGFMT+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
@@ -4137,14 +4218,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -4153,29 +4234,33 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
$as_echo "$GMSGFMT" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
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_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
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_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
@@ -4188,14 +4273,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -4203,35 +4288,41 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
$as_echo "$INTLTOOL_PERL" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test -z "$INTLTOOL_PERL"; then
- as_fn_error $? "perl not found" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+$as_echo "$as_me: error: perl not found" >&2;}
+ { (exit 1); exit 1; }; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+{ $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
else
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
$as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+ { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
$as_echo_n "checking for XML::Parser... " >&6; }
if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ { $as_echo "$as_me:$LINENO: result: ok" >&5
$as_echo "ok" >&6; }
else
- as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
fi
fi
@@ -4241,7 +4332,11 @@ fi
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -4253,13 +4348,120 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
DATADIRNAME=share
else
- case $host in
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ case $host in
*-*-solaris*)
- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+ { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char bind_textdomain_codeset (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef bind_textdomain_codeset
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bind_textdomain_codeset ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+choke me
+#endif
+
+int
+main ()
+{
+return bind_textdomain_codeset ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_bind_textdomain_codeset=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_bind_textdomain_codeset=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
DATADIRNAME=share
else
DATADIRNAME=lib
@@ -4271,8 +4473,10 @@ fi
;;
esac
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
@@ -4334,17 +4538,13 @@ _ACEOF
-
-
-
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -4357,14 +4557,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -4372,10 +4572,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
$as_echo "$PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4385,9 +4585,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -4400,14 +4600,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
;;
@@ -4415,10 +4615,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4427,7 +4627,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -4440,20 +4640,32 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+ { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
+
fi
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
# Check whether --enable-user-help was given.
-if test "${enable_user_help+set}" = set; then :
+if test "${enable_user_help+set}" = set; then
enableval=$enable_user_help;
else
enable_user_help=auto
@@ -4463,18 +4675,18 @@ fi
if test "x$enable_user_help" = "xauto"; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_DOC_UTILS" >&5
+{ $as_echo "$as_me:$LINENO: checking for GNOME_DOC_UTILS" >&5
$as_echo_n "checking for GNOME_DOC_UTILS... " >&6; }
if test -n "$GNOME_DOC_UTILS_CFLAGS"; then
pkg_cv_GNOME_DOC_UTILS_CFLAGS="$GNOME_DOC_UTILS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\"") >&5
($PKG_CONFIG --exists --print-errors "gnome-doc-utils") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GNOME_DOC_UTILS_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils" 2>/dev/null`
else
pkg_failed=yes
@@ -4486,11 +4698,11 @@ if test -n "$GNOME_DOC_UTILS_LIBS"; then
pkg_cv_GNOME_DOC_UTILS_LIBS="$GNOME_DOC_UTILS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\"") >&5
($PKG_CONFIG --exists --print-errors "gnome-doc-utils") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GNOME_DOC_UTILS_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils" 2>/dev/null`
else
pkg_failed=yes
@@ -4502,8 +4714,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -4518,33 +4728,33 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_DOC_UTILS_PKG_ERRORS" >&5
- enable_user_help=no
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ enable_user_help=no
+elif test $pkg_failed = untried; then
enable_user_help=no
else
GNOME_DOC_UTILS_CFLAGS=$pkg_cv_GNOME_DOC_UTILS_CFLAGS
GNOME_DOC_UTILS_LIBS=$pkg_cv_GNOME_DOC_UTILS_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
enable_user_help=yes
fi
elif test "x$enable_user_help" = "xyes"; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_DOC_UTILS" >&5
+{ $as_echo "$as_me:$LINENO: checking for GNOME_DOC_UTILS" >&5
$as_echo_n "checking for GNOME_DOC_UTILS... " >&6; }
if test -n "$GNOME_DOC_UTILS_CFLAGS"; then
pkg_cv_GNOME_DOC_UTILS_CFLAGS="$GNOME_DOC_UTILS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\"") >&5
($PKG_CONFIG --exists --print-errors "gnome-doc-utils") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GNOME_DOC_UTILS_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils" 2>/dev/null`
else
pkg_failed=yes
@@ -4556,11 +4766,11 @@ if test -n "$GNOME_DOC_UTILS_LIBS"; then
pkg_cv_GNOME_DOC_UTILS_LIBS="$GNOME_DOC_UTILS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils\"") >&5
($PKG_CONFIG --exists --print-errors "gnome-doc-utils") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GNOME_DOC_UTILS_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils" 2>/dev/null`
else
pkg_failed=yes
@@ -4572,8 +4782,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -4588,7 +4796,18 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_DOC_UTILS_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gnome-doc-utils) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-doc-utils) were not met:
+
+$GNOME_DOC_UTILS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GNOME_DOC_UTILS_CFLAGS
+and GNOME_DOC_UTILS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (gnome-doc-utils) were not met:
$GNOME_DOC_UTILS_PKG_ERRORS
@@ -4597,13 +4816,23 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GNOME_DOC_UTILS_CFLAGS
and GNOME_DOC_UTILS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$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
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GNOME_DOC_UTILS_CFLAGS
+and GNOME_DOC_UTILS_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." >&5
+$as_echo "$as_me: 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.
@@ -4612,13 +4841,14 @@ and GNOME_DOC_UTILS_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." >&2;}
+ { (exit 1); exit 1; }; }; }
else
GNOME_DOC_UTILS_CFLAGS=$pkg_cv_GNOME_DOC_UTILS_CFLAGS
GNOME_DOC_UTILS_LIBS=$pkg_cv_GNOME_DOC_UTILS_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
-
+ :
fi
fi
@@ -4633,8 +4863,95 @@ else
fi
if test "x$enable_user_help" = "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
-$as_echo "$as_me: " >&6;}
+
+gdu_cv_version_required=0.17.3
+
+{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ gdu_cv_have_gdu=yes
+else
+ gdu_cv_have_gdu=no
+fi
+
+if test "$gdu_cv_have_gdu" = "yes"; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ enable_user_help=yes
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ enable_user_help=no
+fi
+
+
+
+# Check whether --with-help-dir was given.
+if test "${with_help_dir+set}" = set; then
+ withval=$with_help_dir;
+else
+ with_help_dir='${datadir}/gnome/help'
+fi
+
+HELP_DIR="$with_help_dir"
+
+
+
+# Check whether --with-omf-dir was given.
+if test "${with_omf_dir+set}" = set; then
+ withval=$with_omf_dir;
+else
+ with_omf_dir='${datadir}/omf'
+fi
+
+OMF_DIR="$with_omf_dir"
+
+
+
+# Check whether --with-help-formats was given.
+if test "${with_help_formats+set}" = set; then
+ withval=$with_help_formats;
+else
+ with_help_formats=''
+fi
+
+DOC_USER_FORMATS="$with_help_formats"
+
+
+# Check whether --enable-scrollkeeper was given.
+if test "${enable_scrollkeeper+set}" = set; then
+ enableval=$enable_scrollkeeper;
+else
+ enable_scrollkeeper=yes
+fi
+
+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+ ENABLE_SK_TRUE=
+ ENABLE_SK_FALSE='#'
+else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+fi
+
+
+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+ if test "$gdu_cv_have_gdu" = "yes"; then
+ HAVE_GNOME_DOC_UTILS_TRUE=
+ HAVE_GNOME_DOC_UTILS_FALSE='#'
+else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+fi
+
+
+
fi
if test "x$enable_user_help" = "xyes"; then
@@ -4647,24 +4964,116 @@ fi
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+
+done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MONO_MODULE" >&5
+{ $as_echo "$as_me:$LINENO: checking for MONO_MODULE" >&5
$as_echo_n "checking for MONO_MODULE... " >&6; }
if test -n "$MONO_MODULE_CFLAGS"; then
pkg_cv_MONO_MODULE_CFLAGS="$MONO_MODULE_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.2\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= 2.2\"") >&5
($PKG_CONFIG --exists --print-errors "mono >= 2.2") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_MONO_MODULE_CFLAGS=`$PKG_CONFIG --cflags "mono >= 2.2" 2>/dev/null`
else
pkg_failed=yes
@@ -4676,11 +5085,11 @@ if test -n "$MONO_MODULE_LIBS"; then
pkg_cv_MONO_MODULE_LIBS="$MONO_MODULE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.2\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= 2.2\"") >&5
($PKG_CONFIG --exists --print-errors "mono >= 2.2") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_MONO_MODULE_LIBS=`$PKG_CONFIG --libs "mono >= 2.2" 2>/dev/null`
else
pkg_failed=yes
@@ -4692,8 +5101,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -4708,7 +5115,18 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$MONO_MODULE_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (mono >= 2.2) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (mono >= 2.2) were not met:
+
+$MONO_MODULE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables MONO_MODULE_CFLAGS
+and MONO_MODULE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (mono >= 2.2) were not met:
$MONO_MODULE_PKG_ERRORS
@@ -4717,13 +5135,23 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables MONO_MODULE_CFLAGS
and MONO_MODULE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables MONO_MODULE_CFLAGS
+and MONO_MODULE_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." >&5
+$as_echo "$as_me: 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.
@@ -4732,13 +5160,14 @@ and MONO_MODULE_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." >&2;}
+ { (exit 1); exit 1; }; }; }
else
MONO_MODULE_CFLAGS=$pkg_cv_MONO_MODULE_CFLAGS
MONO_MODULE_LIBS=$pkg_cv_MONO_MODULE_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
-
+ :
fi
@@ -4747,9 +5176,9 @@ fi
# Extract the first word of "mono", so it can be a program name with args.
set dummy mono; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MONO+:} false; then :
+if test "${ac_cv_path_MONO+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $MONO in
@@ -4762,14 +5191,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MONO="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_path_MONO" && ac_cv_path_MONO="no"
@@ -4778,10 +5207,10 @@ esac
fi
MONO=$ac_cv_path_MONO
if test -n "$MONO"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MONO" >&5
+ { $as_echo "$as_me:$LINENO: result: $MONO" >&5
$as_echo "$MONO" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4789,25 +5218,27 @@ fi
if test "x$MONO" = "xno"; then
- as_fn_error $? "You need to install 'mono'" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: You need to install 'mono'" >&5
+$as_echo "$as_me: error: You need to install 'mono'" >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.8\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= 2.8\"") >&5
($PKG_CONFIG --exists --print-errors "mono >= 2.8") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
# Extract the first word of "dmcs", so it can be a program name with args.
set dummy dmcs; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
+if test "${ac_cv_path_MCS+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $MCS in
@@ -4820,14 +5251,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_path_MCS" && ac_cv_path_MCS="no"
@@ -4836,10 +5267,10 @@ esac
fi
MCS=$ac_cv_path_MCS
if test -n "$MCS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
+ { $as_echo "$as_me:$LINENO: result: $MCS" >&5
$as_echo "$MCS" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4847,7 +5278,9 @@ fi
if test "x$MCS" = "xno"; then
- as_fn_error $? "You need to install 'dmcs'" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: You need to install 'dmcs'" >&5
+$as_echo "$as_me: error: You need to install 'dmcs'" >&2;}
+ { (exit 1); exit 1; }; }
fi
@@ -4858,18 +5291,20 @@ fi
Mono.Posix
" | cut -d, -f3- | sed 's/\,/ /g')
do
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mono 4.0 GAC for $asm.dll" >&5
+ { $as_echo "$as_me:$LINENO: checking for Mono 4.0 GAC for $asm.dll" >&5
$as_echo_n "checking for Mono 4.0 GAC for $asm.dll... " >&6; }
if test \
-e "$($PKG_CONFIG --variable=libdir mono)/mono/4.0/$asm.dll" -o \
-e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/4.0/$asm.dll"; \
then \
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ { $as_echo "$as_me:$LINENO: result: found" >&5
$as_echo "found" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+ { $as_echo "$as_me:$LINENO: result: not found" >&5
$as_echo "not found" >&6; }
- as_fn_error $? "missing required Mono 4.0 assembly: $asm.dll" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: missing required Mono 4.0 assembly: $asm.dll" >&5
+$as_echo "$as_me: error: missing required Mono 4.0 assembly: $asm.dll" >&2;}
+ { (exit 1); exit 1; }; }
fi
done
@@ -4880,9 +5315,9 @@ else
# Extract the first word of "gmcs", so it can be a program name with args.
set dummy gmcs; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
+if test "${ac_cv_path_MCS+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $MCS in
@@ -4895,14 +5330,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_path_MCS" && ac_cv_path_MCS="no"
@@ -4911,10 +5346,10 @@ esac
fi
MCS=$ac_cv_path_MCS
if test -n "$MCS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
+ { $as_echo "$as_me:$LINENO: result: $MCS" >&5
$as_echo "$MCS" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4922,7 +5357,9 @@ fi
if test "x$MCS" = "xno"; then
- as_fn_error $? "You need to install 'gmcs'" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: You need to install 'gmcs'" >&5
+$as_echo "$as_me: error: You need to install 'gmcs'" >&2;}
+ { (exit 1); exit 1; }; }
fi
@@ -4933,18 +5370,20 @@ fi
Mono.Posix
" | cut -d, -f3- | sed 's/\,/ /g')
do
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mono 2.0 GAC for $asm.dll" >&5
+ { $as_echo "$as_me:$LINENO: checking for Mono 2.0 GAC for $asm.dll" >&5
$as_echo_n "checking for Mono 2.0 GAC for $asm.dll... " >&6; }
if test \
-e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/$asm.dll" -o \
-e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/$asm.dll"; \
then \
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ { $as_echo "$as_me:$LINENO: result: found" >&5
$as_echo "found" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+ { $as_echo "$as_me:$LINENO: result: not found" >&5
$as_echo "not found" >&6; }
- as_fn_error $? "missing required Mono 2.0 assembly: $asm.dll" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: missing required Mono 2.0 assembly: $asm.dll" >&5
+$as_echo "$as_me: error: missing required Mono 2.0 assembly: $asm.dll" >&2;}
+ { (exit 1); exit 1; }; }
fi
done
@@ -4954,18 +5393,18 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY_SHARP" >&5
+{ $as_echo "$as_me:$LINENO: checking for NOTIFY_SHARP" >&5
$as_echo_n "checking for NOTIFY_SHARP... " >&6; }
if test -n "$NOTIFY_SHARP_CFLAGS"; then
pkg_cv_NOTIFY_SHARP_CFLAGS="$NOTIFY_SHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-sharp\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"notify-sharp\"") >&5
($PKG_CONFIG --exists --print-errors "notify-sharp") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NOTIFY_SHARP_CFLAGS=`$PKG_CONFIG --cflags "notify-sharp" 2>/dev/null`
else
pkg_failed=yes
@@ -4977,11 +5416,11 @@ if test -n "$NOTIFY_SHARP_LIBS"; then
pkg_cv_NOTIFY_SHARP_LIBS="$NOTIFY_SHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-sharp\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"notify-sharp\"") >&5
($PKG_CONFIG --exists --print-errors "notify-sharp") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NOTIFY_SHARP_LIBS=`$PKG_CONFIG --libs "notify-sharp" 2>/dev/null`
else
pkg_failed=yes
@@ -4993,8 +5432,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5009,15 +5446,15 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NOTIFY_SHARP_PKG_ERRORS" >&5
- have_notify_sharp=no
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ have_notify_sharp=no
+elif test $pkg_failed = untried; then
have_notify_sharp=no
else
NOTIFY_SHARP_CFLAGS=$pkg_cv_NOTIFY_SHARP_CFLAGS
NOTIFY_SHARP_LIBS=$pkg_cv_NOTIFY_SHARP_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
have_notify_sharp=yes
fi
@@ -5040,13 +5477,13 @@ else
EXTERNAL_NOTIFY_SHARP_FALSE=
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
+if test "${enable_debug+set}" = set; then
enableval=$enable_debug; enable_debug=yes
else
enable_debug=no
@@ -5064,7 +5501,7 @@ if test "x$enable_debug" = "xyes" ; then
CONFIG_REQUESTED="yes"
fi
# Check whether --enable-release was given.
-if test "${enable_release+set}" = set; then :
+if test "${enable_release+set}" = set; then
enableval=$enable_release; enable_release=yes
else
enable_release=no
@@ -5105,18 +5542,18 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSHARP" >&5
+{ $as_echo "$as_me:$LINENO: checking for GTKSHARP" >&5
$as_echo_n "checking for GTKSHARP... " >&6; }
if test -n "$GTKSHARP_CFLAGS"; then
pkg_cv_GTKSHARP_CFLAGS="$GTKSHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GTKSHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -5128,11 +5565,11 @@ if test -n "$GTKSHARP_LIBS"; then
pkg_cv_GTKSHARP_LIBS="$GTKSHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GTKSHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -5144,8 +5581,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5160,7 +5595,18 @@ 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 >= $GTKSHARP_REQUIRED) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk-sharp-2.0 >= $GTKSHARP_REQUIRED) were not met:
+
+$GTKSHARP_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTKSHARP_CFLAGS
+and GTKSHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (gtk-sharp-2.0 >= $GTKSHARP_REQUIRED) were not met:
$GTKSHARP_PKG_ERRORS
@@ -5169,13 +5615,13 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GTKSHARP_CFLAGS
and GTKSHARP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -5184,30 +5630,41 @@ 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." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTKSHARP_CFLAGS
+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." >&2;}
+ { (exit 1); exit 1; }; }; }
else
GTKSHARP_CFLAGS=$pkg_cv_GTKSHARP_CFLAGS
GTKSHARP_LIBS=$pkg_cv_GTKSHARP_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
-
+ :
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIBSHARP" >&5
+{ $as_echo "$as_me:$LINENO: checking for GLIBSHARP" >&5
$as_echo_n "checking for GLIBSHARP... " >&6; }
if test -n "$GLIBSHARP_CFLAGS"; then
pkg_cv_GLIBSHARP_CFLAGS="$GLIBSHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= \$GTKSHARP_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= \$GTKSHARP_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "glib-sharp-2.0 >= $GTKSHARP_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GLIBSHARP_CFLAGS=`$PKG_CONFIG --cflags "glib-sharp-2.0 >= $GTKSHARP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -5219,11 +5676,11 @@ if test -n "$GLIBSHARP_LIBS"; then
pkg_cv_GLIBSHARP_LIBS="$GLIBSHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= \$GTKSHARP_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= \$GTKSHARP_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "glib-sharp-2.0 >= $GTKSHARP_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GLIBSHARP_LIBS=`$PKG_CONFIG --libs "glib-sharp-2.0 >= $GTKSHARP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -5235,8 +5692,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5251,7 +5706,18 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GLIBSHARP_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (glib-sharp-2.0 >= $GTKSHARP_REQUIRED) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-sharp-2.0 >= $GTKSHARP_REQUIRED) were not met:
+
+$GLIBSHARP_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
+and GLIBSHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (glib-sharp-2.0 >= $GTKSHARP_REQUIRED) were not met:
$GLIBSHARP_PKG_ERRORS
@@ -5260,13 +5726,23 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
and GLIBSHARP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
+and GLIBSHARP_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." >&5
+$as_echo "$as_me: 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.
@@ -5275,30 +5751,31 @@ and GLIBSHARP_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." >&2;}
+ { (exit 1); exit 1; }; }; }
else
GLIBSHARP_CFLAGS=$pkg_cv_GLIBSHARP_CFLAGS
GLIBSHARP_LIBS=$pkg_cv_GLIBSHARP_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
-
+ :
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIBSHARP_2_12_7" >&5
+{ $as_echo "$as_me:$LINENO: checking for GLIBSHARP_2_12_7" >&5
$as_echo_n "checking for GLIBSHARP_2_12_7... " >&6; }
if test -n "$GLIBSHARP_2_12_7_CFLAGS"; then
pkg_cv_GLIBSHARP_2_12_7_CFLAGS="$GLIBSHARP_2_12_7_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= 2.12.7\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= 2.12.7\"") >&5
($PKG_CONFIG --exists --print-errors "glib-sharp-2.0 >= 2.12.7") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GLIBSHARP_2_12_7_CFLAGS=`$PKG_CONFIG --cflags "glib-sharp-2.0 >= 2.12.7" 2>/dev/null`
else
pkg_failed=yes
@@ -5310,11 +5787,11 @@ if test -n "$GLIBSHARP_2_12_7_LIBS"; then
pkg_cv_GLIBSHARP_2_12_7_LIBS="$GLIBSHARP_2_12_7_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= 2.12.7\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= 2.12.7\"") >&5
($PKG_CONFIG --exists --print-errors "glib-sharp-2.0 >= 2.12.7") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GLIBSHARP_2_12_7_LIBS=`$PKG_CONFIG --libs "glib-sharp-2.0 >= 2.12.7" 2>/dev/null`
else
pkg_failed=yes
@@ -5326,8 +5803,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5342,15 +5817,15 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GLIBSHARP_2_12_7_PKG_ERRORS" >&5
- HAVE_GLIBSHARP_2_12_7=no
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ HAVE_GLIBSHARP_2_12_7=no
+elif test $pkg_failed = untried; then
HAVE_GLIBSHARP_2_12_7=no
else
GLIBSHARP_2_12_7_CFLAGS=$pkg_cv_GLIBSHARP_2_12_7_CFLAGS
GLIBSHARP_2_12_7_LIBS=$pkg_cv_GLIBSHARP_2_12_7_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
HAVE_GLIBSHARP_2_12_7=yes
fi
@@ -5365,18 +5840,18 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSHARP_A11Y" >&5
+{ $as_echo "$as_me:$LINENO: checking for GTKSHARP_A11Y" >&5
$as_echo_n "checking for GTKSHARP_A11Y... " >&6; }
if test -n "$GTKSHARP_A11Y_CFLAGS"; then
pkg_cv_GTKSHARP_A11Y_CFLAGS="$GTKSHARP_A11Y_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= 2.12.10\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= 2.12.10\"") >&5
($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= 2.12.10") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GTKSHARP_A11Y_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 >= 2.12.10" 2>/dev/null`
else
pkg_failed=yes
@@ -5388,11 +5863,11 @@ if test -n "$GTKSHARP_A11Y_LIBS"; then
pkg_cv_GTKSHARP_A11Y_LIBS="$GTKSHARP_A11Y_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= 2.12.10\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= 2.12.10\"") >&5
($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= 2.12.10") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_GTKSHARP_A11Y_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 >= 2.12.10" 2>/dev/null`
else
pkg_failed=yes
@@ -5404,8 +5879,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5420,15 +5893,15 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GTKSHARP_A11Y_PKG_ERRORS" >&5
- gtksharp_with_a11y=no
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ gtksharp_with_a11y=no
+elif test $pkg_failed = untried; then
gtksharp_with_a11y=no
else
GTKSHARP_A11Y_CFLAGS=$pkg_cv_GTKSHARP_A11Y_CFLAGS
GTKSHARP_A11Y_LIBS=$pkg_cv_GTKSHARP_A11Y_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
gtksharp_with_a11y=yes
fi
@@ -5444,7 +5917,7 @@ fi
# Check whether --enable-gtkui was given.
-if test "${enable_gtkui+set}" = set; then :
+if test "${enable_gtkui+set}" = set; then
enableval=$enable_gtkui; enable_gtkui=no
else
enable_gtkui=yes
@@ -5452,7 +5925,7 @@ fi
# Check whether --enable-appindicator was given.
-if test "${enable_appindicator+set}" = set; then :
+if test "${enable_appindicator+set}" = set; then
enableval=$enable_appindicator; enable_appindicator=$enableval
else
enable_appindicator="auto"
@@ -5470,18 +5943,18 @@ fi
if test "x$enable_gtkui" = "xyes" ; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT_SHARP" >&5
+{ $as_echo "$as_me:$LINENO: checking for WEBKIT_SHARP" >&5
$as_echo_n "checking for WEBKIT_SHARP... " >&6; }
if test -n "$WEBKIT_SHARP_CFLAGS"; then
pkg_cv_WEBKIT_SHARP_CFLAGS="$WEBKIT_SHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-sharp-1.0\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"webkit-sharp-1.0\"") >&5
($PKG_CONFIG --exists --print-errors "webkit-sharp-1.0") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_WEBKIT_SHARP_CFLAGS=`$PKG_CONFIG --cflags "webkit-sharp-1.0" 2>/dev/null`
else
pkg_failed=yes
@@ -5493,11 +5966,11 @@ if test -n "$WEBKIT_SHARP_LIBS"; then
pkg_cv_WEBKIT_SHARP_LIBS="$WEBKIT_SHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-sharp-1.0\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"webkit-sharp-1.0\"") >&5
($PKG_CONFIG --exists --print-errors "webkit-sharp-1.0") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_WEBKIT_SHARP_LIBS=`$PKG_CONFIG --libs "webkit-sharp-1.0" 2>/dev/null`
else
pkg_failed=yes
@@ -5509,8 +5982,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5525,37 +5996,39 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$WEBKIT_SHARP_PKG_ERRORS" >&5
- have_webkit_sharp=no
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ have_webkit_sharp=no
+elif test $pkg_failed = untried; then
have_webkit_sharp=no
else
WEBKIT_SHARP_CFLAGS=$pkg_cv_WEBKIT_SHARP_CFLAGS
WEBKIT_SHARP_LIBS=$pkg_cv_WEBKIT_SHARP_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
have_webkit_sharp=yes
fi
if test "x$have_webkit_sharp" = "xno" ; then
- as_fn_error $? "\"webkit-sharp is a required dependency: you need to install the appropriate devel package before you can compile\"" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: \"webkit-sharp is a required dependency: you need to install the appropriate devel package before you can compile\"" >&5
+$as_echo "$as_me: error: \"webkit-sharp is a required dependency: you need to install the appropriate devel package before you can compile\"" >&2;}
+ { (exit 1); exit 1; }; }
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY_SHARP" >&5
+{ $as_echo "$as_me:$LINENO: checking for NOTIFY_SHARP" >&5
$as_echo_n "checking for NOTIFY_SHARP... " >&6; }
if test -n "$NOTIFY_SHARP_CFLAGS"; then
pkg_cv_NOTIFY_SHARP_CFLAGS="$NOTIFY_SHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-sharp\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"notify-sharp\"") >&5
($PKG_CONFIG --exists --print-errors "notify-sharp") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NOTIFY_SHARP_CFLAGS=`$PKG_CONFIG --cflags "notify-sharp" 2>/dev/null`
else
pkg_failed=yes
@@ -5567,11 +6040,11 @@ if test -n "$NOTIFY_SHARP_LIBS"; then
pkg_cv_NOTIFY_SHARP_LIBS="$NOTIFY_SHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-sharp\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"notify-sharp\"") >&5
($PKG_CONFIG --exists --print-errors "notify-sharp") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NOTIFY_SHARP_LIBS=`$PKG_CONFIG --libs "notify-sharp" 2>/dev/null`
else
pkg_failed=yes
@@ -5583,8 +6056,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5599,20 +6070,22 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NOTIFY_SHARP_PKG_ERRORS" >&5
- have_notify_sharp=no
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ have_notify_sharp=no
+elif test $pkg_failed = untried; then
have_notify_sharp=no
else
NOTIFY_SHARP_CFLAGS=$pkg_cv_NOTIFY_SHARP_CFLAGS
NOTIFY_SHARP_LIBS=$pkg_cv_NOTIFY_SHARP_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
have_notify_sharp=yes
fi
if test "x$have_notify_sharp" = "xno" ; then
- as_fn_error $? "\"notify-sharp is a required dependency: you need to install the appropriate devel package before you can compile\"" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: \"notify-sharp is a required dependency: you need to install the appropriate devel package before you can compile\"" >&5
+$as_echo "$as_me: error: \"notify-sharp is a required dependency: you need to install the appropriate devel package before you can compile\"" >&2;}
+ { (exit 1); exit 1; }; }
fi
@@ -5620,11 +6093,11 @@ fi
if test x$enable_appindicator = xauto ; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-sharp-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"appindicator-sharp-0.1 >= \$APPINDICATOR_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
enable_appindicator="yes"
else
enable_appindicator="no"
@@ -5633,29 +6106,31 @@ fi
if test x$enable_appindicator = xyes ; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-sharp-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"appindicator-sharp-0.1 >= \$APPINDICATOR_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
:
else
- as_fn_error $? "appindicator-sharp-0.1 is not installed" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: appindicator-sharp-0.1 is not installed" >&5
+$as_echo "$as_me: error: appindicator-sharp-0.1 is not installed" >&2;}
+ { (exit 1); exit 1; }; }
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APP_INDICATOR" >&5
+{ $as_echo "$as_me:$LINENO: checking for APP_INDICATOR" >&5
$as_echo_n "checking for APP_INDICATOR... " >&6; }
if test -n "$APP_INDICATOR_CFLAGS"; then
pkg_cv_APP_INDICATOR_CFLAGS="$APP_INDICATOR_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-sharp-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"appindicator-sharp-0.1 >= \$APPINDICATOR_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_APP_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -5667,11 +6142,11 @@ if test -n "$APP_INDICATOR_LIBS"; then
pkg_cv_APP_INDICATOR_LIBS="$APP_INDICATOR_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-sharp-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"appindicator-sharp-0.1 >= \$APPINDICATOR_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_APP_INDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -5683,8 +6158,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5699,7 +6172,18 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$APP_INDICATOR_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED) were not met:
+
+$APP_INDICATOR_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables APP_INDICATOR_CFLAGS
+and APP_INDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED) were not met:
$APP_INDICATOR_PKG_ERRORS
@@ -5708,13 +6192,23 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables APP_INDICATOR_CFLAGS
and APP_INDICATOR_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$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
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables APP_INDICATOR_CFLAGS
+and APP_INDICATOR_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." >&5
+$as_echo "$as_me: 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.
@@ -5723,18 +6217,21 @@ and APP_INDICATOR_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." >&2;}
+ { (exit 1); exit 1; }; }; }
else
APP_INDICATOR_CFLAGS=$pkg_cv_APP_INDICATOR_CFLAGS
APP_INDICATOR_LIBS=$pkg_cv_APP_INDICATOR_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
-
+ :
fi
-$as_echo "#define HAVE_APP_INDICATOR 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_APP_INDICATOR 1
+_ACEOF
fi
@@ -5757,7 +6254,7 @@ fi
NUNIT_REQUIRED=2.4.7
# Check whether --enable-tests was given.
-if test "${enable_tests+set}" = set; then :
+if test "${enable_tests+set}" = set; then
enableval=$enable_tests; enable_tests=$enableval
else
enable_tests="no"
@@ -5777,18 +6274,18 @@ fi
else
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NUNIT" >&5
+{ $as_echo "$as_me:$LINENO: checking for NUNIT" >&5
$as_echo_n "checking for NUNIT... " >&6; }
if test -n "$NUNIT_CFLAGS"; then
pkg_cv_NUNIT_CFLAGS="$NUNIT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nunit >= \$NUNIT_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit >= \$NUNIT_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "nunit >= $NUNIT_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit >= $NUNIT_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -5800,11 +6297,11 @@ if test -n "$NUNIT_LIBS"; then
pkg_cv_NUNIT_LIBS="$NUNIT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nunit >= \$NUNIT_REQUIRED\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit >= \$NUNIT_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "nunit >= $NUNIT_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "nunit >= $NUNIT_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
@@ -5816,8 +6313,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5832,15 +6327,15 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NUNIT_PKG_ERRORS" >&5
- do_tests="no"
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ do_tests="no"
+elif test $pkg_failed = untried; then
do_tests="no"
else
NUNIT_CFLAGS=$pkg_cv_NUNIT_CFLAGS
NUNIT_LIBS=$pkg_cv_NUNIT_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
do_tests="yes"
fi
@@ -5858,18 +6353,18 @@ fi
if test "x$do_tests" = "xno"; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NUNIT" >&5
+{ $as_echo "$as_me:$LINENO: checking for NUNIT" >&5
$as_echo_n "checking for NUNIT... " >&6; }
if test -n "$NUNIT_CFLAGS"; then
pkg_cv_NUNIT_CFLAGS="$NUNIT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono-nunit >= 2.4\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit >= 2.4\"") >&5
($PKG_CONFIG --exists --print-errors "mono-nunit >= 2.4") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit >= 2.4" 2>/dev/null`
else
pkg_failed=yes
@@ -5881,11 +6376,11 @@ if test -n "$NUNIT_LIBS"; then
pkg_cv_NUNIT_LIBS="$NUNIT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono-nunit >= 2.4\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit >= 2.4\"") >&5
($PKG_CONFIG --exists --print-errors "mono-nunit >= 2.4") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit >= 2.4" 2>/dev/null`
else
pkg_failed=yes
@@ -5897,8 +6392,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -5913,15 +6406,15 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NUNIT_PKG_ERRORS" >&5
- do_tests="no"
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ do_tests="no"
+elif test $pkg_failed = untried; then
do_tests="no"
else
NUNIT_CFLAGS=$pkg_cv_NUNIT_CFLAGS
NUNIT_LIBS=$pkg_cv_NUNIT_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
do_tests="yes"
fi
@@ -5937,7 +6430,7 @@ fi
if test "x$do_tests" = "xno"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find nunit: tests will not be available" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Could not find nunit: tests will not be available" >&5
$as_echo "$as_me: WARNING: Could not find nunit: tests will not be available" >&2;} fi
fi
fi
@@ -5945,7 +6438,7 @@ $as_echo "$as_me: WARNING: Could not find nunit: tests will not be available" >&
# Check whether --enable-nautilus-extension was given.
-if test "${enable_nautilus_extension+set}" = set; then :
+if test "${enable_nautilus_extension+set}" = set; then
enableval=$enable_nautilus_extension; enable_nautilus_extension=$enableval
else
enable_nautilus_extension=yes
@@ -5954,18 +6447,18 @@ fi
if test x$enable_nautilus_extension = xyes; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS_PYTHON" >&5
+{ $as_echo "$as_me:$LINENO: checking for NAUTILUS_PYTHON" >&5
$as_echo_n "checking for NAUTILUS_PYTHON... " >&6; }
if test -n "$NAUTILUS_PYTHON_CFLAGS"; then
pkg_cv_NAUTILUS_PYTHON_CFLAGS="$NAUTILUS_PYTHON_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nautilus-python < 1.1\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nautilus-python < 1.1\"") >&5
($PKG_CONFIG --exists --print-errors "nautilus-python < 1.1") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NAUTILUS_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "nautilus-python < 1.1" 2>/dev/null`
else
pkg_failed=yes
@@ -5977,11 +6470,11 @@ if test -n "$NAUTILUS_PYTHON_LIBS"; then
pkg_cv_NAUTILUS_PYTHON_LIBS="$NAUTILUS_PYTHON_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nautilus-python < 1.1\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nautilus-python < 1.1\"") >&5
($PKG_CONFIG --exists --print-errors "nautilus-python < 1.1") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NAUTILUS_PYTHON_LIBS=`$PKG_CONFIG --libs "nautilus-python < 1.1" 2>/dev/null`
else
pkg_failed=yes
@@ -5993,8 +6486,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -6009,15 +6500,15 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NAUTILUS_PYTHON_PKG_ERRORS" >&5
- have_nautilus2_python=no
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ have_nautilus2_python=no
+elif test $pkg_failed = untried; then
have_nautilus2_python=no
else
NAUTILUS_PYTHON_CFLAGS=$pkg_cv_NAUTILUS_PYTHON_CFLAGS
NAUTILUS_PYTHON_LIBS=$pkg_cv_NAUTILUS_PYTHON_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
have_nautilus2_python=yes
fi
@@ -6046,18 +6537,18 @@ fi
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS3_PYTHON" >&5
+{ $as_echo "$as_me:$LINENO: checking for NAUTILUS3_PYTHON" >&5
$as_echo_n "checking for NAUTILUS3_PYTHON... " >&6; }
if test -n "$NAUTILUS3_PYTHON_CFLAGS"; then
pkg_cv_NAUTILUS3_PYTHON_CFLAGS="$NAUTILUS3_PYTHON_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nautilus-python >= 1.1\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nautilus-python >= 1.1\"") >&5
($PKG_CONFIG --exists --print-errors "nautilus-python >= 1.1") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NAUTILUS3_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "nautilus-python >= 1.1" 2>/dev/null`
else
pkg_failed=yes
@@ -6069,11 +6560,11 @@ if test -n "$NAUTILUS3_PYTHON_LIBS"; then
pkg_cv_NAUTILUS3_PYTHON_LIBS="$NAUTILUS3_PYTHON_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nautilus-python >= 1.1\""; } >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nautilus-python >= 1.1\"") >&5
($PKG_CONFIG --exists --print-errors "nautilus-python >= 1.1") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
pkg_cv_NAUTILUS3_PYTHON_LIBS=`$PKG_CONFIG --libs "nautilus-python >= 1.1" 2>/dev/null`
else
pkg_failed=yes
@@ -6085,8 +6576,6 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -6101,15 +6590,15 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NAUTILUS3_PYTHON_PKG_ERRORS" >&5
- have_nautilus3_python=no
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
+ have_nautilus3_python=no
+elif test $pkg_failed = untried; then
have_nautilus3_python=no
else
NAUTILUS3_PYTHON_CFLAGS=$pkg_cv_NAUTILUS3_PYTHON_CFLAGS
NAUTILUS3_PYTHON_LIBS=$pkg_cv_NAUTILUS3_PYTHON_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
have_nautilus3_python=yes
fi
@@ -6162,7 +6651,7 @@ fi
# Check whether --enable-shave was given.
-if test "${enable_shave+set}" = set; then :
+if test "${enable_shave+set}" = set; then
enableval=$enable_shave;
else
enable_shave=yes
@@ -6182,9 +6671,9 @@ fi
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_SED+:} false; then :
+if test "${ac_cv_prog_SED+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$SED"; then
@@ -6195,14 +6684,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_SED="sed"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"
@@ -6210,10 +6699,10 @@ fi
fi
SED=$ac_cv_prog_SED
if test -n "$SED"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+ { $as_echo "$as_me:$LINENO: result: $SED" >&5
$as_echo "$SED" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6280,13 +6769,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
+ *) $as_unset $ac_var ;;
esac ;;
esac
done
@@ -6294,8 +6783,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
+ # `set' does not quote correctly, so add quotes (double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -6317,23 +6806,12 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ test "x$cache_file" != "x/dev/null" &&
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
- cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
- mv -f confcache "$cache_file"$$ &&
- mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
- mv -f confcache "$cache_file" ;;
- esac
- fi
- fi
+ cat confcache >$cache_file
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
@@ -6383,15 +6861,14 @@ DEFS=`sed -n "$ac_script" confdefs.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$//'
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -6407,110 +6884,192 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
ac_config_commands="$ac_config_commands po/stamp-it"
if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
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.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${EXTERNAL_NOTIFY_SHARP_TRUE}" && test -z "${EXTERNAL_NOTIFY_SHARP_FALSE}"; then
- as_fn_error $? "conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${EXTERNAL_NOTIFY_SHARP_TRUE}" && test -z "${EXTERNAL_NOTIFY_SHARP_FALSE}"; then
- as_fn_error $? "conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_DEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_RELEASE_TRUE}" && test -z "${ENABLE_RELEASE_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_RELEASE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_RELEASE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_RELEASE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_DEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${HAVE_GLIBSHARP_2_12_7_TRUE}" && test -z "${HAVE_GLIBSHARP_2_12_7_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_GLIBSHARP_2_12_7\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GLIBSHARP_2_12_7\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_GLIBSHARP_2_12_7\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_ATK_TRUE}" && test -z "${ENABLE_ATK_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_ATK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_ATK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_ATK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_GTKUI_TRUE}" && test -z "${ENABLE_GTKUI_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_GTKUI\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTKUI\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_GTKUI\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_APP_INDICATOR\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_APP_INDICATOR\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_APP_INDICATOR\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${NAUTILUS2_EXTENSION_ENABLED_TRUE}" && test -z "${NAUTILUS2_EXTENSION_ENABLED_FALSE}"; then
- as_fn_error $? "conditional \"NAUTILUS2_EXTENSION_ENABLED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"NAUTILUS2_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NAUTILUS2_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${NAUTILUS2_EXTENSION_ENABLED_TRUE}" && test -z "${NAUTILUS2_EXTENSION_ENABLED_FALSE}"; then
- as_fn_error $? "conditional \"NAUTILUS2_EXTENSION_ENABLED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"NAUTILUS2_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NAUTILUS2_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${NAUTILUS3_EXTENSION_ENABLED_TRUE}" && test -z "${NAUTILUS3_EXTENSION_ENABLED_FALSE}"; then
- as_fn_error $? "conditional \"NAUTILUS3_EXTENSION_ENABLED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"NAUTILUS3_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NAUTILUS3_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${NAUTILUS3_EXTENSION_ENABLED_TRUE}" && test -z "${NAUTILUS3_EXTENSION_ENABLED_FALSE}"; then
- as_fn_error $? "conditional \"NAUTILUS3_EXTENSION_ENABLED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"NAUTILUS3_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NAUTILUS3_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${NAUTILUS2_EXTENSION_ENABLED_TRUE}" && test -z "${NAUTILUS2_EXTENSION_ENABLED_FALSE}"; then
- as_fn_error $? "conditional \"NAUTILUS2_EXTENSION_ENABLED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"NAUTILUS2_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NAUTILUS2_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
if test -z "${NAUTILUS3_EXTENSION_ENABLED_TRUE}" && test -z "${NAUTILUS3_EXTENSION_ENABLED_FALSE}"; then
- as_fn_error $? "conditional \"NAUTILUS3_EXTENSION_ENABLED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: conditional \"NAUTILUS3_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NAUTILUS3_EXTENSION_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -6520,18 +7079,17 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-
SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -6539,15 +7097,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
esac
+
fi
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
as_nl='
'
export as_nl
@@ -6555,13 +7121,7 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -6572,7 +7132,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in #(
+ case $arg in
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -6595,6 +7155,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -6604,16 +7171,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
IFS=$as_save_IFS
;;
@@ -6625,16 +7191,12 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
+ { (exit 1); exit 1; }
fi
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
done
PS1='$ '
PS2='> '
@@ -6646,89 +7208,7 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$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
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
+# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -6742,12 +7222,8 @@ else
as_basename=false
fi
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
@@ -6767,25 +7243,76 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
+
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
-n*)
- case `echo 'xy\c'` in
+ case `echo 'x\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T=' ';;
+ *) ECHO_C='\c';;
esac;;
*)
ECHO_N='-n';;
esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -6814,56 +7341,8 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
+ as_mkdir_p=:
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -6882,10 +7361,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in #(
+ case $1 in
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -6900,19 +7379,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by SparkleShare $as_me 0.4.2, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by SparkleShare $as_me 0.6.0, which was
+generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6940,15 +7413,13 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration. Unless the files
-and actions are specified as TAGs, all are instantiated by default.
+\`$as_me' instantiates files from templates according to the
+current configuration.
-Usage: $0 [OPTION]... [TAG]...
+Usage: $0 [OPTION]... [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -6962,17 +7433,16 @@ $config_files
Configuration commands:
$config_commands
-Report bugs to the package provider."
+Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-SparkleShare config.status 0.4.2
-configured by $0, generated by GNU Autoconf 2.68,
- with options \\"\$ac_cs_config\\"
+SparkleShare config.status 0.6.0
+configured by $0, generated by GNU Autoconf 2.63,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -6990,16 +7460,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
@@ -7013,17 +7478,14 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
- --config | --confi | --conf | --con | --co | --c )
- $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$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'"
+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -7032,10 +7494,11 @@ do
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+ -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; } ;;
- *) as_fn_append ac_config_targets " $1"
+ *) ac_config_targets="$ac_config_targets $1"
ac_need_defaults=false ;;
esac
@@ -7109,7 +7572,9 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
esac
done
@@ -7131,24 +7596,26 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp= ac_tmp=
+ tmp=
trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
- trap 'as_fn_exit 1' 1 2 13 15
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
+ test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
+} ||
+{
+ $as_echo "$as_me: cannot create a temporary directory in ." >&2
+ { (exit 1); exit 1; }
+}
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -7156,13 +7623,7 @@ ac_tmp=$tmp
if test -n "$CONFIG_FILES"; then
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
- eval ac_cr=\$\'\\r\'
-fi
+ac_cr='
'
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'
@@ -7170,7 +7631,7 @@ else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
@@ -7179,18 +7640,24 @@ _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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -7198,7 +7665,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -7212,7 +7679,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
-s/\(.\{148\}\)..*/\1/
+s/\(.\{148\}\).*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -7226,7 +7693,7 @@ s/.\{148\}//
t nl
:delim
h
-s/\(.\{148\}\)..*/\1/
+s/\(.\{148\}\).*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -7246,7 +7713,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -7278,29 +7745,23 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+ { (exit 1); exit 1; }; }
_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
@@ -7318,7 +7779,9 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+ { (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -7337,7 +7800,7 @@ do
for ac_f
do
case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
+ -) ac_f="$tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -7346,10 +7809,12 @@ 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_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { (exit 1); exit 1; }; };;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- as_fn_append ac_file_inputs " '$ac_f'"
+ ac_file_inputs="$ac_file_inputs '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -7360,7 +7825,7 @@ do
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
@@ -7372,8 +7837,10 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
;;
esac
@@ -7401,7 +7868,47 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
- as_dir="$ac_dir"; as_fn_mkdir_p
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
@@ -7458,6 +7965,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
+
ac_sed_dataroot='
/datarootdir/ {
p
@@ -7467,11 +7975,12 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p'
+/@mandir@/p
+'
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -7481,7 +7990,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
@@ -7509,28 +8018,31 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_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
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+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 "$ac_tmp/stdin"
+ rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ -) 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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
;;
- :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -7625,7 +8137,47 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
+ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
@@ -7634,7 +8186,9 @@ $as_echo X"$file" |
;;
"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_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
+$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
+ { (exit 1); exit 1; }; }
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
@@ -7657,12 +8211,15 @@ $as_echo X"$file" |
done # for ac_tag
-as_fn_exit 0
+{ (exit 0); exit 0; }
_ACEOF
+chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
# configure is writing to config.log, and then calls config.status.
@@ -7683,10 +8240,10 @@ 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 || { (exit 1); exit 1; }
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
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
diff --git a/configure.ac b/configure.ac
index b4f4995..2c97ee9 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
m4_define([sparkleshare_version],
- [0.4.2])
+ [0.6.0])
m4_define([sparkleshare_asm_version],
- [0.4.2])
+ [0.6.0])
AC_PREREQ([2.54])
AC_INIT([SparkleShare], sparkleshare_version)
diff --git a/data/Makefile.in b/data/Makefile.in
old mode 100644
new mode 100755
index 0d6c205..4234a3d
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -36,8 +36,7 @@ subdir = data
DIST_COMMON = $(dist_pixmaps_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -139,6 +138,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -158,6 +159,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -171,6 +173,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -194,17 +197,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/data/html/Makefile.in b/data/html/Makefile.in
old mode 100644
new mode 100755
index b7fdd41..7f8cb30
--- a/data/html/Makefile.in
+++ b/data/html/Makefile.in
@@ -36,8 +36,7 @@ subdir = data/html
DIST_COMMON = $(dist_html_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -99,6 +98,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -118,6 +119,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -131,6 +133,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -154,17 +157,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
old mode 100644
new mode 100755
index 59a096b..08b91c6
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -34,8 +34,7 @@ POST_UNINSTALL = :
subdir = data/icons
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -74,6 +73,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -106,6 +108,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -129,17 +132,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/data/plugins/Makefile.in b/data/plugins/Makefile.in
index 553a7bc..d9847c3 100644
--- a/data/plugins/Makefile.in
+++ b/data/plugins/Makefile.in
@@ -36,8 +36,7 @@ subdir = data/plugins
DIST_COMMON = $(dist_plugins_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -99,6 +98,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -118,6 +119,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -131,6 +133,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -154,17 +157,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff --git a/data/plugins/bitbucket.xml b/data/plugins/bitbucket.xml
old mode 100644
new mode 100755
index 7e77344..c391a57
--- a/data/plugins/bitbucket.xml
+++ b/data/plugins/bitbucket.xml
@@ -6,18 +6,24 @@
<name xml:lang="de">Bitbucket</name>
<name xml:lang="es">Bitbucket</name>
<name xml:lang="fr">Bitbucket</name>
+ <name xml:lang="it">Bitbucket</name>
<name xml:lang="nl">Bitbucket</name>
<name xml:lang="pl">Bitbucket</name>
+ <name xml:lang="pt_BR">Bitbucket</name>
<name xml:lang="ru">Bitbucket</name>
<name xml:lang="sv">Bitbucket</name>
+ <name xml:lang="zh_CN">小桶</name>
<description>Free code hosting for Git and Mercurial</description>
<description xml:lang="de">Freies Code-Hosting für Git und Mercurial</description>
<description xml:lang="es">Alojamiento gratuito de código fuente para Git y Mercurial</description>
<description xml:lang="fr">Hébergement gratuit de code pour Git et Mercurial</description>
+ <description xml:lang="it">Hosting gratuito di codice per Git e Mercurial</description>
<description xml:lang="nl">Gratis hosting voor Git en Mercurial</description>
<description xml:lang="pl">Darmowe utrzymywanie kodu dla projektów zarządzanych przez git oraz Mercurial</description>
+ <description xml:lang="pt_BR">Hospedagem gratuita de código para Git e Mercurial</description>
<description xml:lang="ru">Бесплатный хостинг проектов и их совместной разработки, основанный на системе контроля версий Mercurial и Git</description>
<description xml:lang="sv">Gratis källkodslagring för Git och Mercurial</description>
+ <description xml:lang="zh_CN">免费的Git与Mercurial代码托管</description>
<icon>bitbucket.png</icon>
<backend>Git</backend>
</info>
@@ -31,11 +37,13 @@
<example xml:lang="de">/username/project</example>
<example xml:lang="es">/usuario/proyecto</example>
<example xml:lang="fr">/nom-d-utilisateur/projet</example>
+ <example xml:lang="it">/nome-utente/progetto</example>
<example xml:lang="nl">/gebruikersnaam/project</example>
<example xml:lang="pl">/nazwa uzytkownika/projekt</example>
<example xml:lang="pt_BR">/usuário/projeto</example>
<example xml:lang="ru">/username/project</example>
<example xml:lang="sv">/användare/projekt</example>
+ <example xml:lang="zh_CN">/username/project</example>
</path>
</plugin>
</sparkleshare>
\ No newline at end of file
diff --git a/data/plugins/github.xml b/data/plugins/github.xml
old mode 100644
new mode 100755
index 9e4e2c2..e68f5be
--- a/data/plugins/github.xml
+++ b/data/plugins/github.xml
@@ -6,20 +6,25 @@
<name xml:lang="de">Github</name>
<name xml:lang="es">Github</name>
<name xml:lang="fr">Github</name>
+ <name xml:lang="it">Github</name>
<name xml:lang="ja">Github</name>
<name xml:lang="nl">Github</name>
<name xml:lang="pl">Github</name>
<name xml:lang="pt_BR">Github</name>
<name xml:lang="ru">Github</name>
<name xml:lang="sv">Github</name>
+ <name xml:lang="zh_CN">Github</name>
<description>Free public Git repositories with collaborator management</description>
<description xml:lang="de">Freie öffentliche Git Repositories mit Mitarbeiterverwaltung</description>
<description xml:lang="es">Repositorios públicos y gratuitos de Git con gestión de colaboradores</description>
<description xml:lang="fr">Dépôts Git gratuits avec gestion des collaborateurs</description>
+ <description xml:lang="it">Repository pubblici gratuiti con gestione dei collaboratori</description>
<description xml:lang="nl">Gratis publieke repositories met teambeheer.</description>
<description xml:lang="pl">Darmowe publiczne repozytoria git z obsługą współpracowników</description>
+ <description xml:lang="pt_BR">Repositórios públicos Git, gratuitos com gestão de colaboradores</description>
<description xml:lang="ru">Бесплатные публичные Git репозитории с совместной разработкой</description>
<description xml:lang="sv">Gratis offentliga Git-arkiv med medarbetarehantering</description>
+ <description xml:lang="zh_CN">具备协作管理的免费开放仓库</description>
<icon>github.png</icon>
<backend>Git</backend>
</info>
@@ -33,11 +38,13 @@
<example xml:lang="de">/username/project</example>
<example xml:lang="es">/usuario/proyecto</example>
<example xml:lang="fr">/nom-d-utilisateur/projet</example>
+ <example xml:lang="it">/nome-utente/progetto</example>
<example xml:lang="nl">/gebruikersnaam/project</example>
<example xml:lang="pl">/nazwa uzytkownika/projekt</example>
<example xml:lang="pt_BR">/usuário/projeto</example>
<example xml:lang="ru">/username/project</example>
<example xml:lang="sv">/användare/projekt</example>
+ <example xml:lang="zh_CN">/username/project</example>
</path>
</plugin>
</sparkleshare>
\ No newline at end of file
diff --git a/data/plugins/gitorious.xml b/data/plugins/gitorious.xml
old mode 100644
new mode 100755
index fdf08fa..e5c50ad
--- a/data/plugins/gitorious.xml
+++ b/data/plugins/gitorious.xml
@@ -34,10 +34,13 @@
<description xml:lang="de">Quelloffene Infrastruktur zum hosten von quelloffenen Projekten</description>
<description xml:lang="es">Infraestructura de código libre para almacenar proyectos de código libre</description>
<description xml:lang="fr">Infrastructure open source d'hébergement de projets open source</description>
+ <description xml:lang="it">Infrastruttura Open sourc per lo hosting di progetti open source</description>
<description xml:lang="nl">Opensource infrastructuur voor het hosten van opensource projecten.</description>
<description xml:lang="pl">Infrastruktura o otwartym kodzie źródłowym dla projektów o otwartym kodzie źródłowym</description>
+ <description xml:lang="pt_BR">Infra-estrutura de código aberto para hospedagem de projetos com código aberto </description>
<description xml:lang="ru">Open source инфраструктура для размещения ваших open source проектов</description>
<description xml:lang="sv">Infrastruktur för delning av öppen källkod-projekt</description>
+ <description xml:lang="zh_CN">托管开源项目的开源架构</description>
<icon>gitorious.png</icon>
<backend>Git</backend>
</info>
@@ -51,11 +54,13 @@
<example xml:lang="de">/Projekt/Ablage</example>
<example xml:lang="es">/proyecto/repositorio</example>
<example xml:lang="fr">/projet/depot</example>
+ <example xml:lang="it">/progetto/repository</example>
<example xml:lang="nl">/project/repository</example>
<example xml:lang="pl">/projekt/repozytorium</example>
<example xml:lang="pt_BR">/projeto/repositório</example>
<example xml:lang="ru">/project/repository</example>
<example xml:lang="sv">/projekt/arkiv</example>
+ <example xml:lang="zh_CN">/project/repository</example>
</path>
</plugin>
</sparkleshare>
\ No newline at end of file
diff --git a/data/plugins/gnome.xml b/data/plugins/gnome.xml
old mode 100644
new mode 100755
index a60fc1e..214de15
--- a/data/plugins/gnome.xml
+++ b/data/plugins/gnome.xml
@@ -33,10 +33,13 @@
<description xml:lang="de">Eine freie und einfache Schnittstelle für deinen Computer</description>
<description xml:lang="es">Una interfaz libre y sencilla para tu ordenador</description>
<description xml:lang="fr">Une interface facile et gratuite pour votre ordinateur</description>
+ <description xml:lang="it">Un'interfaccia gratuita e facile per il tuo computer</description>
<description xml:lang="nl">Een gratis en gemakkelijke interface voor uw computer</description>
<description xml:lang="pl">Wolny i prosty interfejs dla komputerów</description>
+ <description xml:lang="pt_BR">Uma interface fácil e gratuita para o seu computador</description>
<description xml:lang="ru">Бесплатный и простой интерфейс для вашего компьютера</description>
<description xml:lang="sv">Ett gratis och enkelt gränssnitt för din dator</description>
+ <description xml:lang="zh_CN">为你的计算机提供一个免费并且简单的接口</description>
<icon>gnome.png</icon>
<backend>Git</backend>
</info>
@@ -50,11 +53,13 @@
<example xml:lang="de">/Projekt</example>
<example xml:lang="es">/proyecto</example>
<example xml:lang="fr">/projet</example>
+ <example xml:lang="it">/progetto</example>
<example xml:lang="nl">/project</example>
<example xml:lang="pl">/project</example>
<example xml:lang="pt_BR">/projeto</example>
<example xml:lang="ru">/project</example>
<example xml:lang="sv">/projekt</example>
+ <example xml:lang="zh_CN">/project</example>
</path>
</plugin>
</sparkleshare>
\ No newline at end of file
diff --git a/data/plugins/own-server.xml b/data/plugins/own-server.xml
old mode 100644
new mode 100755
index 18a256d..d577047
--- a/data/plugins/own-server.xml
+++ b/data/plugins/own-server.xml
@@ -7,21 +7,25 @@
<name xml:lang="es">En mi propio servidor</name>
<name xml:lang="fr">Mon propre serveur</name>
<name xml:lang="he">שרת משלי</name>
+ <name xml:lang="it">Il mio server</name>
<name xml:lang="nl">Op mijn eigen server</name>
<name xml:lang="pl">Na własnym serwerze</name>
<name xml:lang="pt_BR">Em meu próprio servidor</name>
<name xml:lang="ru">Мой личный сервер</name>
<name xml:lang="sv">På min egen server</name>
+ <name xml:lang="zh_CN">拥有你自己的服务器</name>
<description>Everything under my control</description>
<description xml:lang="de">Alles unter meiner Kontrolle</description>
<description xml:lang="es">Todo bajo mi control</description>
<description xml:lang="fr">Tout est sous mon contrôle</description>
<description xml:lang="he">הכל תחת שליטתי</description>
+ <description xml:lang="it">Tutto sotto il mio controllo</description>
<description xml:lang="nl">Alles onder mijn controle</description>
<description xml:lang="pl">Wszystko pod własną kontrolą</description>
<description xml:lang="pt_BR">Tudo sob meu controle</description>
<description xml:lang="ru">Всё под моим контролем</description>
<description xml:lang="sv">Allting under min kontroll</description>
+ <description xml:lang="zh_CN">一切尽在你的掌控</description>
<icon>own-server.png</icon>
<backend>Git</backend>
</info>
@@ -35,11 +39,13 @@
<example xml:lang="de">/Pfad/zum/Projekt</example>
<example xml:lang="es">/ruta/al/proyecto</example>
<example xml:lang="fr">/chemin/du/projet</example>
+ <example xml:lang="it">/percorso/per/progetto</example>
<example xml:lang="nl">/pad/naar/project</example>
<example xml:lang="pl">/ścieżka/do/projektu</example>
<example xml:lang="pt_BR">/caminho/para/projeto</example>
<example xml:lang="ru">/path/to/project</example>
<example xml:lang="sv">/sökväg/till/projekt</example>
+ <example xml:lang="zh_CN">/path/to/project</example>
</path>
</plugin>
</sparkleshare>
\ No newline at end of file
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
index 97fd549..ec8f698 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -266,13 +266,6 @@ _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
.PHONY: po
po: $(_DOC_POFILES)
-## @ _DOC_MOFILES
-## The .mo files used for translating the document
-_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
-
-.PHONY: mo
-mo: $(_DOC_MOFILES)
-
## @ _DOC_LC_MODULES
## The top-level documentation files in all other locales
_DOC_LC_MODULES = $(if $(DOC_MODULE), \
@@ -339,23 +332,16 @@ $(_DOC_POFILES):
$(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
fi
-$(_DOC_MOFILES): %.mo: %.po
- @if ! test -d $(dir $@); then \
- echo "mkdir $(dir $@)"; \
- mkdir "$(dir $@)"; \
- fi
- msgfmt -o $@ $<
-
# FIXME: fix the dependancy
# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+$(_DOC_LC_DOCS) : $(_DOC_POFILES)
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
if ! test -d $(dir $@); then mkdir $(dir $@); fi
if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
- mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
- if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+ if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
(cd $(dir $@) && \
- $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
"$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
@@ -400,14 +386,12 @@ clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
clean-doc-lc:
rm -f $(_DOC_LC_DOCS)
- rm -f $(_DOC_MOFILES)
@list='$(_DOC_POFILES)'; for po in $$list; do \
if ! test "$$po" -ef "$(srcdir)/$$po"; then \
echo "rm -f $$po"; \
rm -f "$$po"; \
fi; \
done
-# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
diff --git a/help/C/account-creation.page b/help/C/account-creation.page
new file mode 100644
index 0000000..4c976af
--- /dev/null
+++ b/help/C/account-creation.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="accounts">
+
+ <info>
+ <link type="guide" xref="index#account"/>
+ <link type="seealso" xref=""/>
+ <desc>Add the location of your remote folders.</desc>
+ <revision pkgversion="0.1" version="0.1" date="2010-08-9" status="stub"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Account Setup</title>
+
+ <p>Insert how to setup your accounts here)
+ </p>
+
+ <p>Insert more help here, if needed.
+ </p>
+
+</page>
diff --git a/help/C/advanced.page b/help/C/advanced.page
new file mode 100644
index 0000000..a75e3a3
--- /dev/null
+++ b/help/C/advanced.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="guide" style="2column"
+ id="advanced">
+
+ <info>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Get help for advanced actions.</desc>
+ <revision pkgversion="0.1" version="0.1" date="2010-08-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Advanced Options and Help</title>
+
+ <section id="tbd" style="2column">
+ <info>
+ <title type="link">TBD</title>
+ </info>
+ <title>TBD</title>
+ </section>
+
+</page>
diff --git a/help/C/index.page b/help/C/index.page
new file mode 100644
index 0000000..21761b5
--- /dev/null
+++ b/help/C/index.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="guide"
+ id="index">
+
+ <info>
+ <revision pkgversion="0.1" version="0.1" date="2010-08-29"
+ status="incomplete"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+ </info>
+
+ <title>SparkleShare</title>
+
+ <section id="account" style="2column">
+ <title>Account Setup</title>
+ </section>
+
+ <section id="share" style="2column">
+ <title>Sync and Share Files</title>
+ </section>
+
+ <section id="advanced" style="2column">
+ <title>Advanced options and help</title>
+ </section>
+
+ <section id="problems">
+ <title>Common Problems</title>
+ </section>
+
+</page>
diff --git a/help/C/introduction.page b/help/C/introduction.page
new file mode 100644
index 0000000..2515ce2
--- /dev/null
+++ b/help/C/introduction.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="introduction">
+
+ <info>
+ <link type="guide" xref="index"/>
+ <revision pkgversion="0.1" version="0.1" date="2010-08-29" status="draft"/>
+ <desc>
+ Introduction to <app>SparkleShare</app>.
+ </desc>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+ </info>
+
+ <title>Introduction</title>
+
+ <p>
+ <app>SparkleShare</app> is an application that allows you to easily
+ sync and share your files and folders. SparkeShare uses the
+ distributed version control system <app>Git</app> to keep a record
+ of all the changes in your files, making it easy to easily go back
+ to an earlier version of the file if you make a mistake.
+ </p>
+
+ <figure>
+ <title><gui>SparkleShare</gui> screenshot</title>
+ <desc><app>SparkleShare</app></desc>
+ <media type="image" src="figures/sparkleshare.png" mime="image/png" style="right">
+ <p><app>Sparkleshare</app></p>
+ </media>
+ </figure>
+
+</page>
diff --git a/help/C/legal.xml b/help/C/legal.xml
new file mode 100644
index 0000000..86d6173
--- /dev/null
+++ b/help/C/legal.xml
@@ -0,0 +1,9 @@
+<license xmlns="http://projectmallard.org/1.0/"
+ href="http://creativecommons.org/licenses/by-sa/3.0/">
+<p>This work is licensed under a
+<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
+Attribution-Share Alike 3.0 Unported License</link>.</p>
+<p>As a special exception, the copyright holders give you permission to copy,
+modify, and distribute the example code contained in this document under the
+terms of your choosing, without restriction.</p>
+</license>
diff --git a/help/C/share.page b/help/C/share.page
new file mode 100644
index 0000000..95e95c5
--- /dev/null
+++ b/help/C/share.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="share">
+
+ <info>
+ <link type="guide" xref="index#share"/>
+ <link type="seealso" xref=""/>
+ <desc>Sync and share your folders and files.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Sync and share your files and folders</title>
+
+ <p>Insert help here.
+ </p>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/Makefile.in b/help/Makefile.in
old mode 100644
new mode 100755
index fc8f3c2..6530ca0
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -59,8 +59,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/gnome-doc-utils.make
subdir = help
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/build/m4/shave/shave.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/shamrock/expansions.m4 \
$(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
@@ -99,6 +98,8 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -118,6 +119,7 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GUISUBDIRS = @GUISUBDIRS@
+HELP_DIR = @HELP_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -131,6 +133,7 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEFLAGS = @MAKEFLAGS@
@@ -154,17 +157,15 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
OBJC = @OBJC@
OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
Q = @Q@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -291,7 +292,6 @@ top_srcdir = @top_srcdir@
@HAVE_GNOME_DOC_UTILS_TRUE at _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
@HAVE_GNOME_DOC_UTILS_TRUE@ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
- at HAVE_GNOME_DOC_UTILS_TRUE@_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
@HAVE_GNOME_DOC_UTILS_TRUE at _DOC_LC_MODULES = $(if $(DOC_MODULE), \
@HAVE_GNOME_DOC_UTILS_TRUE@ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
@@ -648,9 +648,6 @@ uninstall-am: uninstall-local
@HAVE_GNOME_DOC_UTILS_TRUE at .PHONY: po
@HAVE_GNOME_DOC_UTILS_TRUE at po: $(_DOC_POFILES)
- at HAVE_GNOME_DOC_UTILS_TRUE@.PHONY: mo
- at HAVE_GNOME_DOC_UTILS_TRUE@mo: $(_DOC_MOFILES)
-
@HAVE_GNOME_DOC_UTILS_TRUE@$(_DOC_POFILES):
@HAVE_GNOME_DOC_UTILS_TRUE@ @if ! test -d $(dir $@); then \
@HAVE_GNOME_DOC_UTILS_TRUE@ echo "mkdir $(dir $@)"; \
@@ -678,23 +675,16 @@ uninstall-am: uninstall-local
@HAVE_GNOME_DOC_UTILS_TRUE@ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
@HAVE_GNOME_DOC_UTILS_TRUE@ fi
- at HAVE_GNOME_DOC_UTILS_TRUE@$(_DOC_MOFILES): %.mo: %.po
- at HAVE_GNOME_DOC_UTILS_TRUE@ @if ! test -d $(dir $@); then \
- at HAVE_GNOME_DOC_UTILS_TRUE@ echo "mkdir $(dir $@)"; \
- at HAVE_GNOME_DOC_UTILS_TRUE@ mkdir "$(dir $@)"; \
- at HAVE_GNOME_DOC_UTILS_TRUE@ fi
- at HAVE_GNOME_DOC_UTILS_TRUE@ msgfmt -o $@ $<
-
# FIXME: fix the dependancy
# FIXME: hook xml2po up
- at HAVE_GNOME_DOC_UTILS_TRUE@$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ at HAVE_GNOME_DOC_UTILS_TRUE@$(_DOC_LC_DOCS) : $(_DOC_POFILES)
@HAVE_GNOME_DOC_UTILS_TRUE@$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
@HAVE_GNOME_DOC_UTILS_TRUE@ if ! test -d $(dir $@); then mkdir $(dir $@); fi
@HAVE_GNOME_DOC_UTILS_TRUE@ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
- at HAVE_GNOME_DOC_UTILS_TRUE@ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
- at HAVE_GNOME_DOC_UTILS_TRUE@ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
@HAVE_GNOME_DOC_UTILS_TRUE@ (cd $(dir $@) && \
- at HAVE_GNOME_DOC_UTILS_TRUE@ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
@HAVE_GNOME_DOC_UTILS_TRUE@ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
@HAVE_GNOME_DOC_UTILS_TRUE@ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
@HAVE_GNOME_DOC_UTILS_TRUE at .PHONY: pot
@@ -720,14 +710,12 @@ uninstall-am: uninstall-local
@HAVE_GNOME_DOC_UTILS_TRUE at clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
@HAVE_GNOME_DOC_UTILS_TRUE at clean-doc-lc:
@HAVE_GNOME_DOC_UTILS_TRUE@ rm -f $(_DOC_LC_DOCS)
- at HAVE_GNOME_DOC_UTILS_TRUE@ rm -f $(_DOC_MOFILES)
@HAVE_GNOME_DOC_UTILS_TRUE@ @list='$(_DOC_POFILES)'; for po in $$list; do \
@HAVE_GNOME_DOC_UTILS_TRUE@ if ! test "$$po" -ef "$(srcdir)/$$po"; then \
@HAVE_GNOME_DOC_UTILS_TRUE@ echo "rm -f $$po"; \
@HAVE_GNOME_DOC_UTILS_TRUE@ rm -f "$$po"; \
@HAVE_GNOME_DOC_UTILS_TRUE@ fi; \
@HAVE_GNOME_DOC_UTILS_TRUE@ done
-# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
@HAVE_GNOME_DOC_UTILS_TRUE@ @for lc in C $(_DOC_REAL_LINGUAS); do \
@HAVE_GNOME_DOC_UTILS_TRUE@ if test -f "$$lc/.xml2po.mo"; then \
@HAVE_GNOME_DOC_UTILS_TRUE@ echo "rm -f $$lc/.xml2po.mo"; \
diff --git a/ltmain.sh b/ltmain.sh
index 3061e3c..a72f2fd 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,9 @@
+# Generated from ltmain.m4sh.
-# libtool (GNU libtool) 2.4
+# ltmain.sh (GNU libtool) 2.2.6b
# 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, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -32,56 +32,50 @@
#
# 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
-# --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
+# --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
#
# 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. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# MODE-ARGS vary depending on the MODE.
# 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.4
-# 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.6b
+# automake: $automake_version
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
-PROGRAM=libtool
+PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.4
+VERSION=2.2.6b
TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -97,15 +91,10 @@ 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
@@ -118,33 +107,24 @@ 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"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
+: ${ECHO="echo"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="sed"}
+: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -164,27 +144,6 @@ IFS=" $lt_nl"
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
@@ -199,183 +158,33 @@ func_basename ()
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
- # Extract subdirectory from the argument.
- 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 "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# 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
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -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_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
+# Generated shell functions inserted here.
- # 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
-}
+# 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"
# 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
@@ -406,15 +215,6 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
@@ -443,7 +243,7 @@ opt_warning=:
# name if it has been set yet.
func_echo ()
{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+ $ECHO "$progname${mode+: }$mode: $*"
}
# func_verbose arg...
@@ -458,25 +258,18 @@ 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 ()
{
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
}
# func_warning arg...
# Echo program name prefixed warning message to standard error.
func_warning ()
{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
# bash bug again:
:
@@ -533,9 +326,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@ -585,7 +378,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "$my_tmpdir"
+ $ECHO "X$my_tmpdir" | $Xsed
}
@@ -599,7 +392,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@ -626,7 +419,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
+ my_arg=`$ECHO "X$1" | $Xsed \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@ -695,39 +488,15 @@ func_show_eval_locale ()
fi
}
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result. All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
- case $1 in
- [0-9]* | *[!a-zA-Z0-9_]*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
-}
+
+
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $opt_debug
-
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -740,28 +509,22 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
- $opt_debug
-
- $SED -n '/^# Usage:/,/^# *.*--help/ {
+ $SED -n '/^# Usage:/,/# -h/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- echo
+ $ECHO
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+# func_help
+# Echo long help message to standard output and exit.
func_help ()
{
- $opt_debug
-
$SED -n '/^# Usage:/,/# Report bugs to/ {
- :print
s/^# //
s/^# *$//
s*\$progname*'$progname'*
@@ -774,15 +537,8 @@ func_help ()
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ }' < "$progpath"
+ exit $?
}
# func_missing_arg argname
@@ -790,106 +546,63 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
-
- func_error "missing argument for $1."
+ func_error "missing argument for $1"
exit_cmd=exit
}
+exit_cmd=:
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
-
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-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%%%"
# Global variables.
+# $mode is unset
nonopt=
+execute_dlfiles=
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
+
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
exec_cmd=
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
@@ -923,16 +636,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 $?
@@ -979,204 +692,117 @@ func_enable_tag ()
esac
}
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
+# Parse options once, thoroughly. This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
- fi
-
- exit $EXIT_MISMATCH
- fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
- # this just eases exit handling
- while test $# -gt 0; do
+ # Parse non-mode specific arguments:
+ while test "$#" -gt 0; do
opt="$1"
shift
+
case $opt in
- --debug|-x) opt_debug='set -x'
+ --config) func_config ;;
+
+ --debug) preserve_args="$preserve_args $opt"
func_echo "enabling shell trace mode"
+ opt_debug='set -x'
$opt_debug
;;
- --dry-run|--dryrun|-n)
- opt_dry_run=:
- ;;
- --config)
- opt_config=:
-func_config
- ;;
- --dlopen|-dlopen)
- optarg="$1"
- opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
+
+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ execute_dlfiles="$execute_dlfiles $1"
shift
;;
- --preserve-dup-deps)
- opt_preserve_dup_deps=:
- ;;
- --features)
- opt_features=:
-func_features
- ;;
- --finish)
- opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
- ;;
- --help)
- opt_help=:
- ;;
- --help-all)
- opt_help_all=:
-opt_help=': help-all'
- ;;
- --mode)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
+
+ --dry-run | -n) opt_dry_run=: ;;
+ --features) func_features ;;
+ --finish) mode="finish" ;;
+
+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ case $1 in
+ # Valid mode arguments:
+ clean) ;;
+ compile) ;;
+ execute) ;;
+ finish) ;;
+ install) ;;
+ link) ;;
+ relink) ;;
+ uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+
+ mode="$1"
shift
;;
- --no-silent|--no-quiet)
- opt_silent=false
-func_append preserve_args " $opt"
- ;;
- --no-verbose)
- opt_verbose=false
-func_append preserve_args " $opt"
- ;;
- --silent|--quiet)
+
+ --preserve-dup-deps)
+ opt_duplicate_deps=: ;;
+
+ --quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
;;
- --verbose|-v)
- opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
+
+ --verbose| -v) preserve_args="$preserve_args $opt"
+ opt_silent=false
;;
- --tag)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
+
+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ preserve_args="$preserve_args $opt $1"
+ func_enable_tag "$1" # tagname is set here
shift
;;
- -\?|-h) func_usage ;;
- --help) func_help ;;
- --version) func_version ;;
-
# Separate optargs to long options:
- --*=*)
- func_split_long_opt "$opt"
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+ -dlopen=*|--mode=*|--tag=*)
+ func_opt_split "$opt"
+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
shift
;;
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
- func_split_short_opt "$opt"
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- shift
- ;;
+ -\?|-h) func_usage ;;
+ --help) opt_help=: ;;
+ --version) func_version ;;
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+
+ *) nonopt="$opt"
+ break
+ ;;
esac
done
- # Validate options:
-
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
-
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -1184,44 +810,82 @@ func_enable_tag "$optarg"
opt_duplicate_compiler_generated_deps=:
;;
*)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
;;
esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
+ # Having warned about all mis-specified options, bail out if
+ # anything was wrong.
+ $exit_cmd $EXIT_FAILURE
+}
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ exit $EXIT_MISMATCH
+ fi
+}
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+## ----------- ##
+## Main. ##
+## ----------- ##
+$opt_help || {
+ # Sanity checks first:
+ func_check_version_match
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
-}
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
+ fi
+ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ func_error "unrecognized option \`-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$progname --help --mode=$mode' for more information."
+}
-## ----------- ##
-## Main. ##
-## ----------- ##
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -1286,9 +950,12 @@ func_ltwrapper_executable_p ()
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
- func_dirname_and_basename "$1" "" "."
- func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=""
+ if func_ltwrapper_executable_p "$1"; then
+ func_dirname_and_basename "$1" "" "."
+ func_stripname '' '.exe' "$func_basename_result"
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ fi
}
# func_ltwrapper_p file
@@ -1334,37 +1001,6 @@ func_source ()
}
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot. Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
- func_resolve_sysroot_result=$1
- case $func_resolve_sysroot_result in
- =*)
- func_stripname '=' '' "$func_resolve_sysroot_result"
- func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
- ;;
- esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
- case "$lt_sysroot:$1" in
- ?*:"$lt_sysroot"*)
- func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
- ;;
- *)
- # Including no sysroot.
- func_replace_sysroot_result=$1
- ;;
- esac
-}
-
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
@@ -1377,15 +1013,13 @@ func_infer_tag ()
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
- func_append_quoted CC_quoted "$arg"
+ 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 "* | " $CC_expanded "* | "$CC_expanded "* | \
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@ -1396,13 +1030,11 @@ func_infer_tag ()
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
- func_append_quoted CC_quoted "$arg"
+ 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 "* | " $CC_expanded "* | "$CC_expanded "* | \
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -1465,486 +1097,6 @@ EOF
}
}
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
- if test -n "$1"; then
- # Unfortunately, winepath does not exit with a non-zero error code, so we
- # are forced to check the contents of stdout. On the other hand, if the
- # command is not found, the shell will set an exit code of 127 and print
- # *an error message* to stdout. So we must check for both error code of
- # zero AND non-empty stdout, which explains the odd construction:
- func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
- func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
- else
- func_convert_core_file_wine_to_w32_result=
- fi
- fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
- $opt_debug
- # unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
- if test -n "$1"; then
- oldIFS=$IFS
- IFS=:
- for func_convert_core_path_wine_to_w32_f in $1; do
- IFS=$oldIFS
- func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
- if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
- else
- func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
- fi
- fi
- done
- IFS=$oldIFS
- fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
- $opt_debug
- if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
- func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
- if test "$?" -ne 0; then
- # on failure, ensure result is empty
- func_cygpath_result=
- fi
- else
- func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
- fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format. Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
- $opt_debug
- # awkward: cmd appends spaces to result
- func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
- func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback:
- func_to_host_file_result="$1"
- fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
- $opt_debug
- if test -z "$4" && test -n "$3"; then
- func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback. This is a deliberately simplistic "conversion" and
- # should not be "improved". See libtool.info.
- if test "x$1" != "x$2"; then
- lt_replace_pathsep_chars="s|$1|$2|g"
- func_to_host_path_result=`echo "$3" |
- $SED -e "$lt_replace_pathsep_chars"`
- else
- func_to_host_path_result="$3"
- fi
- fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
- $opt_debug
- case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
- ;;
- esac
- case $4 in
- $2 ) func_append func_to_host_path_result "$3"
- ;;
- esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
- $opt_debug
- $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result. If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
- $opt_debug
- case ,$2, in
- *,"$to_tool_file_cmd",*)
- func_to_tool_file_result=$1
- ;;
- *)
- $to_tool_file_cmd "$1"
- func_to_tool_file_result=$func_to_host_file_result
- ;;
- esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
- func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper. Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format. Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
- # LT_CYGPATH in this case.
- func_to_host_file_result=`cygpath -m "$1"`
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format. Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- func_convert_core_msys_to_w32 "$1"
- func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
- func_convert_core_file_wine_to_w32 "$1"
- func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format. If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-# file name conversion function : func_convert_file_X_to_Y ()
-# path conversion function : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same. If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
- $opt_debug
- if test -z "$to_host_path_cmd"; then
- func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
- fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
- $opt_debug
- func_init_to_host_path_cmd
- $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
- func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper. Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # 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_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
- func_convert_path_check : ";" \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format. Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # See func_convert_path_msys_to_w32:
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
- func_convert_path_check : ";" \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format. Requires a wine environment and
-# a working winepath. Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # See func_convert_path_msys_to_w32:
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
- func_convert_path_check : ";" \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # See func_convert_path_msys_to_w32:
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
- func_convert_path_check : : \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
- fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # 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_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
- func_convert_path_check : : \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
- fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
# func_mode_compile arg...
func_mode_compile ()
{
@@ -1985,12 +1137,12 @@ func_mode_compile ()
;;
-pie | -fpie | -fPIE)
- func_append pie_flag " $arg"
+ pie_flag="$pie_flag $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
- func_append later " $arg"
+ later="$later $arg"
continue
;;
@@ -2011,14 +1163,15 @@ func_mode_compile ()
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
- func_append_quoted lastarg "$arg"
+ func_quote_for_eval "$arg"
+ lastarg="$lastarg $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
# Add the arguments to base_compile.
- func_append base_compile " $lastarg"
+ base_compile="$base_compile $lastarg"
continue
;;
@@ -2034,7 +1187,8 @@ func_mode_compile ()
esac # case $arg_mode
# Aesthetically quote the previous argument.
- func_append_quoted base_compile "$lastarg"
+ func_quote_for_eval "$lastarg"
+ base_compile="$base_compile $func_quote_for_eval_result"
done # for arg
case $arg_mode in
@@ -2059,7 +1213,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -2134,7 +1288,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 "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@ -2165,16 +1319,17 @@ compiler."
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
- func_append removelist " $output_obj"
+ removelist="$removelist $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
- func_append removelist " $lockfile"
+ removelist="$removelist $lockfile"
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
- srcfile=$func_to_tool_file_result
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
@@ -2194,7 +1349,7 @@ compiler."
if test -z "$output_obj"; then
# Place PIC objects in $objdir
- func_append command " -o $lobj"
+ command="$command -o $lobj"
fi
func_show_eval_locale "$command" \
@@ -2241,11 +1396,11 @@ compiler."
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
- func_append command " -o $obj"
+ command="$command -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
- func_append command "$suppress_output"
+ command="$command$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
@@ -2290,13 +1445,13 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
{
# We need to display help for each of the modes.
- case $opt_mode in
+ case $mode in
"")
# Generic help is extracted from the usage comments
# at the start of this file.
@@ -2327,11 +1482,10 @@ 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 build PIC objects only
- -prefer-non-pic try to build non-PIC objects only
+ -prefer-pic try to building PIC objects only
+ -prefer-non-pic try to building 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.
@@ -2384,7 +1538,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix 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)."
@@ -2404,8 +1558,6 @@ 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)
@@ -2434,11 +1586,6 @@ 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.
@@ -2472,44 +1619,18 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode \`$mode'"
;;
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
-if $opt_help; then
- if test "$opt_help" = :; then
- func_mode_help
- else
- {
- func_help noexit
- for opt_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 opt_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
+ # Now that we've collected a possible --mode arg, show help if necessary
+ $opt_help && func_mode_help
# func_mode_execute arg...
@@ -2522,16 +1643,13 @@ func_mode_execute ()
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
- for file in $opt_dlopen; do
+ for file in $execute_dlfiles; do
test -f "$file" \
|| func_fatal_help "\`$file' is not a file"
dir=
case $file in
*.la)
- func_resolve_sysroot "$file"
- file=$func_resolve_sysroot_result
-
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -2553,7 +1671,7 @@ func_mode_execute ()
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
- func_append dir "/$objdir"
+ dir="$dir/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -2594,7 +1712,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
@@ -2610,7 +1728,8 @@ func_mode_execute ()
;;
esac
# Quote arguments (to preserve shell metacharacters).
- func_append_quoted args "$file"
+ func_quote_for_eval "$file"
+ args="$args $func_quote_for_eval_result"
done
if test "X$opt_dry_run" = Xfalse; then
@@ -2633,68 +1752,31 @@ func_mode_execute ()
exec_cmd="\$cmd$args"
else
# Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
- fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
- $opt_debug
- libs=
- libdirs=
- admincmds=
-
- for opt in "$nonopt" ${1+"$@"}
- do
- if test -d "$opt"; then
- func_append libdirs " $opt"
-
- elif test -f "$opt"; then
- if func_lalib_unsafe_p "$opt"; then
- func_append libs " $opt"
- else
- func_warning "\`$opt' is not a valid libtool archive"
- fi
-
- else
- func_fatal_error "invalid argument \`$opt'"
- fi
- done
-
- if test -n "$libs"; then
- if test -n "$lt_sysroot"; then
- sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
- sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
- else
- sysroot_cmd=
- fi
-
- # Remove sysroot references
- if $opt_dry_run; then
- for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
- done
- else
- tmpdir=`func_mktempdir`
- for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
- > $tmpdir/tmp-la
- mv -f $tmpdir/tmp-la $lib
- done
- ${RM}r "$tmpdir"
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ $ECHO "export $shlibpath_var"
fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
fi
+}
+
+test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+ $opt_debug
+ libdirs="$nonopt"
+ admincmds=
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ for dir
+ do
+ libdirs="$libdirs $dir"
+ done
+
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -2704,7 +1786,7 @@ func_mode_finish ()
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
- $opt_dry_run || eval "$cmds" || func_append admincmds "
+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds
$cmds"
fi
done
@@ -2713,55 +1795,53 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- 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:"
- if test -n "$shlibpath_var"; then
- 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"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $ECHO " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $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'"
- fi
- echo
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
+ $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:"
+ if test -n "$shlibpath_var"; then
+ $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"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
- 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) and ld.so(8) manual pages."
- ;;
- esac
- echo "----------------------------------------------------------------------"
+ $ECHO " - use the \`$flag' linker flag"
fi
+ if test -n "$admincmds"; then
+ $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'"
+ fi
+ $ECHO
+
+ $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) and ld.so(8) manual pages."
+ ;;
+ esac
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test "$mode" = finish && func_mode_finish ${1+"$@"}
# func_mode_install arg...
@@ -2772,7 +1852,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.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2786,12 +1866,7 @@ func_mode_install ()
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
- func_append install_prog "$func_quote_for_eval_result"
- install_shared_prog=$install_prog
- case " $install_prog " in
- *[\\\ /]cp\ *) install_cp=: ;;
- *) install_cp=false ;;
- esac
+ install_prog="$install_prog$func_quote_for_eval_result"
# We need to accept at least all the BSD install flags.
dest=
@@ -2801,12 +1876,10 @@ func_mode_install ()
install_type=
isdir=no
stripme=
- no_mode=:
for arg
do
- arg2=
if test -n "$dest"; then
- func_append files " $dest"
+ files="$files $dest"
dest=$arg
continue
fi
@@ -2814,9 +1887,10 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
- if $install_cp; then :; else
- prev=$arg
- fi
+ case " $install_prog " in
+ *[\\\ /]cp\ *) ;;
+ *) prev=$arg ;;
+ esac
;;
-g | -m | -o)
prev=$arg
@@ -2830,10 +1904,6 @@ 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
@@ -2844,11 +1914,7 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
- func_append install_prog " $func_quote_for_eval_result"
- if test -n "$arg2"; then
- func_quote_for_eval "$arg2"
- fi
- func_append install_shared_prog " $func_quote_for_eval_result"
+ install_prog="$install_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -2857,13 +1923,6 @@ 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"
- func_append 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"
@@ -2918,13 +1977,10 @@ func_mode_install ()
case $file in
*.$libext)
# Do the static libraries later.
- func_append staticlibs " $file"
+ staticlibs="$staticlibs $file"
;;
*.la)
- func_resolve_sysroot "$file"
- file=$func_resolve_sysroot_result
-
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
@@ -2938,23 +1994,23 @@ func_mode_install ()
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
- *) func_append current_libdirs " $libdir" ;;
+ *) current_libdirs="$current_libdirs $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
- *) func_append future_libdirs " $libdir" ;;
+ *) future_libdirs="$future_libdirs $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
- func_append dir "$objdir"
+ dir="$dir$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@ -2967,9 +2023,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@ -2987,7 +2043,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@ -3027,7 +2083,7 @@ func_mode_install ()
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
- test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
;;
*.lo)
@@ -3127,7 +2183,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e '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
@@ -3146,7 +2202,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@ -3165,7 +2221,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@ -3224,7 +2280,7 @@ func_mode_install ()
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test "$mode" = install && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3267,22 +2323,6 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
- relocations are performed -- see ld's documentation on pseudo-relocs. */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data. */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
/* External symbol declarations for the compiler. */\
"
@@ -3292,11 +2332,10 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
for progfile in $progfiles; do
- func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
- $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+ func_verbose "extracting global C symbols from \`$progfile'"
+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
done
if test -n "$exclude_expsyms"; then
@@ -3332,7 +2371,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"'
;;
@@ -3345,52 +2384,10 @@ extern \"C\" {
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
- case $host in
- *cygwin* | *mingw* | *cegcc* )
- # if an import library, we need to obtain dlname
- if func_win32_import_lib_p "$dlprefile"; then
- func_tr_sh "$dlprefile"
- eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
- if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
- # Use subshell, to avoid clobbering current variable values
- dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- if test -n "$dlprefile_dlname" ; then
- func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
- else
- # no lafile. user explicitly requested -dlpreopen <import library>.
- $sharedlib_from_linklib_cmd "$dlprefile"
- dlprefile_dlbasename=$sharedlib_from_linklib_result
- fi
- fi
- $opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
- eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
- else
- func_warning "Could not compute DLL name from $name"
- eval '$ECHO ": $name " >> "$nlist"'
- fi
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
- $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
- }
- else # not an import lib
- $opt_dry_run || {
- eval '$ECHO ": $name " >> "$nlist"'
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- }
- fi
- ;;
- *)
- $opt_dry_run || {
- eval '$ECHO ": $name " >> "$nlist"'
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- }
- ;;
- esac
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
done
$opt_dry_run || {
@@ -3418,19 +2415,36 @@ 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 {
const char *name;
void *address;
} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
+"
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ $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. */"
+ lt_dlsym_const= ;;
+ *osf5*)
+ echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+ lt_dlsym_const= ;;
+ *)
+ lt_dlsym_const=const ;;
+ esac
+
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
+$lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
@@ -3443,7 +2457,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}
};
@@ -3486,7 +2500,7 @@ static const void *lt_preloaded_setup() {
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
- *) func_append symtab_cflags " $arg" ;;
+ *) symtab_cflags="$symtab_cflags $arg" ;;
esac
done
@@ -3501,16 +2515,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 "$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%"`
+ 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%"`
else
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
@@ -3524,8 +2538,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
- compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
}
@@ -3535,7 +2549,6 @@ 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
@@ -3546,11 +2559,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 (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e '
1,100{
/ I /{
@@ -3579,131 +2590,6 @@ func_win32_libid ()
$ECHO "$win32_libid_type"
}
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-# $sharedlib_from_linklib_cmd
-# Result is available in the variable
-# $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
- $opt_debug
- sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
- $opt_debug
- match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
- $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
- $SED '/^Contents of section '"$match_literal"':/{
- # Place marker at beginning of archive member dllname section
- s/.*/====MARK====/
- p
- d
- }
- # These lines can sometimes be longer than 43 characters, but
- # are always uninteresting
- /:[ ]*file format pe[i]\{,1\}-/d
- /^In archive [^:]*:/d
- # Ensure marker is printed
- /^====MARK====/p
- # Remove all lines with less than 43 characters
- /^.\{43\}/!d
- # From remaining lines, remove first 43 characters
- s/^.\{43\}//' |
- $SED -n '
- # Join marker and all lines until next marker into a single line
- /^====MARK====/ b para
- H
- $ b para
- b
- :para
- x
- s/\n//g
- # Remove the marker
- s/^====MARK====//
- # Remove trailing dots and whitespace
- s/[\. \t]*$//
- # Print
- /./p' |
- # we now have a list, one entry per line, of the stringified
- # contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
- # a '.' (that is, objdump's representation of an unprintable
- # character.) This should work for all archives with less than
- # 0x302f exports -- but will fail for DLLs whose name actually
- # begins with a literal '.' or a single character followed by
- # a '.'.
- #
- # Of those that remain, print the first one.
- $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-# $sharedlib_from_linklib_cmd
-# Result is available in the variable
-# $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
- # binutils import library
- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
- # ms-generated import library
- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
- else
- # unknown
- sharedlib_from_linklib_result=""
- fi
-}
# func_extract_an_archive dir oldlib
@@ -3712,18 +2598,7 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
- 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
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -3794,7 +2669,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
@@ -3809,30 +2684,25 @@ 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 | sort | $NL2SP`
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
-# 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.
+
+# func_emit_wrapper_part1 [arg=no]
#
-# 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 ()
+# 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 ()
{
- func_emit_wrapper_arg1=${1-no}
+ func_emit_wrapper_part1_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_part1_arg1=$1
+ fi
$ECHO "\
#! $SHELL
@@ -3848,6 +2718,7 @@ func_emit_wrapper ()
# 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
@@ -3878,132 +2749,31 @@ 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
- 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 ()
-{
-"
- 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+\"\$@\"}
+ 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\
"
- ;;
- 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+\"\$@\"}
+ $ECHO "\
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e '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 \"\$file\" | $SED 's%/[^/]*\$%%'\`
+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
@@ -4013,13 +2783,30 @@ func_exec_program ()
esac
fi
- file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+ file=\`\$ECHO \"X\$file\" | \$Xsed -e '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_arg1
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
@@ -4027,7 +2814,7 @@ func_exec_program ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
@@ -4082,18 +2869,6 @@ func_exec_program ()
if test -f \"\$progdir/\$program\"; then"
- # fixup the dll searchpath if we need to.
- #
- # Fix the DLL searchpath if we need to. Do this before prepending
- # to shlibpath, because on Windows, both are PATH and uninstalled
- # libraries must come first.
- if test -n "$dllsearchpath"; then
- $ECHO "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
-"
- fi
-
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
@@ -4102,28 +2877,253 @@ func_exec_program ()
# 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 \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
export $shlibpath_var
"
fi
+ # fixup the dll searchpath if we need to.
+ if test -n "$dllsearchpath"; then
+ $ECHO "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
- func_exec_program \${1+\"\$@\"}
+"
+ 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
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
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+# $build $host
+# mingw (msys) mingw [e.g. native]
+# cygwin mingw
+# *nix + wine mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin. Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+ func_to_host_path_result="$1"
+ 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"`
+ ;;
+ *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"`
+ ;;
+ * )
+ # Unfortunately, winepath does not exit with a non-zero
+ # error code, so we are forced to check the contents of
+ # stdout. On the other hand, if the command is not
+ # found, the shell will set an exit code of 127 and print
+ # *an error message* to stdout. So we must check for both
+ # error code of zero AND non-empty stdout, which explains
+ # 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" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ # Allow warning below.
+ 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 "Continuing, but uninstalled executables may not work."
+ # Fallback:
+ func_to_host_path_result="$1"
+ fi
+ ;;
+ esac
+ fi
+}
+# end: func_to_host_path
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+# $build $host
+# mingw (msys) mingw [e.g. native]
+# cygwin mingw
+# *nix + wine mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+ func_to_host_pathlist_result="$1"
+ 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|:*$||'`
+ 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"`
+ ;;
+ *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" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ * )
+ # unfortunately, winepath doesn't convert pathlists
+ func_to_host_pathlist_result=""
+ func_to_host_pathlist_oldIFS=$IFS
+ IFS=:
+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+ IFS=$func_to_host_pathlist_oldIFS
+ if test -n "$func_to_host_pathlist_f" ; then
+ func_to_host_path "$func_to_host_pathlist_f"
+ if test -n "$func_to_host_path_result" ; then
+ 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"
+ fi
+ fi
+ fi
+ IFS=:
+ done
+ IFS=$func_to_host_pathlist_oldIFS
+ ;;
+ esac
+ 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 "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
+ # below, but for the user to provide a working wine installation
+ # with winepath so that path translation in the cross-to-mingw
+ # case works properly.
+ lt_replace_pathsep_nix_to_dos="s|:|;|g"
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+ $SED -e "$lt_replace_pathsep_nix_to_dos"`
+ fi
+ # Now, add the leading and trailing path separators back
+ case "$1" in
+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+ ;;
+ esac
+ case "$1" in
+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+}
+# end: func_to_host_pathlist
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
@@ -4141,23 +3141,31 @@ 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>
@@ -4169,44 +3177,6 @@ EOF
#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)
@@ -4222,7 +3192,14 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
-/* path handling portability macros */
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+# define intptr_t int
+# endif
+#endif
+
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
@@ -4253,6 +3230,10 @@ 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
@@ -4265,13 +3246,22 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
+#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);
+}
#else
-static int lt_debug = 0;
+# define LTWRAPPER_DEBUGPRINTF(args)
#endif
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+const char *program_name = NULL;
void *xmalloc (size_t num);
char *xstrdup (const char *string);
@@ -4281,27 +3271,41 @@ 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_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_fatal (const char *message, ...);
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);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
+
+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 =
EOF
+ func_emit_wrapper_part2 yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ "/' -e 's/$/\\n"/'
+ echo ";"
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- func_to_host_path "$temp_rpath"
+ func_to_host_pathlist "$temp_rpath"
cat <<EOF
-const char * LIB_PATH_VALUE = "$func_to_host_path_result";
+const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
EOF
else
cat <<"EOF"
@@ -4310,10 +3314,10 @@ EOF
fi
if test -n "$dllsearchpath"; then
- func_to_host_path "$dllsearchpath:"
+ func_to_host_pathlist "$dllsearchpath:"
cat <<EOF
const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE = "$func_to_host_path_result";
+const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
EOF
else
cat <<"EOF"
@@ -4336,10 +3340,24 @@ 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 char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
+
+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 */
int
main (int argc, char *argv[])
@@ -4356,13 +3374,10 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
- /* 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;
+ /* very simple arg parsing; don't want to rely on getopt */
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -4376,57 +3391,25 @@ EOF
esac
cat <<"EOF"
- lt_dump_script (stdout);
+ printf ("%s", script_text_part1);
+ printf ("%s", script_text_part2);
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 (__FILE__, __LINE__, "couldn't find %s", argv[0]);
- lt_debugprintf (__FILE__, __LINE__,
- "(main) found exe (before symlink chase) at: %s\n",
- tmp_pathspec);
+ lt_fatal ("Couldn't find %s", argv[0]);
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+ tmp_pathspec));
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- lt_debugprintf (__FILE__, __LINE__,
- "(main) found exe (after symlink chase) at: %s\n",
- actual_cwrapper_path);
+ LTWRAPPER_DEBUGPRINTF (("(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 */
@@ -4444,9 +3427,8 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
- lt_debugprintf (__FILE__, __LINE__,
- "(main) libtool target name: %s\n",
- target_name);
+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+ target_name));
EOF
cat <<EOF
@@ -4496,19 +3478,80 @@ EOF
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
- /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
- be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
- because on Windows, both *_VARNAMEs are PATH but uninstalled
- libraries must come first. */
- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
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;
- lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
- nonnull (lt_argv_zero));
+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
for (i = 0; i < newargc; i++)
{
- lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
- i, nonnull (newargz[i]));
+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
}
EOF
@@ -4517,14 +3560,11 @@ 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 */
- lt_debugprintf (__FILE__, __LINE__,
- "(main) failed to launch target \"%s\": %s\n",
- lt_argv_zero, nonnull (strerror (errno)));
+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
return 127;
}
return rval;
@@ -4546,7 +3586,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
- lt_fatal (__FILE__, __LINE__, "memory exhausted");
+ lt_fatal ("Memory exhausted");
return p;
}
@@ -4580,8 +3620,8 @@ check_executable (const char *path)
{
struct stat st;
- lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
- nonempty (path));
+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
if ((!path) || (!*path))
return 0;
@@ -4598,8 +3638,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
- lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
- nonempty (path));
+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
if ((!path) || (!*path))
return 0;
@@ -4625,8 +3665,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
- lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
- nonempty (wrapper));
+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
@@ -4679,8 +3719,7 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
- nonnull (strerror (errno)));
+ lt_fatal ("getcwd failed");
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -4705,8 +3744,7 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
- nonnull (strerror (errno)));
+ lt_fatal ("getcwd failed");
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
@@ -4732,9 +3770,8 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
- lt_debugprintf (__FILE__, __LINE__,
- "checking path component for symlinks: %s\n",
- tmp_pathspec);
+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+ tmp_pathspec));
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
@@ -4756,9 +3793,8 @@ chase_symlinks (const char *pathspec)
}
else
{
- lt_fatal (__FILE__, __LINE__,
- "error accessing file \"%s\": %s",
- tmp_pathspec, nonnull (strerror (errno)));
+ char *errstr = strerror (errno);
+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
}
}
XFREE (tmp_pathspec);
@@ -4771,8 +3807,7 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
- lt_fatal (__FILE__, __LINE__,
- "could not follow symlinks for %s", pathspec);
+ lt_fatal ("Could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
@@ -4798,25 +3833,11 @@ 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 *file,
- int line, const char *mode,
+lt_error_core (int exit_status, const char *mode,
const char *message, va_list ap)
{
- fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+ fprintf (stderr, "%s: %s: ", program_name, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
@@ -4825,32 +3846,20 @@ lt_error_core (int exit_status, const char *file,
}
void
-lt_fatal (const char *file, int line, const char *message, ...)
+lt_fatal (const char *message, ...)
{
va_list ap;
va_start (ap, message);
- lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+ lt_error_core (EXIT_FAILURE, "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)
{
- lt_debugprintf (__FILE__, __LINE__,
- "(lt_setenv) setting '%s' to '%s'\n",
- nonnull (name), nonnull (value));
+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
@@ -4895,12 +3904,95 @@ 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)
{
- lt_debugprintf (__FILE__, __LINE__,
- "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- nonnull (name), nonnull (value));
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
if (name && *name && value && *value)
{
@@ -4919,9 +4011,9 @@ lt_update_exe_path (const char *name, const char *value)
void
lt_update_lib_path (const char *name, const char *value)
{
- lt_debugprintf (__FILE__, __LINE__,
- "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- nonnull (name), nonnull (value));
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
if (name && *name && value && *value)
{
@@ -4931,152 +4023,11 @@ 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 ()
{
@@ -5121,7 +4072,6 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
- bindir=
dlfiles=
dlprefiles=
dlself=no
@@ -5214,11 +4164,6 @@ 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.
@@ -5250,9 +4195,9 @@ func_mode_link ()
;;
*)
if test "$prev" = dlfiles; then
- func_append dlfiles " $arg"
+ dlfiles="$dlfiles $arg"
else
- func_append dlprefiles " $arg"
+ dlprefiles="$dlprefiles $arg"
fi
prev=
continue
@@ -5276,7 +4221,7 @@ func_mode_link ()
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
- *) func_append deplibs " $qarg.ltframework" # this is fixed later
+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
;;
esac
;;
@@ -5295,7 +4240,7 @@ func_mode_link ()
moreargs=
for fil in `cat "$save_arg"`
do
-# func_append moreargs " $fil"
+# moreargs="$moreargs $fil"
arg=$fil
# A libtool-controlled object.
@@ -5324,7 +4269,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- func_append dlfiles " $pic_object"
+ dlfiles="$dlfiles $pic_object"
prev=
continue
else
@@ -5336,7 +4281,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- func_append dlprefiles " $pic_object"
+ dlprefiles="$dlprefiles $pic_object"
prev=
fi
@@ -5406,12 +4351,12 @@ func_mode_link ()
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
- *) func_append rpath " $arg" ;;
+ *) rpath="$rpath $arg" ;;
esac
else
case "$xrpath " in
*" $arg "*) ;;
- *) func_append xrpath " $arg" ;;
+ *) xrpath="$xrpath $arg" ;;
esac
fi
prev=
@@ -5423,28 +4368,28 @@ func_mode_link ()
continue
;;
weak)
- func_append weak_libs " $arg"
+ weak_libs="$weak_libs $arg"
prev=
continue
;;
xcclinker)
- func_append linker_flags " $qarg"
- func_append compiler_flags " $qarg"
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xcompiler)
- func_append compiler_flags " $qarg"
+ compiler_flags="$compiler_flags $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xlinker)
- func_append linker_flags " $qarg"
- func_append compiler_flags " $wl$qarg"
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $wl$qarg"
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
@@ -5480,11 +4425,6 @@ func_mode_link ()
continue
;;
- -bindir)
- prev=bindir
- continue
- ;;
-
-dlopen)
prev=dlfiles
continue
@@ -5535,16 +4475,15 @@ func_mode_link ()
;;
-L*)
- func_stripname "-L" '' "$arg"
- if test -z "$func_stripname_result"; then
+ func_stripname '-L' '' "$arg"
+ dir=$func_stripname_result
+ if test -z "$dir"; then
if test "$#" -gt 0; then
func_fatal_error "require no space between \`-L' and \`$1'"
else
func_fatal_error "need path for \`-L' option"
fi
fi
- func_resolve_sysroot "$func_stripname_result"
- dir=$func_resolve_sysroot_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -5556,30 +4495,24 @@ func_mode_link ()
;;
esac
case "$deplibs " in
- *" -L$dir "* | *" $arg "*)
- # Will only happen for absolute or sysroot arguments
- ;;
+ *" -L$dir "*) ;;
*)
- # Preserve sysroot, but never include relative directories
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
- *) func_append deplibs " -L$dir" ;;
- esac
- func_append lib_search_path " $dir"
+ deplibs="$deplibs -L$dir"
+ lib_search_path="$lib_search_path $dir"
;;
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
- *) func_append dllsearchpath ":$dir";;
+ *) dllsearchpath="$dllsearchpath:$dir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) func_append dllsearchpath ":$testbindir";;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
esac
;;
esac
@@ -5589,7 +4522,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* | *-*-haiku*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -5603,7 +4536,7 @@ func_mode_link ()
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- func_append deplibs " System.ltframework"
+ deplibs="$deplibs System.ltframework"
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
@@ -5623,7 +4556,7 @@ func_mode_link ()
;;
esac
fi
- func_append deplibs " $arg"
+ deplibs="$deplibs $arg"
continue
;;
@@ -5635,8 +4568,8 @@ func_mode_link ()
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
- -model|-arch|-isysroot|--sysroot)
- func_append compiler_flags " $arg"
+ -model|-arch|-isysroot)
+ compiler_flags="$compiler_flags $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
@@ -5644,12 +4577,12 @@ func_mode_link ()
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- func_append compiler_flags " $arg"
+ compiler_flags="$compiler_flags $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
case "$new_inherited_linker_flags " in
*" $arg "*) ;;
- * ) func_append new_inherited_linker_flags " $arg" ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
esac
continue
;;
@@ -5716,17 +4649,13 @@ func_mode_link ()
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
- =*)
- func_stripname '=' '' "$dir"
- dir=$lt_sysroot$func_stripname_result
- ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
*" $dir "*) ;;
- *) func_append xrpath " $dir" ;;
+ *) xrpath="$xrpath $dir" ;;
esac
continue
;;
@@ -5779,8 +4708,8 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- func_append arg " $func_quote_for_eval_result"
- func_append compiler_flags " $func_quote_for_eval_result"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -5795,9 +4724,9 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- func_append arg " $wl$func_quote_for_eval_result"
- func_append compiler_flags " $wl$func_quote_for_eval_result"
- func_append linker_flags " $func_quote_for_eval_result"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+ linker_flags="$linker_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -5825,27 +4754,23 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
- # 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
- # --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -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
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
func_append finalize_command " $arg"
- func_append compiler_flags " $arg"
+ compiler_flags="$compiler_flags $arg"
continue
;;
@@ -5857,7 +4782,7 @@ func_mode_link ()
*.$objext)
# A standard object.
- func_append objs " $arg"
+ objs="$objs $arg"
;;
*.lo)
@@ -5888,7 +4813,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- func_append dlfiles " $pic_object"
+ dlfiles="$dlfiles $pic_object"
prev=
continue
else
@@ -5900,7 +4825,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- func_append dlprefiles " $pic_object"
+ dlprefiles="$dlprefiles $pic_object"
prev=
fi
@@ -5945,25 +4870,24 @@ func_mode_link ()
*.$libext)
# An archive.
- func_append deplibs " $arg"
- func_append old_deplibs " $arg"
+ deplibs="$deplibs $arg"
+ old_deplibs="$old_deplibs $arg"
continue
;;
*.la)
# A libtool-controlled library.
- func_resolve_sysroot "$arg"
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
- func_append dlfiles " $func_resolve_sysroot_result"
+ dlfiles="$dlfiles $arg"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
- func_append dlprefiles " $func_resolve_sysroot_result"
+ dlprefiles="$dlprefiles $arg"
prev=
else
- func_append deplibs " $func_resolve_sysroot_result"
+ deplibs="$deplibs $arg"
fi
continue
;;
@@ -6001,7 +4925,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
else
shlib_search_path=
fi
@@ -6010,8 +4934,6 @@ func_mode_link ()
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
- func_to_tool_file "$output_objdir/"
- tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
func_mkdir_p "$output_objdir"
@@ -6032,12 +4954,12 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append libs " $deplib"
+ libs="$libs $deplib"
done
if test "$linkmode" = lib; then
@@ -6050,9 +4972,9 @@ func_mode_link ()
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
- *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
esac
- func_append pre_post_deps " $pre_post_dep"
+ pre_post_deps="$pre_post_deps $pre_post_dep"
done
fi
pre_post_deps=
@@ -6119,19 +5041,17 @@ func_mode_link ()
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
- func_resolve_sysroot "$lib"
case $lib in
- *.la) func_source "$func_resolve_sysroot_result" ;;
+ *.la) func_source "$lib" ;;
esac
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
- func_basename "$deplib"
- deplib_base=$func_basename_result
+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
case " $weak_libs " in
*" $deplib_base "*) ;;
- *) func_append deplibs " $deplib" ;;
+ *) deplibs="$deplibs $deplib" ;;
esac
done
done
@@ -6152,11 +5072,11 @@ func_mode_link ()
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- func_append compiler_flags " $deplib"
+ compiler_flags="$compiler_flags $deplib"
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) func_append new_inherited_linker_flags " $deplib" ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
esac
fi
fi
@@ -6241,7 +5161,7 @@ func_mode_link ()
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) func_append new_inherited_linker_flags " $deplib" ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
esac
fi
fi
@@ -6254,8 +5174,7 @@ func_mode_link ()
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- func_append newlib_search_path " $func_resolve_sysroot_result"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
prog)
if test "$pass" = conv; then
@@ -6269,8 +5188,7 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- func_append newlib_search_path " $func_resolve_sysroot_result"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
*)
func_warning "\`-L' is ignored for archives/objects"
@@ -6281,21 +5199,17 @@ func_mode_link ()
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- dir=$func_resolve_sysroot_result
+ dir=$func_stripname_result
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
- *) func_append xrpath " $dir" ;;
+ *) xrpath="$xrpath $dir" ;;
esac
fi
deplibs="$deplib $deplibs"
continue
;;
- *.la)
- func_resolve_sysroot "$deplib"
- lib=$func_resolve_sysroot_result
- ;;
+ *.la) lib="$deplib" ;;
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
@@ -6313,7 +5227,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -6323,15 +5237,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"
@@ -6358,11 +5272,11 @@ func_mode_link ()
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
- func_append newdlprefiles " $deplib"
+ newdlprefiles="$newdlprefiles $deplib"
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- func_append newdlfiles " $deplib"
+ newdlfiles="$newdlfiles $deplib"
fi
fi
continue
@@ -6404,20 +5318,20 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e '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 "*) ;;
- *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
esac
done
fi
- dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
- test -n "$dlopen" && func_append dlfiles " $dlopen"
- test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
fi
if test "$pass" = conv; then
@@ -6428,20 +5342,20 @@ func_mode_link ()
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
- func_append convenience " $ladir/$objdir/$old_library"
- func_append old_convenience " $ladir/$objdir/$old_library"
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
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_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append tmp_libs " $deplib"
+ tmp_libs="$tmp_libs $deplib"
done
continue
fi # $pass = conv
@@ -6449,15 +5363,9 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
- if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
- linklib=$old_library
- else
- for l in $old_library $library_names; do
- linklib="$l"
- done
- fi
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
@@ -6474,9 +5382,9 @@ func_mode_link ()
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
- func_append dlprefiles " $lib $dependency_libs"
+ dlprefiles="$dlprefiles $lib $dependency_libs"
else
- func_append newdlfiles " $lib"
+ newdlfiles="$newdlfiles $lib"
fi
continue
fi # $pass = dlopen
@@ -6498,14 +5406,14 @@ func_mode_link ()
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
- if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
func_warning "library \`$lib' was moved."
dir="$ladir"
absdir="$abs_ladir"
libdir="$abs_ladir"
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir="$libdir"
+ absdir="$libdir"
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
@@ -6513,12 +5421,12 @@ func_mode_link ()
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
- func_append notinst_path " $abs_ladir"
+ notinst_path="$notinst_path $abs_ladir"
else
dir="$ladir/$objdir"
absdir="$abs_ladir/$objdir"
# Remove this search path later
- func_append notinst_path " $abs_ladir"
+ notinst_path="$notinst_path $abs_ladir"
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
@@ -6529,46 +5437,20 @@ func_mode_link ()
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
- case "$host" in
- # special handling for platforms with PE-DLLs.
- *cygwin* | *mingw* | *cegcc* )
- # Linker will automatically link against shared library if both
- # static and shared are present. Therefore, ensure we extract
- # symbols from the import library if a shared library is present
- # (otherwise, the dlopen module name will be incorrect). We do
- # this by putting the import library name into $newdlprefiles.
- # We recover the dlopen module name by 'saving' the la file
- # name in a special purpose variable, and (later) extracting the
- # dlname from the la file.
- if test -n "$dlname"; then
- func_tr_sh "$dir/$linklib"
- eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
- func_append newdlprefiles " $dir/$linklib"
- else
- func_append newdlprefiles " $dir/$old_library"
- # Keep a list of preopened convenience libraries to check
- # that they are being used correctly in the link pass.
- test -z "$libdir" && \
- func_append dlpreconveniencelibs " $dir/$old_library"
- fi
- ;;
- * )
- # Prefer using a static library (so that no silly _DYNAMIC symbols
- # are required to link).
- if test -n "$old_library"; then
- func_append newdlprefiles " $dir/$old_library"
- # Keep a list of preopened convenience libraries to check
- # that they are being used correctly in the link pass.
- test -z "$libdir" && \
- func_append dlpreconveniencelibs " $dir/$old_library"
- # Otherwise, use the dlname, so that lt_dlopen finds it.
- elif test -n "$dlname"; then
- func_append newdlprefiles " $dir/$dlname"
- else
- func_append newdlprefiles " $dir/$linklib"
- fi
- ;;
- esac
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ newdlprefiles="$newdlprefiles $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
+ elif test -n "$dlname"; then
+ newdlprefiles="$newdlprefiles $dir/$dlname"
+ else
+ newdlprefiles="$newdlprefiles $dir/$linklib"
+ fi
fi # $pass = dlpreopen
if test -z "$libdir"; then
@@ -6586,7 +5468,7 @@ func_mode_link ()
if test "$linkmode" = prog && test "$pass" != link; then
- func_append newlib_search_path " $ladir"
+ newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
linkalldeplibs=no
@@ -6599,8 +5481,7 @@ func_mode_link ()
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- func_append newlib_search_path " $func_resolve_sysroot_result"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
esac
# Need to link against all dependency_libs?
@@ -6611,12 +5492,12 @@ func_mode_link ()
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append tmp_libs " $deplib"
+ tmp_libs="$tmp_libs $deplib"
done # for deplib
continue
fi # $linkmode = prog...
@@ -6631,7 +5512,7 @@ func_mode_link ()
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
- *) func_append temp_rpath "$absdir:" ;;
+ *) temp_rpath="$temp_rpath$absdir:" ;;
esac
fi
@@ -6643,7 +5524,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) func_append compile_rpath " $absdir" ;;
+ *) compile_rpath="$compile_rpath $absdir"
esac
;;
esac
@@ -6652,7 +5533,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
esac
;;
esac
@@ -6677,12 +5558,12 @@ func_mode_link ()
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
- func_append notinst_deplibs " $lib"
+ notinst_deplibs="$notinst_deplibs $lib"
need_relink=no
;;
*)
if test "$installed" = no; then
- func_append notinst_deplibs " $lib"
+ notinst_deplibs="$notinst_deplibs $lib"
need_relink=yes
fi
;;
@@ -6699,7 +5580,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
@@ -6717,7 +5598,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) func_append compile_rpath " $absdir" ;;
+ *) compile_rpath="$compile_rpath $absdir"
esac
;;
esac
@@ -6726,7 +5607,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
esac
;;
esac
@@ -6780,7 +5661,7 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test "$linkmode" = prog || test "$mode" != relink; then
add_shlibpath=
add_dir=
add=
@@ -6802,9 +5683,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
@@ -6836,7 +5717,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- func_append add_dir " -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -6858,7 +5739,7 @@ func_mode_link ()
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
- *) func_append compile_shlibpath "$add_shlibpath:" ;;
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
esac
fi
if test "$linkmode" = prog; then
@@ -6872,13 +5753,13 @@ func_mode_link ()
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) func_append finalize_shlibpath "$libdir:" ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
esac
fi
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test "$linkmode" = prog || test "$mode" = relink; then
add_shlibpath=
add_dir=
add=
@@ -6892,7 +5773,7 @@ func_mode_link ()
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) func_append finalize_shlibpath "$libdir:" ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -6909,7 +5790,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- func_append add_dir " -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -6944,21 +5825,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
@@ -6986,46 +5867,37 @@ func_mode_link ()
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
- *) func_append xrpath " $temp_xrpath";;
+ *) xrpath="$xrpath $temp_xrpath";;
esac;;
- *) func_append temp_deplibs " $libdir";;
+ *) temp_deplibs="$temp_deplibs $libdir";;
esac
done
dependency_libs="$temp_deplibs"
fi
- func_append newlib_search_path " $absdir"
+ newlib_search_path="$newlib_search_path $absdir"
# Link against this library
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
- case $deplib in
- -L*) func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result";;
- *) func_resolve_sysroot "$deplib" ;;
- esac
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
- *" $func_resolve_sysroot_result "*)
- func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append tmp_libs " $func_resolve_sysroot_result"
+ tmp_libs="$tmp_libs $deplib"
done
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
- path=
case $deplib in
-L*) path="$deplib" ;;
*.la)
- func_resolve_sysroot "$deplib"
- deplib=$func_resolve_sysroot_result
func_dirname "$deplib" "" "."
- dir=$func_dirname_result
+ dir="$func_dirname_result"
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -7052,8 +5924,8 @@ func_mode_link ()
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
path=
fi
fi
@@ -7086,7 +5958,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 " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
@@ -7103,7 +5975,7 @@ func_mode_link ()
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
- *) func_append lib_search_path " $dir" ;;
+ *) lib_search_path="$lib_search_path $dir" ;;
esac
done
newlib_search_path=
@@ -7161,10 +6033,10 @@ func_mode_link ()
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
- *) func_append tmp_libs " $deplib" ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
esac
;;
- *) func_append tmp_libs " $deplib" ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
esac
done
eval $var=\"$tmp_libs\"
@@ -7180,7 +6052,7 @@ func_mode_link ()
;;
esac
if test -n "$i" ; then
- func_append tmp_libs " $i"
+ tmp_libs="$tmp_libs $i"
fi
done
dependency_libs=$tmp_libs
@@ -7221,7 +6093,7 @@ func_mode_link ()
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
- func_append objs "$old_deplibs"
+ objs="$objs$old_deplibs"
;;
lib)
@@ -7254,10 +6126,10 @@ 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!"
- func_append libobjs " $objs"
+ libobjs="$libobjs $objs"
fi
fi
@@ -7322,7 +6194,7 @@ func_mode_link ()
age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
+ freebsd-aout|freebsd-elf|sunos)
current="$number_major"
revision="$number_minor"
age="0"
@@ -7455,7 +6327,7 @@ func_mode_link ()
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ verstring="$verstring:${current}.0"
;;
qnx)
@@ -7523,10 +6395,10 @@ func_mode_link ()
fi
func_generate_dlsyms "$libname" "$libname" "yes"
- func_append libobjs " $symfileobj"
+ libobjs="$libobjs $symfileobj"
test "X$libobjs" = "X " && libobjs=
- if test "$opt_mode" != relink; then
+ if test "$mode" != relink; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7542,7 +6414,7 @@ func_mode_link ()
continue
fi
fi
- func_append removelist " $p"
+ removelist="$removelist $p"
;;
*) ;;
esac
@@ -7553,28 +6425,27 @@ func_mode_link ()
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- func_append oldlibs " $output_objdir/$libname.$libext"
+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
- # 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"`
+ # 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"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
temp_xrpath=
for libdir in $xrpath; do
- func_replace_sysroot "$libdir"
- func_append temp_xrpath " -R$func_replace_sysroot_result"
+ temp_xrpath="$temp_xrpath -R$libdir"
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -7588,7 +6459,7 @@ func_mode_link ()
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
- *) func_append dlfiles " $lib" ;;
+ *) dlfiles="$dlfiles $lib" ;;
esac
done
@@ -7598,19 +6469,19 @@ func_mode_link ()
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
- *) func_append dlprefiles " $lib" ;;
+ *) dlprefiles="$dlprefiles $lib" ;;
esac
done
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
- func_append deplibs " System.ltframework"
+ deplibs="$deplibs System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
@@ -7627,7 +6498,7 @@ func_mode_link ()
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
- func_append deplibs " -lc"
+ deplibs="$deplibs -lc"
fi
;;
esac
@@ -7676,7 +6547,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
i=""
;;
esac
@@ -7687,21 +6558,21 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- func_append newdeplibs " $i"
+ 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
;;
*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
;;
esac
done
@@ -7719,7 +6590,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
i=""
;;
esac
@@ -7730,29 +6601,29 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- func_append newdeplibs " $i"
+ 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
;;
*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
;;
esac
done
@@ -7769,27 +6640,15 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
;;
esac
fi
if test -n "$a_deplib" ; then
libname=`eval "\\$ECHO \"$libname_spec\""`
- if test -n "$file_magic_glob"; then
- libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
- else
- libnameglob=$libname
- fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
- shopt -s nocaseglob
- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- $nocaseglob
- else
- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- fi
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
@@ -7806,13 +6665,13 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
fi
@@ -7821,12 +6680,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
@@ -7837,7 +6696,7 @@ EOF
;;
*)
# Add a -L argument.
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
;;
esac
done # Gone through all deplibs.
@@ -7853,7 +6712,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
;;
esac
@@ -7864,9 +6723,9 @@ 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 \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
fi
@@ -7875,12 +6734,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
@@ -7891,32 +6750,32 @@ EOF
;;
*)
# Add a -L argument.
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
;;
esac
done # Gone through all deplibs.
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+ -e 's/ -lc$//' -e '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 " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
done
fi
- case $tmp_deplibs in
- *[!\ \ ]*)
- echo
+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
+ $GREP . >/dev/null; then
+ $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
- ;;
- esac
+ fi
;;
esac
versuffix=$versuffix_save
@@ -7928,23 +6787,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
- newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e '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"
@@ -7954,16 +6813,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
@@ -7980,9 +6839,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
- 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'`
+ 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'`
;;
esac
@@ -7995,7 +6854,7 @@ EOF
*)
case " $deplibs " in
*" -L$path/$objdir "*)
- func_append new_libs " -L$path/$objdir" ;;
+ new_libs="$new_libs -L$path/$objdir" ;;
esac
;;
esac
@@ -8005,10 +6864,10 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
done
deplibs="$new_libs"
@@ -8025,12 +6884,10 @@ EOF
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
- func_replace_sysroot "$libdir"
- libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
@@ -8039,18 +6896,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- func_append dep_rpath " $flag"
+ dep_rpath="$dep_rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
esac
fi
done
@@ -8068,7 +6925,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- func_append rpath "$dir:"
+ rpath="$rpath$dir:"
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
@@ -8076,7 +6933,7 @@ EOF
fi
shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8102,18 +6959,18 @@ EOF
linknames=
for link
do
- func_append linknames " $link"
+ linknames="$linknames $link"
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
export_symbols="$output_objdir/$libname.uexp"
- func_append delfiles " $export_symbols"
+ delfiles="$delfiles $export_symbols"
fi
orig_export_symbols=
@@ -8144,45 +7001,13 @@ EOF
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
- for cmd1 in $cmds; do
+ for cmd in $cmds; do
IFS="$save_ifs"
- # Take the normal branch if the nm_file_list_spec branch
- # doesn't work or if tool conversion is not needed.
- case $nm_file_list_spec~$to_tool_file_cmd in
- *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
- try_normal_branch=yes
- eval cmd=\"$cmd1\"
- func_len " $cmd"
- len=$func_len_result
- ;;
- *)
- try_normal_branch=no
- ;;
- esac
- if test "$try_normal_branch" = yes \
- && { test "$len" -lt "$max_cmd_len" \
- || test "$max_cmd_len" -le -1; }
- then
- func_show_eval "$cmd" 'exit $?'
- skipped_export=false
- elif test -n "$nm_file_list_spec"; then
- func_basename "$output"
- output_la=$func_basename_result
- save_libobjs=$libobjs
- save_output=$output
- output=${output_objdir}/${output_la}.nm
- func_to_tool_file "$output"
- libobjs=$nm_file_list_spec$func_to_tool_file_result
- func_append delfiles " $output"
- func_verbose "creating $NM input file list: $output"
- for obj in $save_libobjs; do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result"
- done > "$output"
- eval cmd=\"$cmd1\"
+ eval cmd=\"$cmd\"
+ func_len " $cmd"
+ len=$func_len_result
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
func_show_eval "$cmd" 'exit $?'
- output=$save_output
- libobjs=$save_libobjs
skipped_export=false
else
# The command line is too long to execute in one step.
@@ -8204,7 +7029,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 "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -8216,7 +7041,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -8226,7 +7051,7 @@ EOF
case " $convenience " in
*" $test_deplib "*) ;;
*)
- func_append tmp_deplibs " $test_deplib"
+ tmp_deplibs="$tmp_deplibs $test_deplib"
;;
esac
done
@@ -8246,21 +7071,21 @@ EOF
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $convenience
- func_append libobjs " $func_extract_archives_result"
+ libobjs="$libobjs $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
- func_append linker_flags " $flag"
+ linker_flags="$linker_flags $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
@@ -8305,8 +7130,7 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
- func_basename "$output"
- output_la=$func_basename_result
+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
# Clear the reloadable object creation command queue and
# initialize k to one.
@@ -8319,16 +7143,13 @@ 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
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result" >> $output
+ $ECHO "$obj" >> $output
done
- echo ')' >> $output
- func_append delfiles " $output"
- func_to_tool_file "$output"
- output=$func_to_tool_file_result
+ $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
func_verbose "creating linker input file list: $output"
@@ -8342,12 +7163,10 @@ EOF
fi
for obj
do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result" >> $output
+ $ECHO "$obj" >> $output
done
- func_append delfiles " $output"
- func_to_tool_file "$output"
- output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+ delfiles="$delfiles $output"
+ output=$firstobj\"$file_list_spec$output\"
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
@@ -8371,19 +7190,17 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
- reload_objs=$objlist
- eval concat_cmds=\"$reload_cmds\"
+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
else
# All subsequent reloadable object files will link in
# the last one created.
- reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$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
@@ -8393,12 +7210,11 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
- func_append delfiles " $output"
+ delfiles="$delfiles $output"
else
output=
@@ -8432,7 +7248,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8453,7 +7269,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 "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
@@ -8465,7 +7281,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -8506,10 +7322,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $dlprefiles
- func_append libobjs " $func_extract_archives_result"
+ libobjs="$libobjs $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
@@ -8525,7 +7341,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8537,7 +7353,7 @@ EOF
IFS="$save_ifs"
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -8618,21 +7434,18 @@ 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 "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $convenience
reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
- # If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 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
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
@@ -8692,8 +7505,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
@@ -8704,14 +7517,14 @@ EOF
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
;;
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ 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'`
;;
esac
@@ -8725,7 +7538,7 @@ EOF
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
- func_append new_libs " -L$path/$objdir" ;;
+ new_libs="$new_libs -L$path/$objdir" ;;
esac
;;
esac
@@ -8735,17 +7548,17 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
done
compile_deplibs="$new_libs"
- func_append compile_command " $compile_deplibs"
- func_append finalize_command " $finalize_deplibs"
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -8753,7 +7566,7 @@ EOF
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
fi
@@ -8772,18 +7585,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- func_append rpath " $flag"
+ rpath="$rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_append perm_rpath " $libdir" ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
esac
fi
case $host in
@@ -8792,12 +7605,12 @@ EOF
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
- *) func_append dllsearchpath ":$libdir";;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) func_append dllsearchpath ":$testbindir";;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
esac
;;
esac
@@ -8823,18 +7636,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- func_append rpath " $flag"
+ rpath="$rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$finalize_perm_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_perm_rpath " $libdir" ;;
+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
esac
fi
done
@@ -8848,8 +7661,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
- finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -8861,15 +7674,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
@@ -8878,19 +7691,13 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
func_show_eval "$link_command" 'exit_status=$?'
- if test -n "$postlink_cmds"; then
- func_to_tool_file "$output"
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- func_execute_cmds "$postlink_cmds" 'exit $?'
- fi
-
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -8913,7 +7720,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- func_append rpath "$dir:"
+ rpath="$rpath$dir:"
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -8921,7 +7728,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
- func_append rpath "$dir:"
+ rpath="$rpath$dir:"
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -8931,18 +7738,11 @@ 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 "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
func_show_eval "$link_command" 'exit $?'
-
- if test -n "$postlink_cmds"; then
- func_to_tool_file "$output"
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- func_execute_cmds "$postlink_cmds" 'exit $?'
- fi
-
exit $EXIT_SUCCESS
fi
@@ -8957,7 +7757,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 "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -8969,19 +7769,13 @@ EOF
fi
# Replace the output file specification.
- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
func_show_eval "$link_command" 'exit $?'
- if test -n "$postlink_cmds"; then
- func_to_tool_file "$output_objdir/$outputname"
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- func_execute_cmds "$postlink_cmds" 'exit $?'
- fi
-
# Now create the wrapper script.
func_verbose "creating $output"
@@ -8999,7 +7793,18 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+ 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"`
fi
# Only actually do things if not in dry run mode.
@@ -9079,7 +7884,7 @@ EOF
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
+ oldobjs="$oldobjs $symfileobj"
fi
fi
addlibs="$old_convenience"
@@ -9087,10 +7892,10 @@ EOF
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $addlibs
- func_append oldobjs " $func_extract_archives_result"
+ oldobjs="$oldobjs $func_extract_archives_result"
fi
# Do each command in the archive commands.
@@ -9101,10 +7906,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $dlprefiles
- func_append oldobjs " $func_extract_archives_result"
+ oldobjs="$oldobjs $func_extract_archives_result"
fi
# POSIX demands no paths to be encoded in archives. We have
@@ -9120,9 +7925,9 @@ 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"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
@@ -9146,9 +7951,9 @@ EOF
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- func_append oldobjs " $gentop/$newobj"
+ oldobjs="$oldobjs $gentop/$newobj"
;;
- *) func_append oldobjs " $obj" ;;
+ *) oldobjs="$oldobjs $obj" ;;
esac
done
fi
@@ -9158,16 +7963,6 @@ EOF
len=$func_len_result
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
- elif test -n "$archiver_list_spec"; then
- func_verbose "using command file archive linking..."
- for obj in $oldobjs
- do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result"
- done > $output_objdir/$libname.libcmd
- func_to_tool_file "$output_objdir/$libname.libcmd"
- oldobjs=" $archiver_list_spec$func_to_tool_file_result"
- cmds=$old_archive_cmds
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
@@ -9241,7 +8036,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 "$relink_command" | $SED "$sed_quote_subst"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -9264,19 +8059,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
- ;;
- -L*)
- func_stripname -L '' "$deplib"
- func_replace_sysroot "$func_stripname_result"
- func_append newdependency_libs " -L$func_replace_sysroot_result"
+ newdependency_libs="$newdependency_libs $libdir/$name"
;;
- -R*)
- func_stripname -R '' "$deplib"
- func_replace_sysroot "$func_stripname_result"
- func_append newdependency_libs " -R$func_replace_sysroot_result"
- ;;
- *) func_append newdependency_libs " $deplib" ;;
+ *) newdependency_libs="$newdependency_libs $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
@@ -9290,9 +8075,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+ newdlfiles="$newdlfiles $libdir/$name"
;;
- *) func_append newdlfiles " $lib" ;;
+ *) newdlfiles="$newdlfiles $lib" ;;
esac
done
dlfiles="$newdlfiles"
@@ -9309,7 +8094,7 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+ newdlprefiles="$newdlprefiles $libdir/$name"
;;
esac
done
@@ -9321,7 +8106,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- func_append newdlfiles " $abs"
+ newdlfiles="$newdlfiles $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
@@ -9330,33 +8115,15 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- func_append newdlprefiles " $abs"
+ newdlprefiles="$newdlprefiles $abs"
done
dlprefiles="$newdlprefiles"
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)
- # 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
- ;;
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
@@ -9415,7 +8182,7 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+{ test "$mode" = link || test "$mode" = relink; } &&
func_mode_link ${1+"$@"}
@@ -9435,9 +8202,9 @@ func_mode_uninstall ()
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
- -*) func_append RM " $arg" ;;
- *) func_append files " $arg" ;;
+ -f) RM="$RM $arg"; rmforce=yes ;;
+ -*) RM="$RM $arg" ;;
+ *) files="$files $arg" ;;
esac
done
@@ -9446,23 +8213,24 @@ func_mode_uninstall ()
rmdirs=
+ origobjdir="$objdir"
for file in $files; do
func_dirname "$file" "" "."
dir="$func_dirname_result"
if test "X$dir" = X.; then
- odir="$objdir"
+ objdir="$origobjdir"
else
- odir="$dir/$objdir"
+ objdir="$dir/$origobjdir"
fi
func_basename "$file"
name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ test "$mode" = uninstall && objdir="$dir"
- # Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ # Remember objdir for removal later, being careful to avoid duplicates
+ if test "$mode" = clean; then
case " $rmdirs " in
- *" $odir "*) ;;
- *) func_append rmdirs " $odir" ;;
+ *" $objdir "*) ;;
+ *) rmdirs="$rmdirs $objdir" ;;
esac
fi
@@ -9488,17 +8256,18 @@ func_mode_uninstall ()
# Delete the libtool libraries and symlinks.
for n in $library_names; do
- func_append rmfiles " $odir/$n"
+ rmfiles="$rmfiles $objdir/$n"
done
- test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
- case "$opt_mode" in
+ case "$mode" in
clean)
- case " $library_names " in
+ case " $library_names " in
+ # " " in the beginning catches empty $dlname
*" $dlname "*) ;;
- *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+ *) rmfiles="$rmfiles $objdir/$dlname" ;;
esac
- test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
@@ -9526,19 +8295,19 @@ func_mode_uninstall ()
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
- func_append rmfiles " $dir/$pic_object"
+ rmfiles="$rmfiles $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
if test -n "$non_pic_object" &&
test "$non_pic_object" != none; then
- func_append rmfiles " $dir/$non_pic_object"
+ rmfiles="$rmfiles $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test "$mode" = clean ; then
noexename=$name
case $file in
*.exe)
@@ -9548,7 +8317,7 @@ func_mode_uninstall ()
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
- func_append rmfiles " $file"
+ rmfiles="$rmfiles $file"
;;
esac
# Do a test to see if this is a libtool program.
@@ -9557,7 +8326,7 @@ func_mode_uninstall ()
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
- func_append rmfiles " $func_ltwrapper_scriptname_result"
+ rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
else
relink_command=
func_source $dir/$noexename
@@ -9565,12 +8334,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
if test "$fast_install" = yes && test -n "$relink_command"; then
- func_append rmfiles " $odir/lt-$name"
+ rmfiles="$rmfiles $objdir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
fi
fi
fi
@@ -9578,6 +8347,7 @@ func_mode_uninstall ()
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
+ objdir="$origobjdir"
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
@@ -9589,16 +8359,16 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
func_mode_uninstall ${1+"$@"}
-test -z "$opt_mode" && {
+test -z "$mode" && {
help="$generic_help"
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode \`$mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
old mode 100644
new mode 100755
index c7e8302..cc8a222
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
@@ -129,7 +129,7 @@ install-data-yes: all
done
# Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
# Define this as empty until I found a useful application.
install-exec installcheck:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fbf8c10..474763a 100755
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,6 +16,7 @@ SparkleShare/SparkleAbout.cs
SparkleShare/SparkleController.cs
SparkleShare/SparkleControllerBase.cs
SparkleShare/SparkleEventLog.cs
+SparkleShare/SparkleOptions.cs
SparkleShare/SparkleSetup.cs
SparkleShare/SparkleSetupWindow.cs
SparkleShare/SparkleSpinner.cs
diff --git a/po/es.po b/po/es.po
index 7035c65..5640fdf 100755
--- a/po/es.po
+++ b/po/es.po
@@ -5,13 +5,14 @@
# <jamelrom at gmail.com>, 2011.
# jamelrom <jamelrom at gmail.com>, 2011.
# <luiso.perez at gmail.com>, 2011.
+# <miguel.vaellomartinez at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:42+0100\n"
-"PO-Revision-Date: 2011-11-14 18:09+0000\n"
-"Last-Translator: elsupergomez <elsupergomez at gmail.com>\n"
+"POT-Creation-Date: 2011-12-04 12:45+0100\n"
+"PO-Revision-Date: 2011-12-09 14:13+0000\n"
+"Last-Translator: miguxbe <miguel.vaellomartinez at gmail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/sparkleshare/team/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -95,162 +96,127 @@ msgstr "Actualizado"
msgid "Syncing…"
msgstr "Sincronizando..."
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:123
-#: ../SparkleShare/SparkleStatusIcon.cs:116
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
+#: ../SparkleShare/SparkleStatusIcon.cs:118
msgid "Not everything is synced"
msgstr "Pendiente de sincronizar"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:140
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
msgid "Copy Web Link"
msgstr "Copiar Enlace"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
msgid "Copy the web address of this file to the clipboard"
msgstr "Copiar la dirección web de este archivo al portapapeles"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:173
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
msgid "Get Earlier Version"
msgstr "Obtener versión anterior"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
msgid "Make a copy of an earlier version in this folder"
msgstr "Hacer una copia de una versión anterior en esta carpeta"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:187
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
msgid "Select to get a copy of this version"
msgstr "Seleccionar para obtener una copia de esta versión"
-#: ../SparkleShare/Program.cs:51
+#: ../SparkleShare/Program.cs:50
msgid "Print version information"
msgstr "Muestra la información de la versión"
-#: ../SparkleShare/Program.cs:52
+#: ../SparkleShare/Program.cs:51
msgid "Show this help text"
msgstr "Mostrar este texto de ayuda"
-#: ../SparkleShare/Program.cs:84
+#: ../SparkleShare/Program.cs:83
msgid "SparkleShare, a collaboration and sharing tool."
msgstr "SparkleShare, una herramienta de compartición y colaboración"
-#: ../SparkleShare/Program.cs:85
+#: ../SparkleShare/Program.cs:84
msgid "Copyright (C) 2010 Hylke Bons"
msgstr "Copyright (C) 2010 Hylke Bons"
-#: ../SparkleShare/Program.cs:87
+#: ../SparkleShare/Program.cs:86
msgid "This program comes with ABSOLUTELY NO WARRANTY."
msgstr "Este programa viene SIN NINGUNA GARANTÍA."
-#: ../SparkleShare/Program.cs:89
+#: ../SparkleShare/Program.cs:88
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Esto es software libre, y esta invitado a redistribuirlo"
-#: ../SparkleShare/Program.cs:90
+#: ../SparkleShare/Program.cs:89
msgid "under certain conditions. Please read the GNU GPLv3 for details."
msgstr ""
"bajo determinadas condiciones. Por favor lea la GNU GPLv3 para más detalles."
-#: ../SparkleShare/Program.cs:92
+#: ../SparkleShare/Program.cs:91
msgid "SparkleShare automatically syncs Git repositories in "
msgstr "SparkleShare sincroniza automaticamente repositorios Git en "
-#: ../SparkleShare/Program.cs:93
+#: ../SparkleShare/Program.cs:92
msgid "the ~/SparkleShare folder with their remote origins."
msgstr "La carpeta ~/SparkleShare con su origen remoto."
-#: ../SparkleShare/Program.cs:95
+#: ../SparkleShare/Program.cs:94
msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Uso: sparkleshare [start|stop|restart] [OPCION]..."
+msgstr "Uso: sparkleshare [start|stop|restart] [OPCIÓN]..."
-#: ../SparkleShare/Program.cs:96
+#: ../SparkleShare/Program.cs:95
msgid "Sync SparkleShare folder with remote repositories."
msgstr "Sincronizar carpeta SparkleShare con el repositorio remoto."
-#: ../SparkleShare/Program.cs:98
+#: ../SparkleShare/Program.cs:97
msgid "Arguments:"
msgstr "Parámetros:"
-#: ../SparkleShare/Program.cs:108
+#: ../SparkleShare/Program.cs:107
msgid "SparkleShare "
msgstr "SparkleShare"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
msgid "About SparkleShare"
msgstr "Acerca de SparkleShare"
#: ../SparkleShare/SparkleAbout.cs:70
#, csharp-format
msgid "A newer version ({0}) is available!"
-msgstr "Esta disponible una nueva version ({0})"
+msgstr "Esta disponible una nueva versión ({0})"
#: ../SparkleShare/SparkleAbout.cs:79
msgid "You are running the latest version."
msgstr "Estas ejecutando la última versión"
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "Comprobando actualizaciones..."
-#: ../SparkleShare/SparkleControllerBase.cs:494
+#: ../SparkleShare/SparkleControllerBase.cs:489
msgid "dddd, MMMM d, yyyy"
msgstr "dddd, MMMM d, yyyy"
-#: ../SparkleShare/SparkleControllerBase.cs:500
+#: ../SparkleShare/SparkleControllerBase.cs:495
msgid "dddd, MMMM d"
msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleControllerBase.cs:708
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "añadido '{0}'"
-
-#: ../SparkleShare/SparkleControllerBase.cs:713
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "movido '{0}'"
-
-#: ../SparkleShare/SparkleControllerBase.cs:718
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "editado '{0}'"
-
-#: ../SparkleShare/SparkleControllerBase.cs:723
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "eliminado '{0}'"
-
-#: ../SparkleShare/SparkleControllerBase.cs:732
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] "y {0} más"
-msgstr[1] "y {0} más"
-
-#: ../SparkleShare/SparkleControllerBase.cs:736
-msgid "did something magical"
-msgstr "hizo algo mágico"
-
-#: ../SparkleShare/SparkleEventLog.cs:58
+#: ../SparkleShare/SparkleEventLog.cs:56
msgid "Recent Events"
msgstr "Eventos recientes"
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
+#: ../SparkleShare/SparkleEventLog.cs:145
+#: ../SparkleShare/SparkleEventLog.cs:164
msgid "All Folders"
msgstr "Todas las carpetas"
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Antes de que podamos crear una carpeta de SparkleShare en este equipo, "
-"necesitamos un poco de información de usted."
+#: ../SparkleShare/SparkleOptions.cs:486
+msgid "OptionName"
+msgstr "OptionName"
#: ../SparkleShare/SparkleSetup.cs:83
msgid "Full Name:"
@@ -266,108 +232,108 @@ msgstr "Siguiente"
#: ../SparkleShare/SparkleSetup.cs:129
msgid "Where's your project hosted?"
-msgstr "¿Donde esta almacenado su proyecto?"
+msgstr "¿Dónde está almacenado su proyecto?"
-#: ../SparkleShare/SparkleSetup.cs:275
+#: ../SparkleShare/SparkleSetup.cs:266
msgid "Address"
msgstr "Dirección"
-#: ../SparkleShare/SparkleSetup.cs:295
+#: ../SparkleShare/SparkleSetup.cs:286
msgid "Remote Path"
msgstr "Ruta remota"
#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
+#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
msgid "Cancel"
msgstr "Cancelar"
#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
+#: ../SparkleShare/SparkleSetup.cs:307
msgid "Add"
msgstr "Añadir"
-#: ../SparkleShare/SparkleSetup.cs:335
+#: ../SparkleShare/SparkleSetup.cs:326
#, csharp-format
msgid "Adding project ‘{0}’…"
msgstr "Añadiendo proyecto '{0}'..."
-#: ../SparkleShare/SparkleSetup.cs:336
+#: ../SparkleShare/SparkleSetup.cs:327
msgid "This may take a while."
msgstr "Esto tardara un poco."
-#: ../SparkleShare/SparkleSetup.cs:337
+#: ../SparkleShare/SparkleSetup.cs:328
msgid "Are you sure it’s not coffee o'clock?"
msgstr "¿Seguro que no es la hora del café?"
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
+#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:558
msgid "Finish"
msgstr "Finalizar"
-#: ../SparkleShare/SparkleSetup.cs:374
+#: ../SparkleShare/SparkleSetup.cs:365
msgid "Something went wrong"
msgstr "Algo falló"
-#: ../SparkleShare/SparkleSetup.cs:422
+#: ../SparkleShare/SparkleSetup.cs:413
msgid "Try Again…"
msgstr "Intenta de nuevo..."
-#: ../SparkleShare/SparkleSetup.cs:441
+#: ../SparkleShare/SparkleSetup.cs:432
#, csharp-format
msgid "‘{0}’ has been successfully added"
msgstr "'{0}' Ha sido añadido correctamente"
-#: ../SparkleShare/SparkleSetup.cs:447
+#: ../SparkleShare/SparkleSetup.cs:438
msgid "Project successfully added!"
-msgstr "Proyecto añadido con exito!"
+msgstr "Proyecto añadido con éxito!"
-#: ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:439
msgid "Access the files from your SparkleShare folder."
msgstr "Acceso a los archivos desde tu carpeta de SparkleShare."
#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
+#: ../SparkleShare/SparkleSetup.cs:442
msgid "Open Folder"
msgstr "Abrir carpeta"
-#: ../SparkleShare/SparkleSetup.cs:477
+#: ../SparkleShare/SparkleSetup.cs:484
msgid "What's happening next?"
msgstr "¿Qué está pasando ahora?"
-#: ../SparkleShare/SparkleSetup.cs:478
+#: ../SparkleShare/SparkleSetup.cs:485
msgid ""
"SparkleShare creates a special folder in your personal folder that will keep"
" track of your projects."
msgstr ""
-"SparkleShare crea una carpeta especial en tu carpeta personal que mantendra "
+"SparkleShare crea una carpeta especial en tu carpeta personal que mantendrá "
"un historial de tus proyectos."
-#: ../SparkleShare/SparkleSetup.cs:481
+#: ../SparkleShare/SparkleSetup.cs:488
msgid "Skip Tutorial"
msgstr "Saltar Tutorial"
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
+#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
+#: ../SparkleShare/SparkleSetup.cs:531
msgid "Continue"
msgstr "Continuar"
-#: ../SparkleShare/SparkleSetup.cs:502
+#: ../SparkleShare/SparkleSetup.cs:509
msgid "Sharing files with others"
msgstr "Compartiendo archivos con otros"
-#: ../SparkleShare/SparkleSetup.cs:503
+#: ../SparkleShare/SparkleSetup.cs:510
msgid ""
"All files added to your project folders are synced with the host "
"automatically, as well as with your collaborators."
msgstr ""
"Todos los ficheros añadidos a tus carpetas de proyectos son sincronizadas "
-"automaticamente con el equipo, asi como con tus colaboradores."
+"automáticamente con el equipo, asi como con tus colaboradores."
-#: ../SparkleShare/SparkleSetup.cs:520
+#: ../SparkleShare/SparkleSetup.cs:527
msgid "The status icon is here to help"
msgstr "El icono de estado esta aquí para ayudarte"
-#: ../SparkleShare/SparkleSetup.cs:521
+#: ../SparkleShare/SparkleSetup.cs:528
msgid ""
"It shows the syncing process status, and contains links to your projects and"
" the event log."
@@ -375,11 +341,11 @@ msgstr ""
"Muestra el proceso de sincronización, y contiene enlaces a tus proyectos y "
"al registro de eventos."
-#: ../SparkleShare/SparkleSetup.cs:538
+#: ../SparkleShare/SparkleSetup.cs:545
msgid "Adding projects to SparkleShare"
msgstr "Añadiendo proyectos a SparkleShare"
-#: ../SparkleShare/SparkleSetup.cs:539
+#: ../SparkleShare/SparkleSetup.cs:546
msgid ""
"Just click this button when you see it on the web, and the project will be "
"automatically added:"
@@ -387,7 +353,7 @@ msgstr ""
"Basta con hacer clic en este botón cuando lo veas en la web, y el proyecto "
"se agregará automáticamente:"
-#: ../SparkleShare/SparkleSetup.cs:542
+#: ../SparkleShare/SparkleSetup.cs:549
msgid ""
"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
" by hand."
@@ -395,34 +361,33 @@ msgstr ""
"... o seleccione <b>\"Agregar proyecto alojado ... \"</b> en el menú del "
"icono de estado para agregar uno manualmente."
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr "Añadir proyecto almacenado..."
-
#: ../SparkleShare/SparkleSetupWindow.cs:44
msgid "SparkleShare Setup"
msgstr "Configuración de SparkleShare"
-#: ../SparkleShare/SparkleStatusIcon.cs:228
+#: ../SparkleShare/SparkleStatusIcon.cs:230
msgid "No projects yet"
msgstr "No hay proyectos aún"
-#: ../SparkleShare/SparkleStatusIcon.cs:262
+#. Opens the wizard to add a new remote folder
+#: ../SparkleShare/SparkleStatusIcon.cs:240
+msgid "Add Hosted Project…"
+msgstr "Añadir proyecto almacenado..."
+
+#: ../SparkleShare/SparkleStatusIcon.cs:264
msgid "Open Recent Events"
msgstr "Abrir eventos recientes"
-#: ../SparkleShare/SparkleStatusIcon.cs:282
+#: ../SparkleShare/SparkleStatusIcon.cs:284
msgid "Turn Notifications Off"
msgstr "Desactivar las notificaciones"
-#: ../SparkleShare/SparkleStatusIcon.cs:284
+#: ../SparkleShare/SparkleStatusIcon.cs:286
msgid "Turn Notifications On"
msgstr "Activar las notificaciones"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
+#: ../SparkleShare/SparkleStatusIcon.cs:313
msgid "Quit"
msgstr "Salir"
diff --git a/po/it.po b/po/it.po
index 26e9b60..63faad3 100755
--- a/po/it.po
+++ b/po/it.po
@@ -2,15 +2,16 @@
#
# Translators:
# Ilias Bartolini <ilias.bartolini at gmail.com>, 2011.
+# <i.spalletti at nephila.it>, 2011.
# Luca Delucchi <lucadeluge at gmail.com>, 2011.
# Łukasz Jernaś <deejay1 at srem.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1 at srem.org>\n"
+"POT-Creation-Date: 2011-12-04 12:45+0100\n"
+"PO-Revision-Date: 2011-12-19 14:27+0000\n"
+"Last-Translator: yakky <i.spalletti at nephila.it>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,27 +20,27 @@ msgstr ""
#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
msgid "/username/project"
-msgstr ""
+msgstr "/nome-utente/progetto"
#: ../data/plugins/bitbucket.xml.in.h:2
msgid "Bitbucket"
-msgstr ""
+msgstr "Bitbucket"
#: ../data/plugins/bitbucket.xml.in.h:3
msgid "Free code hosting for Git and Mercurial"
-msgstr ""
+msgstr "Hosting gratuito di codice per Git e Mercurial"
#: ../data/plugins/github.xml.in.h:2
msgid "Free public Git repositories with collaborator management"
-msgstr ""
+msgstr "Repository pubblici gratuiti con gestione dei collaboratori"
#: ../data/plugins/github.xml.in.h:3
msgid "Github"
-msgstr ""
+msgstr "Github"
#: ../data/plugins/gitorious.xml.in.h:1
msgid "/project/repository"
-msgstr ""
+msgstr "/progetto/repository"
#: ../data/plugins/gitorious.xml.in.h:2
msgid "Gitorious"
@@ -47,15 +48,15 @@ msgstr "Gitorius"
#: ../data/plugins/gitorious.xml.in.h:3
msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
+msgstr "Infrastruttura Open sourc per lo hosting di progetti open source"
#: ../data/plugins/gnome.xml.in.h:1
msgid "/project"
-msgstr ""
+msgstr "/progetto"
#: ../data/plugins/gnome.xml.in.h:2
msgid "A free and easy interface for your computer"
-msgstr ""
+msgstr "Un'interfaccia gratuita e facile per il tuo computer"
#: ../data/plugins/gnome.xml.in.h:3
msgid "The GNOME Project"
@@ -63,115 +64,120 @@ msgstr "The GNOME Project"
#: ../data/plugins/own-server.xml.in.h:1
msgid "/path/to/project"
-msgstr ""
+msgstr "/percorso/per/progetto"
#: ../data/plugins/own-server.xml.in.h:2
msgid "Everything under my control"
-msgstr ""
+msgstr "Tutto sotto il mio controllo"
#: ../data/plugins/own-server.xml.in.h:3
msgid "On my own server"
-msgstr ""
+msgstr "Il mio server"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
#: ../SparkleShare/SparkleStatusIcon.cs:89
msgid "Welcome to SparkleShare!"
msgstr "Benvenuto in SparkleShare!"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
#: ../SparkleShare/SparkleStatusIcon.cs:77
#: ../SparkleShare/SparkleStatusIcon.cs:91
msgid "Up to date"
msgstr "Aggiornato"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
#: ../SparkleShare/SparkleStatusIcon.cs:106
msgid "Syncing…"
msgstr "Sincronizzazione in corso..."
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
+#: ../SparkleShare/SparkleStatusIcon.cs:118
msgid "Not everything is synced"
msgstr "Non tutto è sincronizzato"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
msgid "Copy Web Link"
msgstr "Copia link web"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
msgid "Copy the web address of this file to the clipboard"
msgstr "Copia l'indirizzo web di questo file"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
msgid "Get Earlier Version"
msgstr "Prendi versione precedente"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
msgid "Make a copy of an earlier version in this folder"
msgstr "Esegui una copia di una precedente versione di questa cartella"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
msgid "Select to get a copy of this version"
msgstr "Seleziona per ottenere una copia di questa versione"
-#: ../SparkleShare/Program.cs:51
+#: ../SparkleShare/Program.cs:50
msgid "Print version information"
msgstr "Stampa informazioni sulla versione"
-#: ../SparkleShare/Program.cs:52
+#: ../SparkleShare/Program.cs:51
msgid "Show this help text"
msgstr "Mostra questo messaggio di aiuto"
-#: ../SparkleShare/Program.cs:84
+#: ../SparkleShare/Program.cs:83
msgid "SparkleShare, a collaboration and sharing tool."
msgstr "SparkleShare, uno strumento collaborativo e di condivisione"
-#: ../SparkleShare/Program.cs:85
+#: ../SparkleShare/Program.cs:84
msgid "Copyright (C) 2010 Hylke Bons"
msgstr "Copyright (C) 2010 Hylke Bons"
-#: ../SparkleShare/Program.cs:87
+#: ../SparkleShare/Program.cs:86
msgid "This program comes with ABSOLUTELY NO WARRANTY."
msgstr "Questo programma viene fornito ASSOLUTAMENTE SENZA NESSUNA GARANZIA."
-#: ../SparkleShare/Program.cs:89
+#: ../SparkleShare/Program.cs:88
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Questo è software libero e sei invitato a redistribuirlo"
-#: ../SparkleShare/Program.cs:90
+#: ../SparkleShare/Program.cs:89
msgid "under certain conditions. Please read the GNU GPLv3 for details."
msgstr ""
"rispettando alcune restrizioni. Leggi la licenza GNU GPLv3 per i dettagli"
-#: ../SparkleShare/Program.cs:92
+#: ../SparkleShare/Program.cs:91
msgid "SparkleShare automatically syncs Git repositories in "
msgstr "SparkleShare sincronizza automaticamente i repository Git nella"
-#: ../SparkleShare/Program.cs:93
+#: ../SparkleShare/Program.cs:92
msgid "the ~/SparkleShare folder with their remote origins."
msgstr "cartella ~/.SparkleShare con le loro origini."
-#: ../SparkleShare/Program.cs:95
+#: ../SparkleShare/Program.cs:94
msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
msgstr "Utilizzo: sparkleshare [start|stop|restart] [OPTION]..."
-#: ../SparkleShare/Program.cs:96
+#: ../SparkleShare/Program.cs:95
msgid "Sync SparkleShare folder with remote repositories."
msgstr "Sincronizza cartella SparkleShare con repository remoti."
-#: ../SparkleShare/Program.cs:98
+#: ../SparkleShare/Program.cs:97
msgid "Arguments:"
msgstr "Argomenti"
-#: ../SparkleShare/Program.cs:108
+#: ../SparkleShare/Program.cs:107
msgid "SparkleShare "
msgstr "SparkleShare "
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
msgid "About SparkleShare"
msgstr "Informazioni su SparkleShare"
@@ -182,67 +188,32 @@ msgstr "È disponibile una nuova versione ({0})"
#: ../SparkleShare/SparkleAbout.cs:79
msgid "You are running the latest version."
-msgstr "Stai lanciando l'ultima versione"
+msgstr "Stai eseguendo l'ultima versione"
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
-msgstr "Controllando per aggiornamenti..."
+msgstr "Controllo aggiornamenti..."
-#: ../SparkleShare/SparkleControllerBase.cs:493
+#: ../SparkleShare/SparkleControllerBase.cs:489
msgid "dddd, MMMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMMM d, yyyy"
-#: ../SparkleShare/SparkleControllerBase.cs:499
+#: ../SparkleShare/SparkleControllerBase.cs:495
msgid "dddd, MMMM d"
-msgstr ""
+msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
+#: ../SparkleShare/SparkleEventLog.cs:56
msgid "Recent Events"
msgstr "Eventi recenti"
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
+#: ../SparkleShare/SparkleEventLog.cs:145
+#: ../SparkleShare/SparkleEventLog.cs:164
msgid "All Folders"
msgstr "Tutte le cartelle"
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Prima di poter creare una cartella SparkleShare in questo computer, abbiamo "
-"bisogno di qualche informazione da voi."
+#: ../SparkleShare/SparkleOptions.cs:486
+msgid "OptionName"
+msgstr "OptionName"
#: ../SparkleShare/SparkleSetup.cs:83
msgid "Full Name:"
@@ -258,153 +229,162 @@ msgstr "Successivo"
#: ../SparkleShare/SparkleSetup.cs:129
msgid "Where's your project hosted?"
-msgstr ""
+msgstr "Dov'è ospitato il tuo progetto?"
-#: ../SparkleShare/SparkleSetup.cs:275
+#: ../SparkleShare/SparkleSetup.cs:266
msgid "Address"
-msgstr ""
+msgstr "Indirizzo"
-#: ../SparkleShare/SparkleSetup.cs:295
+#: ../SparkleShare/SparkleSetup.cs:286
msgid "Remote Path"
-msgstr ""
+msgstr "Percorso remoto"
#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
+#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
msgid "Cancel"
msgstr "Cancella"
#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
+#: ../SparkleShare/SparkleSetup.cs:307
msgid "Add"
-msgstr ""
+msgstr "Aggiungi"
-#: ../SparkleShare/SparkleSetup.cs:335
+#: ../SparkleShare/SparkleSetup.cs:326
#, csharp-format
msgid "Adding project ‘{0}’…"
-msgstr ""
+msgstr "Progetto '{0}' in aggiunta..."
-#: ../SparkleShare/SparkleSetup.cs:336
+#: ../SparkleShare/SparkleSetup.cs:327
msgid "This may take a while."
msgstr "Questa operazione potrebbe richiedere un po' di tempo."
-#: ../SparkleShare/SparkleSetup.cs:337
+#: ../SparkleShare/SparkleSetup.cs:328
msgid "Are you sure it’s not coffee o'clock?"
msgstr "Sei sicuro che non sia l'ora di un caffè?"
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
+#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:558
msgid "Finish"
-msgstr "Finito"
+msgstr "Fine"
-#: ../SparkleShare/SparkleSetup.cs:374
+#: ../SparkleShare/SparkleSetup.cs:365
msgid "Something went wrong"
msgstr "Qualcosa è andato storto"
-#: ../SparkleShare/SparkleSetup.cs:422
+#: ../SparkleShare/SparkleSetup.cs:413
msgid "Try Again…"
-msgstr ""
+msgstr "Prova ancora..."
-#: ../SparkleShare/SparkleSetup.cs:441
+#: ../SparkleShare/SparkleSetup.cs:432
#, csharp-format
msgid "‘{0}’ has been successfully added"
msgstr "‘{0}’ è stato aggiunto con successo"
-#: ../SparkleShare/SparkleSetup.cs:447
+#: ../SparkleShare/SparkleSetup.cs:438
msgid "Project successfully added!"
-msgstr ""
+msgstr "Progetto aggiunto con successo"
-#: ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:439
msgid "Access the files from your SparkleShare folder."
-msgstr ""
+msgstr "Accedi i file dalla tua cartella SparkleShare."
#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
+#: ../SparkleShare/SparkleSetup.cs:442
msgid "Open Folder"
msgstr "Apri cartella"
-#: ../SparkleShare/SparkleSetup.cs:477
+#: ../SparkleShare/SparkleSetup.cs:484
msgid "What's happening next?"
-msgstr ""
+msgstr "Cosa fare adesso?"
-#: ../SparkleShare/SparkleSetup.cs:478
+#: ../SparkleShare/SparkleSetup.cs:485
msgid ""
"SparkleShare creates a special folder in your personal folder that will keep"
" track of your projects."
msgstr ""
+"SparkleShare crea una cartella speciale nella tua cartella personale per "
+"tenere traccia dei tuoi progetti."
-#: ../SparkleShare/SparkleSetup.cs:481
+#: ../SparkleShare/SparkleSetup.cs:488
msgid "Skip Tutorial"
-msgstr ""
+msgstr "Salta l'Introduzione"
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
+#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
+#: ../SparkleShare/SparkleSetup.cs:531
msgid "Continue"
-msgstr ""
+msgstr "Continua"
-#: ../SparkleShare/SparkleSetup.cs:502
+#: ../SparkleShare/SparkleSetup.cs:509
msgid "Sharing files with others"
-msgstr ""
+msgstr "Condividere i tuoi file con altri"
-#: ../SparkleShare/SparkleSetup.cs:503
+#: ../SparkleShare/SparkleSetup.cs:510
msgid ""
"All files added to your project folders are synced with the host "
"automatically, as well as with your collaborators."
msgstr ""
+"Tutti i file inseriti nelle cartelle dei tuoi progetti sono sincronizzati in"
+" automatico con il server e con i tuoi collaboratori."
-#: ../SparkleShare/SparkleSetup.cs:520
+#: ../SparkleShare/SparkleSetup.cs:527
msgid "The status icon is here to help"
-msgstr ""
+msgstr "L'icona di stato è qui per aiutare"
-#: ../SparkleShare/SparkleSetup.cs:521
+#: ../SparkleShare/SparkleSetup.cs:528
msgid ""
"It shows the syncing process status, and contains links to your projects and"
" the event log."
msgstr ""
+"Mostra il progresso della sicronizzazione, e contiene collegamenti ai tuoi "
+"progetti e al registro degli eventi."
-#: ../SparkleShare/SparkleSetup.cs:538
+#: ../SparkleShare/SparkleSetup.cs:545
msgid "Adding projects to SparkleShare"
-msgstr ""
+msgstr "Aggiungere progetti a SparkleShare"
-#: ../SparkleShare/SparkleSetup.cs:539
+#: ../SparkleShare/SparkleSetup.cs:546
msgid ""
"Just click this button when you see it on the web, and the project will be "
"automatically added:"
msgstr ""
+"Fai click su questo bottone quando lo vedi sul web e il progetto sarà "
+"automaticamente aggiunto:"
-#: ../SparkleShare/SparkleSetup.cs:542
+#: ../SparkleShare/SparkleSetup.cs:549
msgid ""
"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
" by hand."
msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
+"...o seleziona <b>'Aggiungi progetto ospitato'</b> dall'icona di stato per "
+"aggiungerne uno a mano."
#: ../SparkleShare/SparkleSetupWindow.cs:44
msgid "SparkleShare Setup"
msgstr "Impostazioni "
-#: ../SparkleShare/SparkleStatusIcon.cs:228
+#: ../SparkleShare/SparkleStatusIcon.cs:230
msgid "No projects yet"
-msgstr ""
+msgstr "Nessun progetto per il momento"
+
+#. Opens the wizard to add a new remote folder
+#: ../SparkleShare/SparkleStatusIcon.cs:240
+msgid "Add Hosted Project…"
+msgstr "Aggiungi progetto ospitato..."
-#: ../SparkleShare/SparkleStatusIcon.cs:262
+#: ../SparkleShare/SparkleStatusIcon.cs:264
msgid "Open Recent Events"
-msgstr ""
+msgstr "Apri eventi recenti"
-#: ../SparkleShare/SparkleStatusIcon.cs:282
+#: ../SparkleShare/SparkleStatusIcon.cs:284
msgid "Turn Notifications Off"
msgstr "Spegni le notifiche"
-#: ../SparkleShare/SparkleStatusIcon.cs:284
+#: ../SparkleShare/SparkleStatusIcon.cs:286
msgid "Turn Notifications On"
msgstr "Accendi le notifiche"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
+#: ../SparkleShare/SparkleStatusIcon.cs:313
msgid "Quit"
msgstr "Esci"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c461ed7..031f0cf 100755
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,14 +3,15 @@
# Translators:
# DigitalDead <zero.ext at gmail.com>, 2011.
# <eduardo at eduardosilva.eti.br>, 2011.
+# Nícolas Lazarte <nicolaslazartekaqui at gmail.com>, 2011.
# Paulo Paulo <paulo.s.lima at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-11-08 12:53+0000\n"
-"Last-Translator: eduardosilva <eduardo at eduardosilva.eti.br>\n"
+"POT-Creation-Date: 2011-12-04 12:45+0100\n"
+"PO-Revision-Date: 2011-12-04 11:46+0000\n"
+"Last-Translator: deejay1 <deejay1 at srem.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,15 +24,15 @@ msgstr "/usuário/projeto"
#: ../data/plugins/bitbucket.xml.in.h:2
msgid "Bitbucket"
-msgstr ""
+msgstr "Bitbucket"
#: ../data/plugins/bitbucket.xml.in.h:3
msgid "Free code hosting for Git and Mercurial"
-msgstr ""
+msgstr "Hospedagem gratuita de código para Git e Mercurial"
#: ../data/plugins/github.xml.in.h:2
msgid "Free public Git repositories with collaborator management"
-msgstr ""
+msgstr "Repositórios públicos Git, gratuitos com gestão de colaboradores"
#: ../data/plugins/github.xml.in.h:3
msgid "Github"
@@ -48,6 +49,8 @@ msgstr "Gitorious"
#: ../data/plugins/gitorious.xml.in.h:3
msgid "Open source infrastructure for hosting open source projects"
msgstr ""
+"Infra-estrutura de código aberto para hospedagem de projetos com código "
+"aberto "
#: ../data/plugins/gnome.xml.in.h:1
msgid "/project"
@@ -55,7 +58,7 @@ msgstr "/projeto"
#: ../data/plugins/gnome.xml.in.h:2
msgid "A free and easy interface for your computer"
-msgstr ""
+msgstr "Uma interface fácil e gratuita para o seu computador"
#: ../data/plugins/gnome.xml.in.h:3
msgid "The GNOME Project"
@@ -73,105 +76,110 @@ msgstr "Tudo sob meu controle"
msgid "On my own server"
msgstr "Em meu próprio servidor"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
#: ../SparkleShare/SparkleStatusIcon.cs:89
msgid "Welcome to SparkleShare!"
msgstr "Bem-vindo ao SparkleShare!"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
#: ../SparkleShare/SparkleStatusIcon.cs:77
#: ../SparkleShare/SparkleStatusIcon.cs:91
msgid "Up to date"
msgstr "Atualizado"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
#: ../SparkleShare/SparkleStatusIcon.cs:106
msgid "Syncing…"
msgstr "Sincronizando…"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
+#: ../SparkleShare/SparkleStatusIcon.cs:118
msgid "Not everything is synced"
msgstr "Nem tudo foi sincronizado"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
msgid "Copy Web Link"
msgstr "Copiar Endereço Web"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
msgid "Copy the web address of this file to the clipboard"
msgstr "Copiar o endereço web deste arquivo"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
msgid "Get Earlier Version"
msgstr "Obter Versão Anterior"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
msgid "Make a copy of an earlier version in this folder"
msgstr "Fazer uma cópia de uma anterior nesta pasta"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
msgid "Select to get a copy of this version"
msgstr "Selecione para obter uma cópia dessa versão"
-#: ../SparkleShare/Program.cs:51
+#: ../SparkleShare/Program.cs:50
msgid "Print version information"
msgstr "Imprimir informações da versão"
-#: ../SparkleShare/Program.cs:52
+#: ../SparkleShare/Program.cs:51
msgid "Show this help text"
msgstr "Exibir esse texto de ajuda"
-#: ../SparkleShare/Program.cs:84
+#: ../SparkleShare/Program.cs:83
msgid "SparkleShare, a collaboration and sharing tool."
msgstr "SparkleShare, uma ferramenta de colaboração e compartilhamento"
-#: ../SparkleShare/Program.cs:85
+#: ../SparkleShare/Program.cs:84
msgid "Copyright (C) 2010 Hylke Bons"
msgstr "Copyright (C) 2010 Hylke Bons - Todos os direitos reservados"
-#: ../SparkleShare/Program.cs:87
+#: ../SparkleShare/Program.cs:86
msgid "This program comes with ABSOLUTELY NO WARRANTY."
msgstr "Este programa vem com ABSOLUTAMENTE NENHUMA GARANTIA."
-#: ../SparkleShare/Program.cs:89
+#: ../SparkleShare/Program.cs:88
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Este é um software livre, e você está convidado a distribuí-lo"
-#: ../SparkleShare/Program.cs:90
+#: ../SparkleShare/Program.cs:89
msgid "under certain conditions. Please read the GNU GPLv3 for details."
msgstr ""
"sob certas condições. Por favor leia a licença GNU GPLv3 para mais detalhes."
-#: ../SparkleShare/Program.cs:92
+#: ../SparkleShare/Program.cs:91
msgid "SparkleShare automatically syncs Git repositories in "
msgstr "O SparkleShare sincroniza os repositórios do Git automaticamente"
-#: ../SparkleShare/Program.cs:93
+#: ../SparkleShare/Program.cs:92
msgid "the ~/SparkleShare folder with their remote origins."
msgstr "a pasta ~/SparkleShare com suas origens remotas"
-#: ../SparkleShare/Program.cs:95
+#: ../SparkleShare/Program.cs:94
msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
msgstr "Utilização: sparkleshare [start|stop|restart] [OPÇÕES]..."
-#: ../SparkleShare/Program.cs:96
+#: ../SparkleShare/Program.cs:95
msgid "Sync SparkleShare folder with remote repositories."
msgstr "Sincroniza a pasta SparkleShare com repositórios remotos."
-#: ../SparkleShare/Program.cs:98
+#: ../SparkleShare/Program.cs:97
msgid "Arguments:"
msgstr "Argumentos:"
-#: ../SparkleShare/Program.cs:108
+#: ../SparkleShare/Program.cs:107
msgid "SparkleShare "
msgstr "SparkleShare"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
msgid "About SparkleShare"
msgstr "Sobre o SparkleShare"
@@ -184,65 +192,30 @@ msgstr "Uma nova versão ({0}) está disponível!"
msgid "You are running the latest version."
msgstr "Você está executando a última versão"
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "Verificando atualizações"
-#: ../SparkleShare/SparkleControllerBase.cs:493
+#: ../SparkleShare/SparkleControllerBase.cs:489
msgid "dddd, MMMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMMM d, yyyy"
-#: ../SparkleShare/SparkleControllerBase.cs:499
+#: ../SparkleShare/SparkleControllerBase.cs:495
msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "adicionado \"{0} '"
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "movido '{0}'"
+msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "editado '{0}'"
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "removido '{0}'"
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr "fez algo mágico"
-
-#: ../SparkleShare/SparkleEventLog.cs:58
+#: ../SparkleShare/SparkleEventLog.cs:56
msgid "Recent Events"
msgstr "Eventos Recentes"
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
+#: ../SparkleShare/SparkleEventLog.cs:145
+#: ../SparkleShare/SparkleEventLog.cs:164
msgid "All Folders"
msgstr "Todas as pastas"
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
+#: ../SparkleShare/SparkleOptions.cs:486
+msgid "OptionName"
msgstr ""
-"Antes de criarmos uma pasta SparkleShare neste computador, precisamos de "
-"algumas informações sobre você."
#: ../SparkleShare/SparkleSetup.cs:83
msgid "Full Name:"
@@ -260,73 +233,73 @@ msgstr "Próximo"
msgid "Where's your project hosted?"
msgstr "Onde está o seu projeto está hospedado?"
-#: ../SparkleShare/SparkleSetup.cs:275
+#: ../SparkleShare/SparkleSetup.cs:266
msgid "Address"
msgstr "Endereço"
-#: ../SparkleShare/SparkleSetup.cs:295
+#: ../SparkleShare/SparkleSetup.cs:286
msgid "Remote Path"
msgstr "Caminho remoto"
#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
+#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
msgid "Cancel"
msgstr "Cancelar"
#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
+#: ../SparkleShare/SparkleSetup.cs:307
msgid "Add"
msgstr "Adicionar"
-#: ../SparkleShare/SparkleSetup.cs:335
+#: ../SparkleShare/SparkleSetup.cs:326
#, csharp-format
msgid "Adding project ‘{0}’…"
msgstr "Adicionando projeto '{0}' ..."
-#: ../SparkleShare/SparkleSetup.cs:336
+#: ../SparkleShare/SparkleSetup.cs:327
msgid "This may take a while."
msgstr "Isto pode demorar um pouco."
-#: ../SparkleShare/SparkleSetup.cs:337
+#: ../SparkleShare/SparkleSetup.cs:328
msgid "Are you sure it’s not coffee o'clock?"
msgstr "Você tem certeza de que não é hora do café?"
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
+#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:558
msgid "Finish"
msgstr "Finalizar"
-#: ../SparkleShare/SparkleSetup.cs:374
+#: ../SparkleShare/SparkleSetup.cs:365
msgid "Something went wrong"
msgstr "Algum problema ocorreu"
-#: ../SparkleShare/SparkleSetup.cs:422
+#: ../SparkleShare/SparkleSetup.cs:413
msgid "Try Again…"
msgstr "Tente novamente..."
-#: ../SparkleShare/SparkleSetup.cs:441
+#: ../SparkleShare/SparkleSetup.cs:432
#, csharp-format
msgid "‘{0}’ has been successfully added"
msgstr "'{0}' foi incluída com sucesso"
-#: ../SparkleShare/SparkleSetup.cs:447
+#: ../SparkleShare/SparkleSetup.cs:438
msgid "Project successfully added!"
msgstr "Projeto adicionado com sucesso!"
-#: ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:439
msgid "Access the files from your SparkleShare folder."
msgstr "Acessar os arquivos da pasta SparkleShare."
#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
+#: ../SparkleShare/SparkleSetup.cs:442
msgid "Open Folder"
msgstr "Abrir Pasta"
-#: ../SparkleShare/SparkleSetup.cs:477
+#: ../SparkleShare/SparkleSetup.cs:484
msgid "What's happening next?"
msgstr "O que está acontecendo em seguida?"
-#: ../SparkleShare/SparkleSetup.cs:478
+#: ../SparkleShare/SparkleSetup.cs:485
msgid ""
"SparkleShare creates a special folder in your personal folder that will keep"
" track of your projects."
@@ -334,20 +307,20 @@ msgstr ""
"SparkleShare cria uma pasta especial em sua pasta pessoal que vai manter o "
"controle de seus projetos."
-#: ../SparkleShare/SparkleSetup.cs:481
+#: ../SparkleShare/SparkleSetup.cs:488
msgid "Skip Tutorial"
msgstr "Pular Tutorial"
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
+#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
+#: ../SparkleShare/SparkleSetup.cs:531
msgid "Continue"
msgstr "Continuar"
-#: ../SparkleShare/SparkleSetup.cs:502
+#: ../SparkleShare/SparkleSetup.cs:509
msgid "Sharing files with others"
msgstr "Compartilhar arquivos com outras pessoas"
-#: ../SparkleShare/SparkleSetup.cs:503
+#: ../SparkleShare/SparkleSetup.cs:510
msgid ""
"All files added to your project folders are synced with the host "
"automatically, as well as with your collaborators."
@@ -355,11 +328,11 @@ msgstr ""
"Todos os arquivos adicionados a pasta do seu projeto são sincronizados "
"automaticamente com o servidor, bem como com seus colaboradores."
-#: ../SparkleShare/SparkleSetup.cs:520
+#: ../SparkleShare/SparkleSetup.cs:527
msgid "The status icon is here to help"
msgstr "O ícone de status está aqui para ajudar"
-#: ../SparkleShare/SparkleSetup.cs:521
+#: ../SparkleShare/SparkleSetup.cs:528
msgid ""
"It shows the syncing process status, and contains links to your projects and"
" the event log."
@@ -367,11 +340,11 @@ msgstr ""
"Mostra o status do processo de sincronização, e contém links para seus "
"projetos e log de eventos."
-#: ../SparkleShare/SparkleSetup.cs:538
+#: ../SparkleShare/SparkleSetup.cs:545
msgid "Adding projects to SparkleShare"
msgstr "Adicionando projetos ao SparkleShare"
-#: ../SparkleShare/SparkleSetup.cs:539
+#: ../SparkleShare/SparkleSetup.cs:546
msgid ""
"Just click this button when you see it on the web, and the project will be "
"automatically added:"
@@ -379,7 +352,7 @@ msgstr ""
"Basta clicar neste botão quando você vê-la na web, e o projeto será "
"automaticamente adicionado automaticamente:"
-#: ../SparkleShare/SparkleSetup.cs:542
+#: ../SparkleShare/SparkleSetup.cs:549
msgid ""
"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
" by hand."
@@ -387,34 +360,33 @@ msgstr ""
"... Ou selecione <b>'Adicionar Projeto Hosted ...'</b> no menu do ícone de "
"status para adicionar manualmente."
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr "Adicionar Projeto Hospedado..."
-
#: ../SparkleShare/SparkleSetupWindow.cs:44
msgid "SparkleShare Setup"
msgstr "Configurações do SparkleShare"
-#: ../SparkleShare/SparkleStatusIcon.cs:228
+#: ../SparkleShare/SparkleStatusIcon.cs:230
msgid "No projects yet"
msgstr "Nenhum projeto ainda"
-#: ../SparkleShare/SparkleStatusIcon.cs:262
+#. Opens the wizard to add a new remote folder
+#: ../SparkleShare/SparkleStatusIcon.cs:240
+msgid "Add Hosted Project…"
+msgstr "Adicionar Projeto Hospedado..."
+
+#: ../SparkleShare/SparkleStatusIcon.cs:264
msgid "Open Recent Events"
msgstr "Abrir Eventos Recentes"
-#: ../SparkleShare/SparkleStatusIcon.cs:282
+#: ../SparkleShare/SparkleStatusIcon.cs:284
msgid "Turn Notifications Off"
msgstr "Desligar as notificações"
-#: ../SparkleShare/SparkleStatusIcon.cs:284
+#: ../SparkleShare/SparkleStatusIcon.cs:286
msgid "Turn Notifications On"
msgstr "Ligar as notificações"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
+#: ../SparkleShare/SparkleStatusIcon.cs:313
msgid "Quit"
msgstr "Sair"
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 1799816..cc38f7f 100755
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -1,15 +1,16 @@
# This file is distributed under the same license as the SparkleShare package.
#
# Translators:
+# Aleksandar Antoski <acko.aa at gmail.com>, 2011.
# <nebjak at gmail.com>, 2011.
# Небојша Јаковљевић <nebjak at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1 at srem.org>\n"
+"POT-Creation-Date: 2011-12-04 12:45+0100\n"
+"PO-Revision-Date: 2011-12-22 10:42+0000\n"
+"Last-Translator: Aleksandar Antoski <acko.aa at gmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -72,104 +73,109 @@ msgstr ""
msgid "On my own server"
msgstr ""
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
#: ../SparkleShare/SparkleStatusIcon.cs:89
msgid "Welcome to SparkleShare!"
msgstr "Добродошли у СпарклШер!"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
#: ../SparkleShare/SparkleStatusIcon.cs:77
#: ../SparkleShare/SparkleStatusIcon.cs:91
msgid "Up to date"
msgstr "Све је синхронизовано"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
#: ../SparkleShare/SparkleStatusIcon.cs:106
msgid "Syncing…"
msgstr "Синхронизација..."
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
+#: ../SparkleShare/SparkleStatusIcon.cs:118
msgid "Not everything is synced"
msgstr "Није све синхронизовано"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
msgid "Copy Web Link"
msgstr "Копирај веб линк"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
msgid "Copy the web address of this file to the clipboard"
msgstr "Копирај веб адресу ове датотеке"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
msgid "Get Earlier Version"
msgstr "Добави ранију верзију"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
msgid "Make a copy of an earlier version in this folder"
msgstr "Направи копију раније верзије у овом директоријуму"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
msgid "Select to get a copy of this version"
msgstr "Изабери да добавиш копију ове верзије"
-#: ../SparkleShare/Program.cs:51
+#: ../SparkleShare/Program.cs:50
msgid "Print version information"
msgstr "Исписује информацију о верзији"
-#: ../SparkleShare/Program.cs:52
+#: ../SparkleShare/Program.cs:51
msgid "Show this help text"
msgstr "Приказује овај текст помоћи"
-#: ../SparkleShare/Program.cs:84
+#: ../SparkleShare/Program.cs:83
msgid "SparkleShare, a collaboration and sharing tool."
msgstr "СпарклШер, алатка за сарадњу и дељење."
-#: ../SparkleShare/Program.cs:85
+#: ../SparkleShare/Program.cs:84
msgid "Copyright (C) 2010 Hylke Bons"
msgstr "Copyright (C) 2010 Hylke Bons"
-#: ../SparkleShare/Program.cs:87
+#: ../SparkleShare/Program.cs:86
msgid "This program comes with ABSOLUTELY NO WARRANTY."
msgstr "Овај програм долази БЕЗ ИКАКВЕ ГАРАНЦИЈЕ."
-#: ../SparkleShare/Program.cs:89
+#: ../SparkleShare/Program.cs:88
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Ово је слободан софтвер, и можете га редистрибуирати"
-#: ../SparkleShare/Program.cs:90
+#: ../SparkleShare/Program.cs:89
msgid "under certain conditions. Please read the GNU GPLv3 for details."
msgstr "под одређеним условима. Молимо прочитајте ГНУ ОЈЛв3 за више детаља."
-#: ../SparkleShare/Program.cs:92
+#: ../SparkleShare/Program.cs:91
msgid "SparkleShare automatically syncs Git repositories in "
msgstr "СпарклШер аутоматски синхронизује Гит ризнице у"
-#: ../SparkleShare/Program.cs:93
+#: ../SparkleShare/Program.cs:92
msgid "the ~/SparkleShare folder with their remote origins."
msgstr "директоријуму ~/SparkleShare са њиховим удаљеним изворима."
-#: ../SparkleShare/Program.cs:95
+#: ../SparkleShare/Program.cs:94
msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
msgstr "Употреба: sparkleshare [start|stop|restart] [OPTION]..."
-#: ../SparkleShare/Program.cs:96
+#: ../SparkleShare/Program.cs:95
msgid "Sync SparkleShare folder with remote repositories."
msgstr "Синхронизуј СпарклШер директоријум са удаљеним ризницама."
-#: ../SparkleShare/Program.cs:98
+#: ../SparkleShare/Program.cs:97
msgid "Arguments:"
msgstr "Аргументи:"
-#: ../SparkleShare/Program.cs:108
+#: ../SparkleShare/Program.cs:107
msgid "SparkleShare "
msgstr "СпарклШер"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
msgid "About SparkleShare"
msgstr "О СпарклШеру"
@@ -182,67 +188,30 @@ msgstr "Новија верзија ({0}) је доступна!"
msgid "You are running the latest version."
msgstr "Кориситите последњу верзију."
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "Проверавам освежења..."
-#: ../SparkleShare/SparkleControllerBase.cs:493
+#: ../SparkleShare/SparkleControllerBase.cs:489
msgid "dddd, MMMM d, yyyy"
msgstr ""
-#: ../SparkleShare/SparkleControllerBase.cs:499
+#: ../SparkleShare/SparkleControllerBase.cs:495
msgid "dddd, MMMM d"
msgstr ""
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
+#: ../SparkleShare/SparkleEventLog.cs:56
msgid "Recent Events"
msgstr "Скорашњи догађаји"
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
+#: ../SparkleShare/SparkleEventLog.cs:145
+#: ../SparkleShare/SparkleEventLog.cs:164
msgid "All Folders"
msgstr "Сви директоријуми"
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
+#: ../SparkleShare/SparkleOptions.cs:486
+msgid "OptionName"
msgstr ""
-"Пре него што направимо СпарклШер директоријум на овом рачунару, потребно нам"
-" је неколико информација од Вас."
#: ../SparkleShare/SparkleSetup.cs:83
msgid "Full Name:"
@@ -260,151 +229,150 @@ msgstr "Даље"
msgid "Where's your project hosted?"
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:275
+#: ../SparkleShare/SparkleSetup.cs:266
msgid "Address"
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:295
+#: ../SparkleShare/SparkleSetup.cs:286
msgid "Remote Path"
msgstr ""
#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
+#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
msgid "Cancel"
msgstr "Одустани"
#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
+#: ../SparkleShare/SparkleSetup.cs:307
msgid "Add"
-msgstr ""
+msgstr "Додајте"
-#: ../SparkleShare/SparkleSetup.cs:335
+#: ../SparkleShare/SparkleSetup.cs:326
#, csharp-format
msgid "Adding project ‘{0}’…"
-msgstr ""
+msgstr "Додавање пројекта ‘{0}’…"
-#: ../SparkleShare/SparkleSetup.cs:336
+#: ../SparkleShare/SparkleSetup.cs:327
msgid "This may take a while."
msgstr "Ово може да потраје."
-#: ../SparkleShare/SparkleSetup.cs:337
+#: ../SparkleShare/SparkleSetup.cs:328
msgid "Are you sure it’s not coffee o'clock?"
msgstr "Да ли сте сигурни да није време за кафу?"
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
+#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:558
msgid "Finish"
msgstr "Заврши"
-#: ../SparkleShare/SparkleSetup.cs:374
+#: ../SparkleShare/SparkleSetup.cs:365
msgid "Something went wrong"
msgstr "Нешто је пошло наопако"
-#: ../SparkleShare/SparkleSetup.cs:422
+#: ../SparkleShare/SparkleSetup.cs:413
msgid "Try Again…"
-msgstr ""
+msgstr "Покушајте поново..."
-#: ../SparkleShare/SparkleSetup.cs:441
+#: ../SparkleShare/SparkleSetup.cs:432
#, csharp-format
msgid "‘{0}’ has been successfully added"
msgstr "‘{0}’ успешно додато"
-#: ../SparkleShare/SparkleSetup.cs:447
+#: ../SparkleShare/SparkleSetup.cs:438
msgid "Project successfully added!"
-msgstr ""
+msgstr "Пројекат је успешно додат!"
-#: ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:439
msgid "Access the files from your SparkleShare folder."
msgstr ""
#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
+#: ../SparkleShare/SparkleSetup.cs:442
msgid "Open Folder"
msgstr "Отвори директоријум"
-#: ../SparkleShare/SparkleSetup.cs:477
+#: ../SparkleShare/SparkleSetup.cs:484
msgid "What's happening next?"
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:478
+#: ../SparkleShare/SparkleSetup.cs:485
msgid ""
"SparkleShare creates a special folder in your personal folder that will keep"
" track of your projects."
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:481
+#: ../SparkleShare/SparkleSetup.cs:488
msgid "Skip Tutorial"
-msgstr ""
+msgstr "Прескочи туторијал"
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
+#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
+#: ../SparkleShare/SparkleSetup.cs:531
msgid "Continue"
-msgstr ""
+msgstr "Настави"
-#: ../SparkleShare/SparkleSetup.cs:502
+#: ../SparkleShare/SparkleSetup.cs:509
msgid "Sharing files with others"
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:503
+#: ../SparkleShare/SparkleSetup.cs:510
msgid ""
"All files added to your project folders are synced with the host "
"automatically, as well as with your collaborators."
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:520
+#: ../SparkleShare/SparkleSetup.cs:527
msgid "The status icon is here to help"
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:521
+#: ../SparkleShare/SparkleSetup.cs:528
msgid ""
"It shows the syncing process status, and contains links to your projects and"
" the event log."
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:538
+#: ../SparkleShare/SparkleSetup.cs:545
msgid "Adding projects to SparkleShare"
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:539
+#: ../SparkleShare/SparkleSetup.cs:546
msgid ""
"Just click this button when you see it on the web, and the project will be "
"automatically added:"
msgstr ""
-#: ../SparkleShare/SparkleSetup.cs:542
+#: ../SparkleShare/SparkleSetup.cs:549
msgid ""
"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
" by hand."
msgstr ""
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
-
#: ../SparkleShare/SparkleSetupWindow.cs:44
msgid "SparkleShare Setup"
msgstr "СпарклШер подешавања"
-#: ../SparkleShare/SparkleStatusIcon.cs:228
+#: ../SparkleShare/SparkleStatusIcon.cs:230
msgid "No projects yet"
msgstr ""
-#: ../SparkleShare/SparkleStatusIcon.cs:262
+#. Opens the wizard to add a new remote folder
+#: ../SparkleShare/SparkleStatusIcon.cs:240
+msgid "Add Hosted Project…"
+msgstr ""
+
+#: ../SparkleShare/SparkleStatusIcon.cs:264
msgid "Open Recent Events"
msgstr ""
-#: ../SparkleShare/SparkleStatusIcon.cs:282
+#: ../SparkleShare/SparkleStatusIcon.cs:284
msgid "Turn Notifications Off"
msgstr "Угаси обавештења"
-#: ../SparkleShare/SparkleStatusIcon.cs:284
+#: ../SparkleShare/SparkleStatusIcon.cs:286
msgid "Turn Notifications On"
msgstr "Укључи обавештења"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
+#: ../SparkleShare/SparkleStatusIcon.cs:313
msgid "Quit"
msgstr "Крај рада"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f147ae4..acbdc6e 100755
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,14 +1,15 @@
# This file is distributed under the same license as the SparkleShare package.
#
# Translators:
+# <focusheart at gmail.com>, 2011.
# <yujiang.wang at ymail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 15:50+0100\n"
-"PO-Revision-Date: 2011-10-30 14:50+0000\n"
-"Last-Translator: deejay1 <deejay1 at srem.org>\n"
+"POT-Creation-Date: 2011-12-04 12:45+0100\n"
+"PO-Revision-Date: 2011-12-08 07:18+0000\n"
+"Last-Translator: focusheart <focusheart at gmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -17,27 +18,27 @@ msgstr ""
#: ../data/plugins/bitbucket.xml.in.h:1 ../data/plugins/github.xml.in.h:1
msgid "/username/project"
-msgstr ""
+msgstr "/username/project"
#: ../data/plugins/bitbucket.xml.in.h:2
msgid "Bitbucket"
-msgstr ""
+msgstr "小桶"
#: ../data/plugins/bitbucket.xml.in.h:3
msgid "Free code hosting for Git and Mercurial"
-msgstr ""
+msgstr "免费的Git与Mercurial代码托管"
#: ../data/plugins/github.xml.in.h:2
msgid "Free public Git repositories with collaborator management"
-msgstr ""
+msgstr "具备协作管理的免费开放仓库"
#: ../data/plugins/github.xml.in.h:3
msgid "Github"
-msgstr ""
+msgstr "Github"
#: ../data/plugins/gitorious.xml.in.h:1
msgid "/project/repository"
-msgstr ""
+msgstr "/project/repository"
#: ../data/plugins/gitorious.xml.in.h:2
msgid "Gitorious"
@@ -45,15 +46,15 @@ msgstr "Gitorious"
#: ../data/plugins/gitorious.xml.in.h:3
msgid "Open source infrastructure for hosting open source projects"
-msgstr ""
+msgstr "托管开源项目的开源架构"
#: ../data/plugins/gnome.xml.in.h:1
msgid "/project"
-msgstr ""
+msgstr "/project"
#: ../data/plugins/gnome.xml.in.h:2
msgid "A free and easy interface for your computer"
-msgstr ""
+msgstr "为你的计算机提供一个免费并且简单的接口"
#: ../data/plugins/gnome.xml.in.h:3
msgid "The GNOME Project"
@@ -61,182 +62,155 @@ msgstr "GMOME项目"
#: ../data/plugins/own-server.xml.in.h:1
msgid "/path/to/project"
-msgstr ""
+msgstr "/path/to/project"
#: ../data/plugins/own-server.xml.in.h:2
msgid "Everything under my control"
-msgstr ""
+msgstr "一切尽在你的掌控"
#: ../data/plugins/own-server.xml.in.h:3
msgid "On my own server"
-msgstr ""
+msgstr "拥有你自己的服务器"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:102
#: ../SparkleShare/SparkleSetup.cs:75 ../SparkleShare/SparkleStatusIcon.cs:75
#: ../SparkleShare/SparkleStatusIcon.cs:89
msgid "Welcome to SparkleShare!"
msgstr "欢迎使用 SparkleShare！"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:104
#: ../SparkleShare/SparkleStatusIcon.cs:77
#: ../SparkleShare/SparkleStatusIcon.cs:91
msgid "Up to date"
-msgstr ""
+msgstr "保持最新"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:113
#: ../SparkleShare/SparkleStatusIcon.cs:106
msgid "Syncing…"
msgstr "同步中..."
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
-#: ../SparkleShare/SparkleStatusIcon.cs:116
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:125
+#: ../SparkleShare/SparkleStatusIcon.cs:118
msgid "Not everything is synced"
-msgstr ""
+msgstr "尚有内容未同步"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:141
msgid "Copy Web Link"
msgstr "复制Web链接"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:115
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:142
msgid "Copy the web address of this file to the clipboard"
msgstr "复制该文件的Web地址到剪贴板"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:174
msgid "Get Earlier Version"
msgstr "获取较早的版本"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:149
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:175
msgid "Make a copy of an earlier version in this folder"
msgstr "在本目录中制作一个较早的版本"
-#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:162
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in:188
msgid "Select to get a copy of this version"
msgstr "获取该版本的复制"
-#: ../SparkleShare/Program.cs:51
+#: ../SparkleShare/Program.cs:50
msgid "Print version information"
-msgstr ""
+msgstr "打印版本信息"
-#: ../SparkleShare/Program.cs:52
+#: ../SparkleShare/Program.cs:51
msgid "Show this help text"
-msgstr ""
+msgstr "显示当前帮助文字"
-#: ../SparkleShare/Program.cs:84
+#: ../SparkleShare/Program.cs:83
msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
+msgstr "SparkleShare，协作与分享的工具"
-#: ../SparkleShare/Program.cs:85
+#: ../SparkleShare/Program.cs:84
msgid "Copyright (C) 2010 Hylke Bons"
-msgstr ""
+msgstr "版权(C) 2010 Hylke Bons"
-#: ../SparkleShare/Program.cs:87
+#: ../SparkleShare/Program.cs:86
msgid "This program comes with ABSOLUTELY NO WARRANTY."
msgstr "本程序不提供任何质量保证"
-#: ../SparkleShare/Program.cs:89
+#: ../SparkleShare/Program.cs:88
msgid "This is free software, and you are welcome to redistribute it "
msgstr "这是自由软件，欢迎您再次分发。"
-#: ../SparkleShare/Program.cs:90
+#: ../SparkleShare/Program.cs:89
msgid "under certain conditions. Please read the GNU GPLv3 for details."
msgstr "在某种条件下。详情请参见 GNU GPLv3。"
-#: ../SparkleShare/Program.cs:92
+#: ../SparkleShare/Program.cs:91
msgid "SparkleShare automatically syncs Git repositories in "
-msgstr ""
+msgstr "SparkleShare 自动同步Git仓库"
-#: ../SparkleShare/Program.cs:93
+#: ../SparkleShare/Program.cs:92
msgid "the ~/SparkleShare folder with their remote origins."
-msgstr ""
+msgstr "~/SparkleShare 目录与远程所有"
-#: ../SparkleShare/Program.cs:95
+#: ../SparkleShare/Program.cs:94
msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
msgstr "用法：sparkleshare [start|stop|restart] [OPTION]..."
-#: ../SparkleShare/Program.cs:96
+#: ../SparkleShare/Program.cs:95
msgid "Sync SparkleShare folder with remote repositories."
-msgstr ""
+msgstr "与远程仓库同步SparkleShare "
-#: ../SparkleShare/Program.cs:98
+#: ../SparkleShare/Program.cs:97
msgid "Arguments:"
msgstr "参数："
-#: ../SparkleShare/Program.cs:108
+#: ../SparkleShare/Program.cs:107
msgid "SparkleShare "
msgstr "SparkleShare"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:297
msgid "About SparkleShare"
msgstr "关于 SparkleShare"
#: ../SparkleShare/SparkleAbout.cs:70
#, csharp-format
msgid "A newer version ({0}) is available!"
-msgstr ""
+msgstr "有新版本({0})了！"
#: ../SparkleShare/SparkleAbout.cs:79
msgid "You are running the latest version."
-msgstr ""
+msgstr "你所使用的是最新版本"
-#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
-msgstr ""
+msgstr "正在检查更新..."
-#: ../SparkleShare/SparkleControllerBase.cs:493
+#: ../SparkleShare/SparkleControllerBase.cs:489
msgid "dddd, MMMM d, yyyy"
-msgstr ""
+msgstr "dddd,MMMM d, yyyy"
-#: ../SparkleShare/SparkleControllerBase.cs:499
+#: ../SparkleShare/SparkleControllerBase.cs:495
msgid "dddd, MMMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:707
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:712
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:717
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:722
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleControllerBase.cs:731
-#, csharp-format
-msgid "and {0} more"
-msgid_plural "and {0} more"
-msgstr[0] ""
+msgstr "ddd, MMMM d"
-#: ../SparkleShare/SparkleControllerBase.cs:735
-msgid "did something magical"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:58
+#: ../SparkleShare/SparkleEventLog.cs:56
msgid "Recent Events"
-msgstr ""
+msgstr "最近事件"
-#: ../SparkleShare/SparkleEventLog.cs:169
-#: ../SparkleShare/SparkleEventLog.cs:188
+#: ../SparkleShare/SparkleEventLog.cs:145
+#: ../SparkleShare/SparkleEventLog.cs:164
msgid "All Folders"
-msgstr ""
+msgstr "所有目录"
-#: ../SparkleShare/SparkleSetup.cs:76
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
+#: ../SparkleShare/SparkleOptions.cs:486
+msgid "OptionName"
+msgstr "选项名称"
#: ../SparkleShare/SparkleSetup.cs:83
msgid "Full Name:"
@@ -252,153 +226,152 @@ msgstr "下一步"
#: ../SparkleShare/SparkleSetup.cs:129
msgid "Where's your project hosted?"
-msgstr ""
+msgstr "你的项目托管在哪里？"
-#: ../SparkleShare/SparkleSetup.cs:275
+#: ../SparkleShare/SparkleSetup.cs:266
msgid "Address"
-msgstr ""
+msgstr "地址"
-#: ../SparkleShare/SparkleSetup.cs:295
+#: ../SparkleShare/SparkleSetup.cs:286
msgid "Remote Path"
-msgstr ""
+msgstr "远程路径"
#. Cancel button
-#: ../SparkleShare/SparkleSetup.cs:309 ../SparkleShare/SparkleSetup.cs:345
+#: ../SparkleShare/SparkleSetup.cs:300 ../SparkleShare/SparkleSetup.cs:336
msgid "Cancel"
msgstr "取消"
#. Sync button
-#: ../SparkleShare/SparkleSetup.cs:316
+#: ../SparkleShare/SparkleSetup.cs:307
msgid "Add"
-msgstr ""
+msgstr "添加"
-#: ../SparkleShare/SparkleSetup.cs:335
+#: ../SparkleShare/SparkleSetup.cs:326
#, csharp-format
msgid "Adding project ‘{0}’…"
-msgstr ""
+msgstr "添加项目'{0}'..."
-#: ../SparkleShare/SparkleSetup.cs:336
+#: ../SparkleShare/SparkleSetup.cs:327
msgid "This may take a while."
-msgstr ""
+msgstr "这可能要花一点时间。"
-#: ../SparkleShare/SparkleSetup.cs:337
+#: ../SparkleShare/SparkleSetup.cs:328
msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
+msgstr "你不觉得现在是休息时间么？"
-#: ../SparkleShare/SparkleSetup.cs:341 ../SparkleShare/SparkleSetup.cs:457
-#: ../SparkleShare/SparkleSetup.cs:556
+#: ../SparkleShare/SparkleSetup.cs:332 ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:558
msgid "Finish"
msgstr "完成"
-#: ../SparkleShare/SparkleSetup.cs:374
+#: ../SparkleShare/SparkleSetup.cs:365
msgid "Something went wrong"
-msgstr ""
+msgstr "好像有什么问题"
-#: ../SparkleShare/SparkleSetup.cs:422
+#: ../SparkleShare/SparkleSetup.cs:413
msgid "Try Again…"
-msgstr ""
+msgstr "再试试看..."
-#: ../SparkleShare/SparkleSetup.cs:441
+#: ../SparkleShare/SparkleSetup.cs:432
#, csharp-format
msgid "‘{0}’ has been successfully added"
-msgstr ""
+msgstr "'{0}'被成功添加"
-#: ../SparkleShare/SparkleSetup.cs:447
+#: ../SparkleShare/SparkleSetup.cs:438
msgid "Project successfully added!"
-msgstr ""
+msgstr "项目成功添加！"
-#: ../SparkleShare/SparkleSetup.cs:448
+#: ../SparkleShare/SparkleSetup.cs:439
msgid "Access the files from your SparkleShare folder."
-msgstr ""
+msgstr "从你的SparkleShare目录访问这些文件。"
#. A button that opens the synced folder
-#: ../SparkleShare/SparkleSetup.cs:451
+#: ../SparkleShare/SparkleSetup.cs:442
msgid "Open Folder"
msgstr "打开文件夹"
-#: ../SparkleShare/SparkleSetup.cs:477
+#: ../SparkleShare/SparkleSetup.cs:484
msgid "What's happening next?"
-msgstr ""
+msgstr "下来做什么？"
-#: ../SparkleShare/SparkleSetup.cs:478
+#: ../SparkleShare/SparkleSetup.cs:485
msgid ""
"SparkleShare creates a special folder in your personal folder that will keep"
" track of your projects."
-msgstr ""
+msgstr "SparkleShare在你的个人文件夹中创建了一个特别的文件夹用以保持跟踪你的项目。"
-#: ../SparkleShare/SparkleSetup.cs:481
+#: ../SparkleShare/SparkleSetup.cs:488
msgid "Skip Tutorial"
-msgstr ""
+msgstr "跳过教程"
-#: ../SparkleShare/SparkleSetup.cs:486 ../SparkleShare/SparkleSetup.cs:506
-#: ../SparkleShare/SparkleSetup.cs:524
+#: ../SparkleShare/SparkleSetup.cs:493 ../SparkleShare/SparkleSetup.cs:513
+#: ../SparkleShare/SparkleSetup.cs:531
msgid "Continue"
-msgstr ""
+msgstr "继续"
-#: ../SparkleShare/SparkleSetup.cs:502
+#: ../SparkleShare/SparkleSetup.cs:509
msgid "Sharing files with others"
-msgstr ""
+msgstr "与他人分享文件"
-#: ../SparkleShare/SparkleSetup.cs:503
+#: ../SparkleShare/SparkleSetup.cs:510
msgid ""
"All files added to your project folders are synced with the host "
"automatically, as well as with your collaborators."
-msgstr ""
+msgstr "所有添加到你的项目中的文件都将与服务器自动同步，你的所有协作伙伴们也是如此。"
-#: ../SparkleShare/SparkleSetup.cs:520
+#: ../SparkleShare/SparkleSetup.cs:527
msgid "The status icon is here to help"
-msgstr ""
+msgstr "状态图标可以提供帮助"
-#: ../SparkleShare/SparkleSetup.cs:521
+#: ../SparkleShare/SparkleSetup.cs:528
msgid ""
"It shows the syncing process status, and contains links to your projects and"
" the event log."
-msgstr ""
+msgstr "此处显示同步进度状态，并且包含了到你的项目和事件日志的链接。"
-#: ../SparkleShare/SparkleSetup.cs:538
+#: ../SparkleShare/SparkleSetup.cs:545
msgid "Adding projects to SparkleShare"
-msgstr ""
+msgstr "向SparkleShare添加项目"
-#: ../SparkleShare/SparkleSetup.cs:539
+#: ../SparkleShare/SparkleSetup.cs:546
msgid ""
"Just click this button when you see it on the web, and the project will be "
"automatically added:"
-msgstr ""
+msgstr "在网页上看到这个按钮的时候即可点击，项目会被自动添加进去；"
-#: ../SparkleShare/SparkleSetup.cs:542
+#: ../SparkleShare/SparkleSetup.cs:549
msgid ""
"…or select <b>‘Add Hosted Project…’</b> from the status icon menu to add one"
" by hand."
-msgstr ""
-
-#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleSetup.cs:551
-#: ../SparkleShare/SparkleStatusIcon.cs:238
-msgid "Add Hosted Project…"
-msgstr ""
+msgstr "...或者从状态图标菜单中选择 <b>'添加已托管的项目...'</b>来手工添加。"
#: ../SparkleShare/SparkleSetupWindow.cs:44
msgid "SparkleShare Setup"
msgstr "SparkleShare "
-#: ../SparkleShare/SparkleStatusIcon.cs:228
+#: ../SparkleShare/SparkleStatusIcon.cs:230
msgid "No projects yet"
-msgstr ""
+msgstr "尚无项目"
+
+#. Opens the wizard to add a new remote folder
+#: ../SparkleShare/SparkleStatusIcon.cs:240
+msgid "Add Hosted Project…"
+msgstr "添加已托管的项目"
-#: ../SparkleShare/SparkleStatusIcon.cs:262
+#: ../SparkleShare/SparkleStatusIcon.cs:264
msgid "Open Recent Events"
-msgstr ""
+msgstr "打开最近的活动"
-#: ../SparkleShare/SparkleStatusIcon.cs:282
+#: ../SparkleShare/SparkleStatusIcon.cs:284
msgid "Turn Notifications Off"
-msgstr ""
+msgstr "关闭通知"
-#: ../SparkleShare/SparkleStatusIcon.cs:284
+#: ../SparkleShare/SparkleStatusIcon.cs:286
msgid "Turn Notifications On"
-msgstr ""
+msgstr "打开通知"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:311
+#: ../SparkleShare/SparkleStatusIcon.cs:313
msgid "Quit"
msgstr "退出"
--
sparkleshare
More information about the Pkg-cli-apps-commits
mailing list