Index: mono-mcs.install =================================================================== --- mono-mcs.install (revision 3728) +++ mono-mcs.install (working copy) @@ -1,2 +1,3 @@ debian/tmp/usr/bin/mcs +debian/tmp/usr/bin/mcs1 debian/tmp/usr/lib/mono/1.0/mcs.exe* Index: libmono-webbrowser0.5-cil.install =================================================================== --- libmono-webbrowser0.5-cil.install (revision 0) +++ libmono-webbrowser0.5-cil.install (revision 0) @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/mono/gac/Mono.WebBrowser/0.5.0.0__*/ +debian/tmp/usr/lib/mono/2.0/Mono.WebBrowser.dll Index: patches/fix_Assembly.LoadFrom_deadlock.dpatch =================================================================== --- patches/fix_Assembly.LoadFrom_deadlock.dpatch (revision 3728) +++ patches/fix_Assembly.LoadFrom_deadlock.dpatch (working copy) @@ -1,2748 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_Assembly.LoadFrom_deadlock_r113458.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixes a deadlock in Assembly.LoadFrom(), see: -## DP: https://bugzilla.novell.com/show_bug.cgi?id=434289 -## DP: https://bugzilla.novell.com/show_bug.cgi?id=323696 -## DP: Backported from upstream SVN revisions: -## DP: r105036: -## DP: * assembly.c (mono_assembly_load_from_full): Avoid calling the search hooks -## DP: while holding the assemblies lock to prevent deadlocks. Handle the case -## DP: where the search hook returns NULL but the assembly was still loaded. -## DP: Fixes #323696. -## DP: -## DP: r105153: -## DP: * assembly.c (mono_assembly_loaded_full): Avoid calling the search hooks while -## DP: holding the assemblies lock here too. -## DP: -## DP: r113458: -## DP: * class.c (can_access_internals): Call mono_assembly_load_friends () -## DP: before accessing the friend_assembly_names field. -## DP: * assembly.c (mono_assembly_load_friends): Make this callable multiple -## DP: times. -## DP: (mono_assembly_load_from_full): Avoid calling load_friends (), it is -## DP: called lazily when it is needed. -## DP: * metadata-internals.h (struct _MonoAssembly): Add -## DP: 'friend_assembly_names_inited' flag. -## DP: -## DP: r115451: -## DP: * assembly.c: in mono_assembly_load_friends() take the assemblies lock -## DP: for the least possible amount of time (extending the fix in r113458). -## DP: -## DP: r115697: -## DP: * assembly.c (mono_assembly_open_full): Avoid loading images while holding -## DP: the low level assemblies lock. - -@DPATCH@ -diff -urNad mono-1.9.1+dfsg~/mono/metadata/assembly.c mono-1.9.1+dfsg/mono/metadata/assembly.c ---- mono-1.9.1+dfsg~/mono/metadata/assembly.c 2008-10-13 22:43:51.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/metadata/assembly.c 2008-10-13 22:49:51.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - #ifndef PLATFORM_WIN32 -@@ -372,18 +373,6 @@ - return TRUE; - } - --static MonoAssembly* --search_loaded (MonoAssemblyName* aname, gboolean refonly) --{ -- MonoAssembly *ass; -- -- ass = mono_assembly_invoke_search_hook_internal (aname, refonly, FALSE); -- if (ass) -- return ass; -- -- return NULL; --} -- - static MonoAssembly * - load_in_path (const char *basename, const char** search_path, MonoImageOpenStatus *status, MonoBoolean refonly) - { -@@ -1282,11 +1271,8 @@ - if (bundles != NULL) - image = mono_assembly_open_from_bundle (fname, status, refonly); - -- if (!image) { -- mono_assemblies_lock (); -+ if (!image) - image = mono_image_open_full (fname, status, refonly); -- mono_assemblies_unlock (); -- } - - if (!image){ - if (*status == MONO_IMAGE_OK) -@@ -1320,8 +1306,14 @@ - return ass; - } - -+static void -+free_item (gpointer val, gpointer user_data) -+{ -+ g_free (val); -+} -+ - /* -- * mono_load_friend_assemblies: -+ * mono_assembly_load_friends: - * @ass: an assembly - * - * Load the list of friend assemblies that are allowed to access -@@ -1336,9 +1328,32 @@ - mono_assembly_load_friends (MonoAssembly* ass) - { - int i; -- MonoCustomAttrInfo* attrs = mono_custom_attrs_from_assembly (ass); -- if (!attrs) -+ MonoCustomAttrInfo* attrs; -+ GSList *list; -+ -+ if (ass->friend_assembly_names_inited) - return; -+ -+ attrs = mono_custom_attrs_from_assembly (ass); -+ if (!attrs) { -+ mono_assemblies_lock (); -+ ass->friend_assembly_names_inited = TRUE; -+ mono_assemblies_unlock (); -+ return; -+ } -+ -+ mono_assemblies_lock (); -+ if (ass->friend_assembly_names_inited) { -+ mono_assemblies_unlock (); -+ return; -+ } -+ mono_assemblies_unlock (); -+ -+ list = NULL; -+ /* -+ * We build the list outside the assemblies lock, the worse that can happen -+ * is that we'll need to free the allocated list. -+ */ - for (i = 0; i < attrs->num_attrs; ++i) { - MonoCustomAttrEntry *attr = &attrs->attrs [i]; - MonoAssemblyName *aname; -@@ -1357,12 +1372,26 @@ - aname = g_new0 (MonoAssemblyName, 1); - /*g_print ("friend ass: %s\n", data);*/ - if (mono_assembly_name_parse_full (data, aname, TRUE, NULL, NULL)) { -- ass->friend_assembly_names = g_slist_prepend (ass->friend_assembly_names, aname); -+ list = g_slist_prepend (list, aname); - } else { - g_free (aname); - } - } - mono_custom_attrs_free (attrs); -+ -+ mono_assemblies_lock (); -+ if (ass->friend_assembly_names_inited) { -+ mono_assemblies_unlock (); -+ g_slist_foreach (list, free_item, NULL); -+ g_slist_free (list); -+ return; -+ } -+ ass->friend_assembly_names = list; -+ -+ /* Because of the double checked locking pattern above */ -+ mono_memory_barrier (); -+ ass->friend_assembly_names_inited = TRUE; -+ mono_assemblies_unlock (); - } - - /** -@@ -1441,14 +1470,12 @@ - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Image addref %s %p -> %s %p: %d\n", ass->aname.name, ass, image->name, image, image->ref_count); - - /* -- * Atomically search the loaded list and add ourselves to it if necessary. -+ * The load hooks might take locks so we can't call them while holding the -+ * assemblies lock. - */ -- mono_assemblies_lock (); - if (ass->aname.name) { -- /* avoid loading the same assembly twice for now... */ -- ass2 = search_loaded (&ass->aname, refonly); -+ ass2 = mono_assembly_invoke_search_hook_internal (&ass->aname, refonly, FALSE); - if (ass2) { -- mono_assemblies_unlock (); - g_free (ass); - g_free (base_dir); - mono_image_close (image); -@@ -1457,12 +1484,25 @@ - } - } - -- g_assert (image->assembly == NULL); -+ mono_assemblies_lock (); -+ -+ if (image->assembly) { -+ /* -+ * This means another thread has already loaded the assembly, but not yet -+ * called the load hooks so the search hook can't find the assembly. -+ */ -+ mono_assemblies_unlock (); -+ ass2 = image->assembly; -+ g_free (ass); -+ g_free (base_dir); -+ mono_image_close (image); -+ *status = MONO_IMAGE_OK; -+ return ass2; -+ } -+ - image->assembly = ass; - - loaded_assemblies = g_list_prepend (loaded_assemblies, ass); -- if (mono_defaults.internals_visible_class) -- mono_assembly_load_friends (ass); - mono_assemblies_unlock (); - - mono_assembly_invoke_load_hook (ass); -@@ -2301,9 +2341,7 @@ - - aname = mono_assembly_remap_version (aname, &maped_aname); - -- mono_assemblies_lock (); -- res = search_loaded (aname, refonly); -- mono_assemblies_unlock (); -+ res = mono_assembly_invoke_search_hook_internal (aname, refonly, FALSE); - - return res; - } -diff -urNad mono-1.9.1+dfsg~/mono/metadata/assembly.c.orig mono-1.9.1+dfsg/mono/metadata/assembly.c.orig ---- mono-1.9.1+dfsg~/mono/metadata/assembly.c.orig 1970-01-01 01:00:00.000000000 +0100 -+++ mono-1.9.1+dfsg/mono/metadata/assembly.c.orig 2008-10-13 22:44:32.000000000 +0200 -@@ -0,0 +1,2503 @@ -+/* -+ * assembly.c: Routines for loading assemblies. -+ * -+ * Author: -+ * Miguel de Icaza (miguel@ximian.com) -+ * -+ * (C) 2001 Ximian, Inc. http://www.ximian.com -+ * -+ */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include "assembly.h" -+#include "image.h" -+#include "rawbuffer.h" -+#include "object-internals.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifndef PLATFORM_WIN32 -+#include -+#include -+#include -+#endif -+ -+/* AssemblyVersionMap: an assembly name and the assembly version set on which it is based */ -+typedef struct { -+ const char* assembly_name; -+ guint8 version_set_index; -+} AssemblyVersionMap; -+ -+/* the default search path is empty, the first slot is replaced with the computed value */ -+static const char* -+default_path [] = { -+ NULL, -+ NULL -+}; -+ -+/* Contains the list of directories to be searched for assemblies (MONO_PATH) */ -+static char **assemblies_path = NULL; -+ -+/* Contains the list of directories that point to auxiliary GACs */ -+static char **extra_gac_paths = NULL; -+ -+/* The list of system assemblies what will be remapped to the running -+ * runtime version. WARNING: this list must be sorted. -+ */ -+static const AssemblyVersionMap framework_assemblies [] = { -+ {"Accessibility", 0}, -+ {"Commons.Xml.Relaxng", 0}, -+ {"I18N", 0}, -+ {"I18N.CJK", 0}, -+ {"I18N.MidEast", 0}, -+ {"I18N.Other", 0}, -+ {"I18N.Rare", 0}, -+ {"I18N.West", 0}, -+ {"Microsoft.VisualBasic", 1}, -+ {"Microsoft.VisualC", 1}, -+ {"Mono.Cairo", 0}, -+ {"Mono.CompilerServices.SymbolWriter", 0}, -+ {"Mono.Data", 0}, -+ {"Mono.Data.SybaseClient", 0}, -+ {"Mono.Data.Tds", 0}, -+ {"Mono.Data.TdsClient", 0}, -+ {"Mono.GetOptions", 0}, -+ {"Mono.Http", 0}, -+ {"Mono.Posix", 0}, -+ {"Mono.Security", 0}, -+ {"Mono.Security.Win32", 0}, -+ {"Mono.Xml.Ext", 0}, -+ {"Novell.Directory.Ldap", 0}, -+ {"Npgsql", 0}, -+ {"PEAPI", 0}, -+ {"System", 0}, -+ {"System.Configuration.Install", 0}, -+ {"System.Data", 0}, -+ {"System.Data.OracleClient", 0}, -+ {"System.Data.SqlXml", 0}, -+ {"System.Design", 0}, -+ {"System.DirectoryServices", 0}, -+ {"System.Drawing", 0}, -+ {"System.Drawing.Design", 0}, -+ {"System.EnterpriseServices", 0}, -+ {"System.Management", 0}, -+ {"System.Messaging", 0}, -+ {"System.Runtime.Remoting", 0}, -+ {"System.Runtime.Serialization.Formatters.Soap", 0}, -+ {"System.Security", 0}, -+ {"System.ServiceProcess", 0}, -+ {"System.Web", 0}, -+ {"System.Web.Mobile", 0}, -+ {"System.Web.Services", 0}, -+ {"System.Windows.Forms", 0}, -+ {"System.Xml", 0}, -+ {"mscorlib", 0} -+}; -+ -+/* -+ * keeps track of loaded assemblies -+ */ -+static GList *loaded_assemblies = NULL; -+static MonoAssembly *corlib; -+ -+/* This protects loaded_assemblies and image->references */ -+#define mono_assemblies_lock() EnterCriticalSection (&assemblies_mutex) -+#define mono_assemblies_unlock() LeaveCriticalSection (&assemblies_mutex) -+static CRITICAL_SECTION assemblies_mutex; -+ -+/* If defined, points to the bundled assembly information */ -+const MonoBundledAssembly **bundles; -+ -+/* Loaded assembly binding info */ -+static GSList *loaded_assembly_bindings = NULL; -+ -+static MonoAssembly* -+mono_assembly_invoke_search_hook_internal (MonoAssemblyName *aname, gboolean refonly, gboolean postload); -+ -+static gchar* -+encode_public_tok (const guchar *token, gint32 len) -+{ -+ const static gchar allowed [] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; -+ gchar *res; -+ int i; -+ -+ res = g_malloc (len * 2 + 1); -+ for (i = 0; i < len; i++) { -+ res [i * 2] = allowed [token [i] >> 4]; -+ res [i * 2 + 1] = allowed [token [i] & 0xF]; -+ } -+ res [len * 2] = 0; -+ return res; -+} -+ -+static void -+check_path_env (void) -+{ -+ const char *path; -+ char **splitted, **dest; -+ -+ path = g_getenv ("MONO_PATH"); -+ if (!path) -+ return; -+ -+ splitted = g_strsplit (path, G_SEARCHPATH_SEPARATOR_S, 1000); -+ if (assemblies_path) -+ g_strfreev (assemblies_path); -+ assemblies_path = dest = splitted; -+ while (*splitted){ -+ if (**splitted) -+ *dest++ = *splitted; -+ splitted++; -+ } -+ *dest = *splitted; -+ -+ if (g_getenv ("MONO_DEBUG") == NULL) -+ return; -+ -+ while (*splitted) { -+ if (**splitted && !g_file_test (*splitted, G_FILE_TEST_IS_DIR)) -+ g_warning ("'%s' in MONO_PATH doesn't exist or has wrong permissions.", *splitted); -+ -+ splitted++; -+ } -+} -+ -+static void -+check_extra_gac_path_env (void) { -+ const char *path; -+ char **splitted, **dest; -+ -+ path = g_getenv ("MONO_GAC_PREFIX"); -+ if (!path) -+ return; -+ -+ splitted = g_strsplit (path, G_SEARCHPATH_SEPARATOR_S, 1000); -+ if (extra_gac_paths) -+ g_strfreev (extra_gac_paths); -+ extra_gac_paths = dest = splitted; -+ while (*splitted){ -+ if (**splitted) -+ *dest++ = *splitted; -+ splitted++; -+ } -+ *dest = *splitted; -+ -+ if (g_getenv ("MONO_DEBUG") == NULL) -+ return; -+ -+ while (*splitted) { -+ if (**splitted && !g_file_test (*splitted, G_FILE_TEST_IS_DIR)) -+ g_warning ("'%s' in MONO_GAC_PATH doesn't exist or has wrong permissions.", *splitted); -+ -+ splitted++; -+ } -+} -+ -+static gboolean -+assembly_binding_maps_name (MonoAssemblyBindingInfo *info, MonoAssemblyName *aname) -+{ -+ if (strcmp (info->name, aname->name)) -+ return FALSE; -+ -+ if (info->major != aname->major || info->minor != aname->minor) -+ return FALSE; -+ -+ if ((info->culture != NULL) != (aname->culture != NULL)) -+ return FALSE; -+ -+ if (info->culture && strcmp (info->culture, aname->culture)) -+ return FALSE; -+ -+ if (strcmp ((const char *)info->public_key_token, (const char *)aname->public_key_token)) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+mono_assembly_binding_info_free (MonoAssemblyBindingInfo *info) -+{ -+ g_free (info->name); -+ g_free (info->culture); -+} -+ -+static void -+get_publisher_policy_info (MonoImage *image, MonoAssemblyName *aname, MonoAssemblyBindingInfo *binding_info) -+{ -+ MonoTableInfo *t; -+ guint32 cols [MONO_MANIFEST_SIZE]; -+ const gchar *filename; -+ gchar *subpath, *fullpath; -+ -+ t = &image->tables [MONO_TABLE_MANIFESTRESOURCE]; -+ /* MS Impl. accepts policy assemblies with more than -+ * one manifest resource, and only takes the first one */ -+ if (t->rows < 1) { -+ binding_info->is_valid = FALSE; -+ return; -+ } -+ -+ mono_metadata_decode_row (t, 0, cols, MONO_MANIFEST_SIZE); -+ if ((cols [MONO_MANIFEST_IMPLEMENTATION] & MONO_IMPLEMENTATION_MASK) != MONO_IMPLEMENTATION_FILE) { -+ binding_info->is_valid = FALSE; -+ return; -+ } -+ -+ filename = mono_metadata_string_heap (image, cols [MONO_MANIFEST_NAME]); -+ g_assert (filename != NULL); -+ -+ subpath = g_path_get_dirname (image->name); -+ fullpath = g_build_path (G_DIR_SEPARATOR_S, subpath, filename, NULL); -+ mono_config_parse_publisher_policy (fullpath, binding_info); -+ g_free (subpath); -+ g_free (fullpath); -+ -+ /* Define the optional elements/attributes before checking */ -+ if (!binding_info->culture) -+ binding_info->culture = g_strdup (""); -+ -+ /* Check that the most important elements/attributes exist */ -+ if (!binding_info->name || !binding_info->public_key_token [0] || !binding_info->has_old_version_bottom || -+ !binding_info->has_new_version || !assembly_binding_maps_name (binding_info, aname)) { -+ mono_assembly_binding_info_free (binding_info); -+ binding_info->is_valid = FALSE; -+ return; -+ } -+ -+ binding_info->is_valid = TRUE; -+} -+ -+static int -+compare_versions (AssemblyVersionSet *v, MonoAssemblyName *aname) -+{ -+ if (v->major > aname->major) -+ return 1; -+ else if (v->major < aname->major) -+ return -1; -+ -+ if (v->minor > aname->minor) -+ return 1; -+ else if (v->minor < aname->minor) -+ return -1; -+ -+ if (v->build > aname->build) -+ return 1; -+ else if (v->build < aname->build) -+ return -1; -+ -+ if (v->revision > aname->revision) -+ return 1; -+ else if (v->revision < aname->revision) -+ return -1; -+ -+ return 0; -+} -+ -+static gboolean -+check_policy_versions (MonoAssemblyBindingInfo *info, MonoAssemblyName *name) -+{ -+ if (!info->is_valid) -+ return FALSE; -+ -+ /* If has_old_version_top doesn't exist, we don't have an interval */ -+ if (!info->has_old_version_top) { -+ if (compare_versions (&info->old_version_bottom, name) == 0) -+ return TRUE; -+ -+ return FALSE; -+ } -+ -+ /* Check that the version defined by name is valid for the interval */ -+ if (compare_versions (&info->old_version_top, name) < 0) -+ return FALSE; -+ -+ /* We should be greater or equal than the small version */ -+ if (compare_versions (&info->old_version_bottom, name) > 0) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+/** -+ * mono_assembly_names_equal: -+ * @l: first assembly -+ * @r: second assembly. -+ * -+ * Compares two MonoAssemblyNames and returns whether they are equal. -+ * -+ * This compares the names, the cultures, the release version and their -+ * public tokens. -+ * -+ * Returns: TRUE if both assembly names are equal. -+ */ -+gboolean -+mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r) -+{ -+ if (!l->name || !r->name) -+ return FALSE; -+ -+ if (strcmp (l->name, r->name)) -+ return FALSE; -+ -+ if (l->culture && r->culture && strcmp (l->culture, r->culture)) -+ return FALSE; -+ -+ if (l->major != r->major || l->minor != r->minor || -+ l->build != r->build || l->revision != r->revision) -+ if (! ((l->major == 0 && l->minor == 0 && l->build == 0 && l->revision == 0) || (r->major == 0 && r->minor == 0 && r->build == 0 && r->revision == 0))) -+ return FALSE; -+ -+ if (!l->public_key_token [0] || !r->public_key_token [0]) -+ return TRUE; -+ -+ if (strcmp ((char*)l->public_key_token, (char*)r->public_key_token)) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static MonoAssembly * -+load_in_path (const char *basename, const char** search_path, MonoImageOpenStatus *status, MonoBoolean refonly) -+{ -+ int i; -+ char *fullpath; -+ MonoAssembly *result; -+ -+ for (i = 0; search_path [i]; ++i) { -+ fullpath = g_build_filename (search_path [i], basename, NULL); -+ result = mono_assembly_open_full (fullpath, status, refonly); -+ g_free (fullpath); -+ if (result) -+ return result; -+ } -+ return NULL; -+} -+ -+/** -+ * mono_assembly_setrootdir: -+ * @root_dir: The pathname of the root directory where we will locate assemblies -+ * -+ * This routine sets the internal default root directory for looking up -+ * assemblies. -+ * -+ * This is used by Windows installations to compute dynamically the -+ * place where the Mono assemblies are located. -+ * -+ */ -+void -+mono_assembly_setrootdir (const char *root_dir) -+{ -+ /* -+ * Override the MONO_ASSEMBLIES directory configured at compile time. -+ */ -+ /* Leak if called more than once */ -+ default_path [0] = g_strdup (root_dir); -+} -+ -+/** -+ * mono_assembly_getrootdir: -+ * -+ * Obtains the root directory used for looking up assemblies. -+ * -+ * Returns: a string with the directory, this string should not be freed. -+ */ -+G_CONST_RETURN gchar * -+mono_assembly_getrootdir (void) -+{ -+ return default_path [0]; -+} -+ -+/** -+ * mono_set_dirs: -+ * @assembly_dir: the base directory for assemblies -+ * @config_dir: the base directory for configuration files -+ * -+ * This routine is used internally and by developers embedding -+ * the runtime into their own applications. -+ * -+ * There are a number of cases to consider: Mono as a system-installed -+ * package that is available on the location preconfigured or Mono in -+ * a relocated location. -+ * -+ * If you are using a system-installed Mono, you can pass NULL -+ * to both parameters. If you are not, you should compute both -+ * directory values and call this routine. -+ * -+ * The values for a given PREFIX are: -+ * -+ * assembly_dir: PREFIX/lib -+ * config_dir: PREFIX/etc -+ * -+ * Notice that embedders that use Mono in a relocated way must -+ * compute the location at runtime, as they will be in control -+ * of where Mono is installed. -+ */ -+void -+mono_set_dirs (const char *assembly_dir, const char *config_dir) -+{ -+#if defined (MONO_ASSEMBLIES) -+ if (assembly_dir == NULL) -+ assembly_dir = MONO_ASSEMBLIES; -+#endif -+#if defined (MONO_CFG_DIR) -+ if (config_dir == NULL) -+ config_dir = MONO_CFG_DIR; -+#endif -+ mono_assembly_setrootdir (assembly_dir); -+ mono_set_config_dir (config_dir); -+} -+ -+#ifndef PLATFORM_WIN32 -+ -+static char * -+compute_base (char *path) -+{ -+ char *p = rindex (path, '/'); -+ if (p == NULL) -+ return NULL; -+ -+ /* Not a well known Mono executable, we are embedded, cant guess the base */ -+ if (strcmp (p, "/mono") && strcmp (p, "/monodis") && strcmp (p, "/mint") && strcmp (p, "/monodiet")) -+ return NULL; -+ -+ *p = 0; -+ p = rindex (path, '/'); -+ if (p == NULL) -+ return NULL; -+ -+ if (strcmp (p, "/bin") != 0) -+ return NULL; -+ *p = 0; -+ return path; -+} -+ -+static void -+fallback (void) -+{ -+ mono_set_dirs (MONO_ASSEMBLIES, MONO_CFG_DIR); -+} -+ -+static void -+set_dirs (char *exe) -+{ -+ char *base; -+ char *config, *lib, *mono; -+ struct stat buf; -+ -+ /* -+ * Only /usr prefix is treated specially -+ */ -+ if (strncmp (exe, MONO_BINDIR, strlen (MONO_BINDIR)) == 0 || (base = compute_base (exe)) == NULL){ -+ fallback (); -+ return; -+ } -+ -+ config = g_build_filename (base, "etc", NULL); -+ lib = g_build_filename (base, "lib", NULL); -+ mono = g_build_filename (lib, "mono/1.0", NULL); -+ if (stat (mono, &buf) == -1) -+ fallback (); -+ else { -+ mono_set_dirs (lib, config); -+ } -+ -+ g_free (config); -+ g_free (lib); -+ g_free (mono); -+} -+ -+#endif /* PLATFORM_WIN32 */ -+ -+#ifdef UNDER_CE -+#undef GetModuleFileName -+#define GetModuleFileName ceGetModuleFileNameA -+ -+DWORD ceGetModuleFileNameA(HMODULE hModule, char* lpFilename, DWORD nSize) -+{ -+ DWORD res = 0; -+ wchar_t* wbuff = (wchar_t*)LocalAlloc(LPTR, nSize*2); -+ res = GetModuleFileNameW(hModule, wbuff, nSize); -+ if (res) { -+ int len = wcslen(wbuff); -+ WideCharToMultiByte(CP_ACP, 0, wbuff, len, lpFilename, len, NULL, NULL); -+ } -+ LocalFree(wbuff); -+ return res; -+} -+#endif -+ -+/** -+ * mono_set_rootdir: -+ * -+ * Registers the root directory for the Mono runtime, for Linux and Solaris 10, -+ * this auto-detects the prefix where Mono was installed. -+ */ -+void -+mono_set_rootdir (void) -+{ -+#ifdef PLATFORM_WIN32 -+ gunichar2 moddir [MAXPATHLEN]; -+ gchar *bindir, *installdir, *root, *utf8name, *config; -+ -+ GetModuleFileNameW (NULL, moddir, MAXPATHLEN); -+ utf8name = g_utf16_to_utf8 (moddir, -1, NULL, NULL, NULL); -+ bindir = g_path_get_dirname (utf8name); -+ installdir = g_path_get_dirname (bindir); -+ root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL); -+ -+ config = g_build_filename (root, "..", "etc", NULL); -+ mono_set_dirs (root, config); -+ -+ g_free (config); -+ g_free (root); -+ g_free (installdir); -+ g_free (bindir); -+ g_free (utf8name); -+#else -+ char buf [4096]; -+ int s; -+ char *str; -+ -+ /* Linux style */ -+ s = readlink ("/proc/self/exe", buf, sizeof (buf)-1); -+ -+ if (s != -1){ -+ buf [s] = 0; -+ set_dirs (buf); -+ return; -+ } -+ -+ /* Solaris 10 style */ -+ str = g_strdup_printf ("/proc/%d/path/a.out", getpid ()); -+ s = readlink (str, buf, sizeof (buf)-1); -+ g_free (str); -+ if (s != -1){ -+ buf [s] = 0; -+ set_dirs (buf); -+ return; -+ } -+ fallback (); -+#endif -+} -+ -+/** -+ * mono_assemblies_init: -+ * -+ * Initialize global variables used by this module. -+ */ -+void -+mono_assemblies_init (void) -+{ -+ /* -+ * Initialize our internal paths if we have not been initialized yet. -+ * This happens when embedders use Mono. -+ */ -+ if (mono_assembly_getrootdir () == NULL) -+ mono_set_rootdir (); -+ -+ check_path_env (); -+ check_extra_gac_path_env (); -+ -+ InitializeCriticalSection (&assemblies_mutex); -+} -+ -+gboolean -+mono_assembly_fill_assembly_name (MonoImage *image, MonoAssemblyName *aname) -+{ -+ MonoTableInfo *t = &image->tables [MONO_TABLE_ASSEMBLY]; -+ guint32 cols [MONO_ASSEMBLY_SIZE]; -+ -+ if (!t->rows) -+ return FALSE; -+ -+ mono_metadata_decode_row (t, 0, cols, MONO_ASSEMBLY_SIZE); -+ -+ aname->hash_len = 0; -+ aname->hash_value = NULL; -+ aname->name = mono_metadata_string_heap (image, cols [MONO_ASSEMBLY_NAME]); -+ aname->culture = mono_metadata_string_heap (image, cols [MONO_ASSEMBLY_CULTURE]); -+ aname->flags = cols [MONO_ASSEMBLY_FLAGS]; -+ aname->major = cols [MONO_ASSEMBLY_MAJOR_VERSION]; -+ aname->minor = cols [MONO_ASSEMBLY_MINOR_VERSION]; -+ aname->build = cols [MONO_ASSEMBLY_BUILD_NUMBER]; -+ aname->revision = cols [MONO_ASSEMBLY_REV_NUMBER]; -+ aname->hash_alg = cols [MONO_ASSEMBLY_HASH_ALG]; -+ if (cols [MONO_ASSEMBLY_PUBLIC_KEY]) { -+ guchar* token = g_malloc (8); -+ gchar* encoded; -+ const gchar* pkey; -+ int len; -+ -+ pkey = mono_metadata_blob_heap (image, cols [MONO_ASSEMBLY_PUBLIC_KEY]); -+ len = mono_metadata_decode_blob_size (pkey, &pkey); -+ aname->public_key = (guchar*)pkey; -+ -+ mono_digest_get_public_token (token, aname->public_key, len); -+ encoded = encode_public_tok (token, 8); -+ g_strlcpy ((char*)aname->public_key_token, encoded, MONO_PUBLIC_KEY_TOKEN_LENGTH); -+ -+ g_free (encoded); -+ g_free (token); -+ } -+ else { -+ aname->public_key = NULL; -+ memset (aname->public_key_token, 0, MONO_PUBLIC_KEY_TOKEN_LENGTH); -+ } -+ -+ if (cols [MONO_ASSEMBLY_PUBLIC_KEY]) { -+ aname->public_key = (guchar*)mono_metadata_blob_heap (image, cols [MONO_ASSEMBLY_PUBLIC_KEY]); -+ } -+ else -+ aname->public_key = 0; -+ -+ return TRUE; -+} -+ -+/** -+ * mono_stringify_assembly_name: -+ * @aname: the assembly name. -+ * -+ * Convert @aname into its string format. The returned string is dynamically -+ * allocated and should be freed by the caller. -+ * -+ * Returns: a newly allocated string with a string representation of -+ * the assembly name. -+ */ -+char* -+mono_stringify_assembly_name (MonoAssemblyName *aname) -+{ -+ return g_strdup_printf ( -+ "%s, Version=%d.%d.%d.%d, Culture=%s%s%s", -+ aname->name, -+ aname->major, aname->minor, aname->build, aname->revision, -+ aname->culture && *aname->culture? aname->culture: "neutral", -+ aname->public_key_token [0] ? ", PublicKeyToken=" : "", -+ aname->public_key_token [0] ? (char *)aname->public_key_token : ""); -+} -+ -+static gchar* -+assemblyref_public_tok (MonoImage *image, guint32 key_index, guint32 flags) -+{ -+ const gchar *public_tok; -+ int len; -+ -+ public_tok = mono_metadata_blob_heap (image, key_index); -+ len = mono_metadata_decode_blob_size (public_tok, &public_tok); -+ -+ if (flags & ASSEMBLYREF_FULL_PUBLIC_KEY_FLAG) { -+ guchar token [8]; -+ mono_digest_get_public_token (token, (guchar*)public_tok, len); -+ return encode_public_tok (token, 8); -+ } -+ -+ return encode_public_tok ((guchar*)public_tok, len); -+} -+ -+/** -+ * mono_assembly_addref: -+ * @assemnly: the assembly to reference -+ * -+ * This routine increments the reference count on a MonoAssembly. -+ * The reference count is reduced every time the method mono_assembly_close() is -+ * invoked. -+ */ -+void -+mono_assembly_addref (MonoAssembly *assembly) -+{ -+ InterlockedIncrement (&assembly->ref_count); -+} -+ -+static MonoAssemblyName * -+mono_assembly_remap_version (MonoAssemblyName *aname, MonoAssemblyName *dest_aname) -+{ -+ const MonoRuntimeInfo *current_runtime; -+ int pos, first, last; -+ -+ if (aname->name == NULL) return aname; -+ current_runtime = mono_get_runtime_info (); -+ -+ first = 0; -+ last = G_N_ELEMENTS (framework_assemblies) - 1; -+ -+ while (first <= last) { -+ int res; -+ pos = first + (last - first) / 2; -+ res = strcmp (aname->name, framework_assemblies[pos].assembly_name); -+ if (res == 0) { -+ const AssemblyVersionSet* vset; -+ int index = framework_assemblies[pos].version_set_index; -+ g_assert (index < G_N_ELEMENTS (current_runtime->version_sets)); -+ vset = ¤t_runtime->version_sets [index]; -+ -+ if (aname->major == vset->major && aname->minor == vset->minor && -+ aname->build == vset->build && aname->revision == vset->revision) -+ return aname; -+ -+ if ((aname->major | aname->minor | aname->build | aname->revision) != 0) -+ mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_ASSEMBLY, -+ "The request to load the assembly %s v%d.%d.%d.%d was remapped to v%d.%d.%d.%d", -+ aname->name, -+ aname->major, aname->minor, aname->build, aname->revision, -+ vset->major, vset->minor, vset->build, vset->revision -+ ); -+ -+ memcpy (dest_aname, aname, sizeof(MonoAssemblyName)); -+ dest_aname->major = vset->major; -+ dest_aname->minor = vset->minor; -+ dest_aname->build = vset->build; -+ dest_aname->revision = vset->revision; -+ return dest_aname; -+ } else if (res < 0) { -+ last = pos - 1; -+ } else { -+ first = pos + 1; -+ } -+ } -+ return aname; -+} -+ -+/* -+ * mono_assembly_get_assemblyref: -+ * -+ * Fill out ANAME with the assembly name of the INDEXth assembly reference in IMAGE. -+ */ -+void -+mono_assembly_get_assemblyref (MonoImage *image, int index, MonoAssemblyName *aname) -+{ -+ MonoTableInfo *t; -+ guint32 cols [MONO_ASSEMBLYREF_SIZE]; -+ const char *hash; -+ -+ t = &image->tables [MONO_TABLE_ASSEMBLYREF]; -+ -+ mono_metadata_decode_row (t, index, cols, MONO_ASSEMBLYREF_SIZE); -+ -+ hash = mono_metadata_blob_heap (image, cols [MONO_ASSEMBLYREF_HASH_VALUE]); -+ aname->hash_len = mono_metadata_decode_blob_size (hash, &hash); -+ aname->hash_value = hash; -+ aname->name = mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_NAME]); -+ aname->culture = mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_CULTURE]); -+ aname->flags = cols [MONO_ASSEMBLYREF_FLAGS]; -+ aname->major = cols [MONO_ASSEMBLYREF_MAJOR_VERSION]; -+ aname->minor = cols [MONO_ASSEMBLYREF_MINOR_VERSION]; -+ aname->build = cols [MONO_ASSEMBLYREF_BUILD_NUMBER]; -+ aname->revision = cols [MONO_ASSEMBLYREF_REV_NUMBER]; -+ -+ if (cols [MONO_ASSEMBLYREF_PUBLIC_KEY]) { -+ gchar *token = assemblyref_public_tok (image, cols [MONO_ASSEMBLYREF_PUBLIC_KEY], aname->flags); -+ g_strlcpy ((char*)aname->public_key_token, token, MONO_PUBLIC_KEY_TOKEN_LENGTH); -+ g_free (token); -+ } else { -+ memset (aname->public_key_token, 0, MONO_PUBLIC_KEY_TOKEN_LENGTH); -+ } -+} -+ -+void -+mono_assembly_load_reference (MonoImage *image, int index) -+{ -+ MonoAssembly *reference; -+ MonoAssemblyName aname; -+ MonoImageOpenStatus status; -+ -+ /* -+ * image->references is shared between threads, so we need to access -+ * it inside a critical section. -+ */ -+ mono_assemblies_lock (); -+ if (!image->references) { -+ MonoTableInfo *t = &image->tables [MONO_TABLE_ASSEMBLYREF]; -+ -+ image->references = g_new0 (MonoAssembly *, t->rows + 1); -+ } -+ reference = image->references [index]; -+ mono_assemblies_unlock (); -+ if (reference) -+ return; -+ -+ mono_assembly_get_assemblyref (image, index, &aname); -+ -+ if (image->assembly && image->assembly->ref_only) { -+ /* We use the loaded corlib */ -+ if (!strcmp (aname.name, "mscorlib")) -+ reference = mono_assembly_load_full (&aname, image->assembly->basedir, &status, FALSE); -+ else { -+ reference = mono_assembly_loaded_full (&aname, TRUE); -+ if (!reference) -+ /* Try a postload search hook */ -+ reference = mono_assembly_invoke_search_hook_internal (&aname, TRUE, TRUE); -+ } -+ -+ /* -+ * Here we must advice that the error was due to -+ * a non loaded reference using the ReflectionOnly api -+ */ -+ if (!reference) -+ reference = REFERENCE_MISSING; -+ } else -+ reference = mono_assembly_load (&aname, image->assembly? image->assembly->basedir: NULL, &status); -+ -+ if (reference == NULL){ -+ char *extra_msg = g_strdup (""); -+ -+ if (status == MONO_IMAGE_ERROR_ERRNO && errno == ENOENT) { -+ extra_msg = g_strdup_printf ("The assembly was not found in the Global Assembly Cache, a path listed in the MONO_PATH environment variable, or in the location of the executing assembly (%s).\n", image->assembly->basedir); -+ } else if (status == MONO_IMAGE_ERROR_ERRNO) { -+ extra_msg = g_strdup_printf ("System error: %s\n", strerror (errno)); -+ } else if (status == MONO_IMAGE_MISSING_ASSEMBLYREF) { -+ extra_msg = g_strdup ("Cannot find an assembly referenced from this one.\n"); -+ } else if (status == MONO_IMAGE_IMAGE_INVALID) { -+ extra_msg = g_strdup ("The file exists but is not a valid assembly.\n"); -+ } -+ -+ g_warning ("The following assembly referenced from %s could not be loaded:\n" -+ " Assembly: %s (assemblyref_index=%d)\n" -+ " Version: %d.%d.%d.%d\n" -+ " Public Key: %s\n%s", -+ image->name, aname.name, index, -+ aname.major, aname.minor, aname.build, aname.revision, -+ strlen ((char*)aname.public_key_token) == 0 ? "(none)" : (char*)aname.public_key_token, extra_msg); -+ g_free (extra_msg); -+ } -+ -+ mono_assemblies_lock (); -+ if (reference == NULL) { -+ /* Flag as not found */ -+ reference = REFERENCE_MISSING; -+ } -+ -+ if (!image->references [index]) { -+ if (reference != REFERENCE_MISSING){ -+ mono_assembly_addref (reference); -+ if (image->assembly) -+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Assembly Ref addref %s %p -> %s %p: %d\n", -+ image->assembly->aname.name, image->assembly, reference->aname.name, reference, reference->ref_count); -+ } else { -+ if (image->assembly) -+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Failed to load assembly %s %p\n", -+ image->assembly->aname.name, image->assembly); -+ } -+ -+ image->references [index] = reference; -+ } -+ mono_assemblies_unlock (); -+ -+ if (image->references [index] != reference) { -+ /* Somebody loaded it before us */ -+ mono_assembly_close (reference); -+ } -+} -+ -+void -+mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status) -+{ -+ /* This is a no-op now but it is part of the embedding API so we can't remove it */ -+ *status = MONO_IMAGE_OK; -+} -+ -+typedef struct AssemblyLoadHook AssemblyLoadHook; -+struct AssemblyLoadHook { -+ AssemblyLoadHook *next; -+ MonoAssemblyLoadFunc func; -+ gpointer user_data; -+}; -+ -+AssemblyLoadHook *assembly_load_hook = NULL; -+ -+void -+mono_assembly_invoke_load_hook (MonoAssembly *ass) -+{ -+ AssemblyLoadHook *hook; -+ -+ for (hook = assembly_load_hook; hook; hook = hook->next) { -+ hook->func (ass, hook->user_data); -+ } -+} -+ -+void -+mono_install_assembly_load_hook (MonoAssemblyLoadFunc func, gpointer user_data) -+{ -+ AssemblyLoadHook *hook; -+ -+ g_return_if_fail (func != NULL); -+ -+ hook = g_new0 (AssemblyLoadHook, 1); -+ hook->func = func; -+ hook->user_data = user_data; -+ hook->next = assembly_load_hook; -+ assembly_load_hook = hook; -+} -+ -+static void -+free_assembly_load_hooks (void) -+{ -+ AssemblyLoadHook *hook, *next; -+ -+ for (hook = assembly_load_hook; hook; hook = next) { -+ next = hook->next; -+ g_free (hook); -+ } -+} -+ -+typedef struct AssemblySearchHook AssemblySearchHook; -+struct AssemblySearchHook { -+ AssemblySearchHook *next; -+ MonoAssemblySearchFunc func; -+ gboolean refonly; -+ gboolean postload; -+ gpointer user_data; -+}; -+ -+AssemblySearchHook *assembly_search_hook = NULL; -+ -+static MonoAssembly* -+mono_assembly_invoke_search_hook_internal (MonoAssemblyName *aname, gboolean refonly, gboolean postload) -+{ -+ AssemblySearchHook *hook; -+ -+ for (hook = assembly_search_hook; hook; hook = hook->next) { -+ if ((hook->refonly == refonly) && (hook->postload == postload)) { -+ MonoAssembly *ass = hook->func (aname, hook->user_data); -+ if (ass) -+ return ass; -+ } -+ } -+ -+ return NULL; -+} -+ -+MonoAssembly* -+mono_assembly_invoke_search_hook (MonoAssemblyName *aname) -+{ -+ return mono_assembly_invoke_search_hook_internal (aname, FALSE, FALSE); -+} -+ -+static void -+mono_install_assembly_search_hook_internal (MonoAssemblySearchFunc func, gpointer user_data, gboolean refonly, gboolean postload) -+{ -+ AssemblySearchHook *hook; -+ -+ g_return_if_fail (func != NULL); -+ -+ hook = g_new0 (AssemblySearchHook, 1); -+ hook->func = func; -+ hook->user_data = user_data; -+ hook->refonly = refonly; -+ hook->postload = postload; -+ hook->next = assembly_search_hook; -+ assembly_search_hook = hook; -+} -+ -+void -+mono_install_assembly_search_hook (MonoAssemblySearchFunc func, gpointer user_data) -+{ -+ mono_install_assembly_search_hook_internal (func, user_data, FALSE, FALSE); -+} -+ -+static void -+free_assembly_search_hooks (void) -+{ -+ AssemblySearchHook *hook, *next; -+ -+ for (hook = assembly_search_hook; hook; hook = next) { -+ next = hook->next; -+ g_free (hook); -+ } -+} -+ -+void -+mono_install_assembly_refonly_search_hook (MonoAssemblySearchFunc func, gpointer user_data) -+{ -+ mono_install_assembly_search_hook_internal (func, user_data, TRUE, FALSE); -+} -+ -+void -+mono_install_assembly_postload_search_hook (MonoAssemblySearchFunc func, gpointer user_data) -+{ -+ mono_install_assembly_search_hook_internal (func, user_data, FALSE, TRUE); -+} -+ -+void -+mono_install_assembly_postload_refonly_search_hook (MonoAssemblySearchFunc func, gpointer user_data) -+{ -+ mono_install_assembly_search_hook_internal (func, user_data, TRUE, TRUE); -+} -+ -+typedef struct AssemblyPreLoadHook AssemblyPreLoadHook; -+struct AssemblyPreLoadHook { -+ AssemblyPreLoadHook *next; -+ MonoAssemblyPreLoadFunc func; -+ gpointer user_data; -+}; -+ -+static AssemblyPreLoadHook *assembly_preload_hook = NULL; -+static AssemblyPreLoadHook *assembly_refonly_preload_hook = NULL; -+ -+static MonoAssembly * -+invoke_assembly_preload_hook (MonoAssemblyName *aname, gchar **assemblies_path) -+{ -+ AssemblyPreLoadHook *hook; -+ MonoAssembly *assembly; -+ -+ for (hook = assembly_preload_hook; hook; hook = hook->next) { -+ assembly = hook->func (aname, assemblies_path, hook->user_data); -+ if (assembly != NULL) -+ return assembly; -+ } -+ -+ return NULL; -+} -+ -+static MonoAssembly * -+invoke_assembly_refonly_preload_hook (MonoAssemblyName *aname, gchar **assemblies_path) -+{ -+ AssemblyPreLoadHook *hook; -+ MonoAssembly *assembly; -+ -+ for (hook = assembly_refonly_preload_hook; hook; hook = hook->next) { -+ assembly = hook->func (aname, assemblies_path, hook->user_data); -+ if (assembly != NULL) -+ return assembly; -+ } -+ -+ return NULL; -+} -+ -+void -+mono_install_assembly_preload_hook (MonoAssemblyPreLoadFunc func, gpointer user_data) -+{ -+ AssemblyPreLoadHook *hook; -+ -+ g_return_if_fail (func != NULL); -+ -+ hook = g_new0 (AssemblyPreLoadHook, 1); -+ hook->func = func; -+ hook->user_data = user_data; -+ hook->next = assembly_preload_hook; -+ assembly_preload_hook = hook; -+} -+ -+void -+mono_install_assembly_refonly_preload_hook (MonoAssemblyPreLoadFunc func, gpointer user_data) -+{ -+ AssemblyPreLoadHook *hook; -+ -+ g_return_if_fail (func != NULL); -+ -+ hook = g_new0 (AssemblyPreLoadHook, 1); -+ hook->func = func; -+ hook->user_data = user_data; -+ hook->next = assembly_refonly_preload_hook; -+ assembly_refonly_preload_hook = hook; -+} -+ -+static void -+free_assembly_preload_hooks (void) -+{ -+ AssemblyPreLoadHook *hook, *next; -+ -+ for (hook = assembly_preload_hook; hook; hook = next) { -+ next = hook->next; -+ g_free (hook); -+ } -+ -+ for (hook = assembly_refonly_preload_hook; hook; hook = next) { -+ next = hook->next; -+ g_free (hook); -+ } -+} -+ -+static gchar * -+absolute_dir (const gchar *filename) -+{ -+ gchar *cwd; -+ gchar *mixed; -+ gchar **parts; -+ gchar *part; -+ GList *list, *tmp; -+ GString *result; -+ gchar *res; -+ gint i; -+ -+ if (g_path_is_absolute (filename)) -+ return g_path_get_dirname (filename); -+ -+ cwd = g_get_current_dir (); -+ mixed = g_build_filename (cwd, filename, NULL); -+ parts = g_strsplit (mixed, G_DIR_SEPARATOR_S, 0); -+ g_free (mixed); -+ g_free (cwd); -+ -+ list = NULL; -+ for (i = 0; (part = parts [i]) != NULL; i++) { -+ if (!strcmp (part, ".")) -+ continue; -+ -+ if (!strcmp (part, "..")) { -+ if (list && list->next) /* Don't remove root */ -+ list = g_list_delete_link (list, list); -+ } else { -+ list = g_list_prepend (list, part); -+ } -+ } -+ -+ result = g_string_new (""); -+ list = g_list_reverse (list); -+ -+ /* Ignores last data pointer, which should be the filename */ -+ for (tmp = list; tmp && tmp->next != NULL; tmp = tmp->next){ -+ if (tmp->data) -+ g_string_append_printf (result, "%s%c", (char *) tmp->data, -+ G_DIR_SEPARATOR); -+ } -+ -+ res = result->str; -+ g_string_free (result, FALSE); -+ g_list_free (list); -+ g_strfreev (parts); -+ if (*res == '\0') { -+ g_free (res); -+ return g_strdup ("."); -+ } -+ -+ return res; -+} -+ -+/** -+ * mono_assembly_open_from_bundle: -+ * @filename: Filename requested -+ * @status: return value -+ * -+ * This routine tries to open the assembly specified by `filename' from the -+ * defined bundles, if found, returns the MonoImage for it, if not found -+ * returns NULL -+ */ -+MonoImage * -+mono_assembly_open_from_bundle (const char *filename, MonoImageOpenStatus *status, gboolean refonly) -+{ -+ int i; -+ char *name; -+ MonoImage *image = NULL; -+ -+ /* -+ * we do a very simple search for bundled assemblies: it's not a general -+ * purpose assembly loading mechanism. -+ */ -+ -+ if (!bundles) -+ return NULL; -+ -+ name = g_path_get_basename (filename); -+ -+ mono_assemblies_lock (); -+ for (i = 0; !image && bundles [i]; ++i) { -+ if (strcmp (bundles [i]->name, name) == 0) { -+ image = mono_image_open_from_data_full ((char*)bundles [i]->data, bundles [i]->size, FALSE, status, refonly); -+ break; -+ } -+ } -+ mono_assemblies_unlock (); -+ g_free (name); -+ if (image) { -+ mono_image_addref (image); -+ return image; -+ } -+ return NULL; -+} -+ -+MonoAssembly * -+mono_assembly_open_full (const char *filename, MonoImageOpenStatus *status, gboolean refonly) -+{ -+ MonoImage *image; -+ MonoAssembly *ass; -+ MonoImageOpenStatus def_status; -+ gchar *fname; -+ -+ g_return_val_if_fail (filename != NULL, NULL); -+ -+ if (!status) -+ status = &def_status; -+ *status = MONO_IMAGE_OK; -+ -+ if (strncmp (filename, "file://", 7) == 0) { -+ GError *error = NULL; -+ gchar *uri = (gchar *) filename; -+ gchar *tmpuri; -+ -+ /* -+ * MS allows file://c:/... and fails on file://localhost/c:/... -+ * They also throw an IndexOutOfRangeException if "file://" -+ */ -+ if (uri [7] != '/') -+ uri = g_strdup_printf ("file:///%s", uri + 7); -+ -+ tmpuri = uri; -+ uri = mono_escape_uri_string (tmpuri); -+ fname = g_filename_from_uri (uri, NULL, &error); -+ g_free (uri); -+ -+ if (tmpuri != filename) -+ g_free (tmpuri); -+ -+ if (error != NULL) { -+ g_warning ("%s\n", error->message); -+ g_error_free (error); -+ fname = g_strdup (filename); -+ } -+ } else { -+ fname = g_strdup (filename); -+ } -+ -+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, -+ "Assembly Loader probing location: '%s'.", filename); -+ image = NULL; -+ -+ if (bundles != NULL) -+ image = mono_assembly_open_from_bundle (fname, status, refonly); -+ -+ if (!image) { -+ mono_assemblies_lock (); -+ image = mono_image_open_full (fname, status, refonly); -+ mono_assemblies_unlock (); -+ } -+ -+ if (!image){ -+ if (*status == MONO_IMAGE_OK) -+ *status = MONO_IMAGE_ERROR_ERRNO; -+ g_free (fname); -+ return NULL; -+ } -+ -+ if (image->assembly) { -+ /* Already loaded by another appdomain */ -+ mono_assembly_invoke_load_hook (image->assembly); -+ mono_image_close (image); -+ g_free (fname); -+ return image->assembly; -+ } -+ -+ ass = mono_assembly_load_from_full (image, fname, status, refonly); -+ -+ if (ass) { -+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, -+ "Assembly Loader loaded assembly from location: '%s'.", filename); -+ if (!refonly) -+ mono_config_for_assembly (ass->image); -+ } -+ -+ /* Clear the reference added by mono_image_open */ -+ mono_image_close (image); -+ -+ g_free (fname); -+ -+ return ass; -+} -+ -+static void -+free_item (gpointer val, gpointer user_data) -+{ -+ g_free (val); -+} -+ -+/* -+ * mono_assembly_load_friends: -+ * @ass: an assembly -+ * -+ * Load the list of friend assemblies that are allowed to access -+ * the assembly's internal types and members. They are stored as assembly -+ * names in custom attributes. -+ * -+ * This is an internal method, we need this because when we load mscorlib -+ * we do not have the mono_defaults.internals_visible_class loaded yet, -+ * so we need to load these after we initialize the runtime. -+ */ -+void -+mono_assembly_load_friends (MonoAssembly* ass) -+{ -+ int i; -+ MonoCustomAttrInfo* attrs; -+ GSList *list; -+ -+ if (ass->friend_assembly_names_inited) -+ return; -+ -+ attrs = mono_custom_attrs_from_assembly (ass); -+ if (!attrs) { -+ mono_assemblies_lock (); -+ ass->friend_assembly_names_inited = TRUE; -+ mono_assemblies_unlock (); -+ return; -+ } -+ -+ mono_assemblies_lock (); -+ if (ass->friend_assembly_names_inited) { -+ mono_assemblies_unlock (); -+ return; -+ } -+ mono_assemblies_unlock (); -+ -+ list = NULL; -+ /* -+ * We build the list outside the assemblies lock, the worse that can happen -+ * is that we'll need to free the allocated list. -+ */ -+ for (i = 0; i < attrs->num_attrs; ++i) { -+ MonoCustomAttrEntry *attr = &attrs->attrs [i]; -+ MonoAssemblyName *aname; -+ const gchar *data; -+ guint slen; -+ /* Do some sanity checking */ -+ if (!attr->ctor || attr->ctor->klass != mono_defaults.internals_visible_class) -+ continue; -+ if (attr->data_size < 4) -+ continue; -+ data = (const char*)attr->data; -+ /* 0xFF means null string, see custom attr format */ -+ if (data [0] != 1 || data [1] != 0 || (data [2] & 0xFF) == 0xFF) -+ continue; -+ slen = mono_metadata_decode_value (data + 2, &data); -+ aname = g_new0 (MonoAssemblyName, 1); -+ /*g_print ("friend ass: %s\n", data);*/ -+ if (mono_assembly_name_parse_full (data, aname, TRUE, NULL, NULL)) { -+ list = g_slist_prepend (list, aname); -+ } else { -+ g_free (aname); -+ } -+ } -+ mono_custom_attrs_free (attrs); -+ -+ mono_assemblies_lock (); -+ if (ass->friend_assembly_names_inited) { -+ mono_assemblies_unlock (); -+ g_slist_foreach (list, free_item, NULL); -+ g_slist_free (list); -+ return; -+ } -+ ass->friend_assembly_names = list; -+ -+ /* Because of the double checked locking pattern above */ -+ mono_memory_barrier (); -+ ass->friend_assembly_names_inited = TRUE; -+ mono_assemblies_unlock (); -+} -+ -+/** -+ * mono_assembly_open: -+ * @filename: Opens the assembly pointed out by this name -+ * @status: where a status code can be returned -+ * -+ * mono_assembly_open opens the PE-image pointed by @filename, and -+ * loads any external assemblies referenced by it. -+ * -+ * Return: a pointer to the MonoAssembly if @filename contains a valid -+ * assembly or NULL on error. Details about the error are stored in the -+ * @status variable. -+ */ -+MonoAssembly * -+mono_assembly_open (const char *filename, MonoImageOpenStatus *status) -+{ -+ return mono_assembly_open_full (filename, status, FALSE); -+} -+ -+MonoAssembly * -+mono_assembly_load_from_full (MonoImage *image, const char*fname, -+ MonoImageOpenStatus *status, gboolean refonly) -+{ -+ MonoAssembly *ass, *ass2; -+ char *base_dir; -+ -+ if (!image->tables [MONO_TABLE_ASSEMBLY].rows) { -+ /* 'image' doesn't have a manifest -- maybe someone is trying to Assembly.Load a .netmodule */ -+ *status = MONO_IMAGE_IMAGE_INVALID; -+ return NULL; -+ } -+ -+#if defined (PLATFORM_WIN32) -+ { -+ gchar *tmp_fn; -+ int i; -+ -+ tmp_fn = g_strdup (fname); -+ for (i = strlen (tmp_fn) - 1; i >= 0; i--) { -+ if (tmp_fn [i] == '/') -+ tmp_fn [i] = '\\'; -+ } -+ -+ base_dir = absolute_dir (tmp_fn); -+ g_free (tmp_fn); -+ } -+#else -+ base_dir = absolute_dir (fname); -+#endif -+ -+ /* -+ * Create assembly struct, and enter it into the assembly cache -+ */ -+ ass = g_new0 (MonoAssembly, 1); -+ ass->basedir = base_dir; -+ ass->ref_only = refonly; -+ ass->image = image; -+ -+ mono_profiler_assembly_event (ass, MONO_PROFILE_START_LOAD); -+ -+ mono_assembly_fill_assembly_name (image, &ass->aname); -+ -+ if (refonly && strcmp (ass->aname.name, "mscorlib") == 0) { -+ // MS.NET doesn't support loading other mscorlibs -+ g_free (ass); -+ g_free (base_dir); -+ mono_image_close (image); -+ *status = MONO_IMAGE_OK; -+ return mono_defaults.corlib->assembly; -+ } -+ -+ /* Add a non-temporary reference because of ass->image */ -+ mono_image_addref (image); -+ -+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Image addref %s %p -> %s %p: %d\n", ass->aname.name, ass, image->name, image, image->ref_count); -+ -+ /* -+ * The load hooks might take locks so we can't call them while holding the -+ * assemblies lock. -+ */ -+ if (ass->aname.name) { -+ ass2 = mono_assembly_invoke_search_hook_internal (&ass->aname, refonly, FALSE); -+ if (ass2) { -+ g_free (ass); -+ g_free (base_dir); -+ mono_image_close (image); -+ *status = MONO_IMAGE_OK; -+ return ass2; -+ } -+ } -+ -+ mono_assemblies_lock (); -+ -+ if (image->assembly) { -+ /* -+ * This means another thread has already loaded the assembly, but not yet -+ * called the load hooks so the search hook can't find the assembly. -+ */ -+ mono_assemblies_unlock (); -+ ass2 = image->assembly; -+ g_free (ass); -+ g_free (base_dir); -+ mono_image_close (image); -+ *status = MONO_IMAGE_OK; -+ return ass2; -+ } -+ -+ image->assembly = ass; -+ -+ loaded_assemblies = g_list_prepend (loaded_assemblies, ass); -+ mono_assemblies_unlock (); -+ -+ mono_assembly_invoke_load_hook (ass); -+ -+ mono_profiler_assembly_loaded (ass, MONO_PROFILE_OK); -+ -+ return ass; -+} -+ -+MonoAssembly * -+mono_assembly_load_from (MonoImage *image, const char *fname, -+ MonoImageOpenStatus *status) -+{ -+ return mono_assembly_load_from_full (image, fname, status, FALSE); -+} -+ -+/** -+ * mono_assembly_name_free: -+ * @aname: assembly name to free -+ * -+ * Frees the provided assembly name object. -+ * (it does not frees the object itself, only the name members). -+ */ -+void -+mono_assembly_name_free (MonoAssemblyName *aname) -+{ -+ if (aname == NULL) -+ return; -+ -+ g_free ((void *) aname->name); -+ g_free ((void *) aname->culture); -+ g_free ((void *) aname->hash_value); -+} -+ -+static gboolean -+parse_public_key (const gchar *key, gchar** pubkey) -+{ -+ const gchar *pkey; -+ gchar header [16], val, *arr; -+ gint i, j, offset, bitlen, keylen, pkeylen; -+ -+ keylen = strlen (key) >> 1; -+ if (keylen < 1) -+ return FALSE; -+ -+ val = g_ascii_xdigit_value (key [0]) << 4; -+ val |= g_ascii_xdigit_value (key [1]); -+ switch (val) { -+ case 0x00: -+ if (keylen < 13) -+ return FALSE; -+ val = g_ascii_xdigit_value (key [24]); -+ val |= g_ascii_xdigit_value (key [25]); -+ if (val != 0x06) -+ return FALSE; -+ pkey = key + 24; -+ break; -+ case 0x06: -+ pkey = key; -+ break; -+ default: -+ return FALSE; -+ } -+ -+ /* We need the first 16 bytes -+ * to check whether this key is valid or not */ -+ pkeylen = strlen (pkey) >> 1; -+ if (pkeylen < 16) -+ return FALSE; -+ -+ for (i = 0, j = 0; i < 16; i++) { -+ header [i] = g_ascii_xdigit_value (pkey [j++]) << 4; -+ header [i] |= g_ascii_xdigit_value (pkey [j++]); -+ } -+ -+ if (header [0] != 0x06 || /* PUBLICKEYBLOB (0x06) */ -+ header [1] != 0x02 || /* Version (0x02) */ -+ header [2] != 0x00 || /* Reserved (word) */ -+ header [3] != 0x00 || -+ (guint)(read32 (header + 8)) != 0x31415352) /* DWORD magic = RSA1 */ -+ return FALSE; -+ -+ /* Based on this length, we _should_ be able to know if the length is right */ -+ bitlen = read32 (header + 12) >> 3; -+ if ((bitlen + 16 + 4) != pkeylen) -+ return FALSE; -+ -+ /* Encode the size of the blob */ -+ offset = 0; -+ if (keylen <= 127) { -+ arr = g_malloc (keylen + 1); -+ arr [offset++] = keylen; -+ } else { -+ arr = g_malloc (keylen + 2); -+ arr [offset++] = 0x80; /* 10bs */ -+ arr [offset++] = keylen; -+ } -+ -+ for (i = offset, j = 0; i < keylen + offset; i++) { -+ arr [i] = g_ascii_xdigit_value (key [j++]) << 4; -+ arr [i] |= g_ascii_xdigit_value (key [j++]); -+ } -+ if (pubkey) -+ *pubkey = arr; -+ -+ return TRUE; -+} -+ -+static gboolean -+build_assembly_name (const char *name, const char *version, const char *culture, const char *token, const char *key, guint32 flags, MonoAssemblyName *aname, gboolean save_public_key) -+{ -+ gint major, minor, build, revision; -+ gint len; -+ gint version_parts; -+ gchar *pkey, *pkeyptr, *encoded, tok [8]; -+ -+ memset (aname, 0, sizeof (MonoAssemblyName)); -+ -+ if (version) { -+ version_parts = sscanf (version, "%u.%u.%u.%u", &major, &minor, &build, &revision); -+ if (version_parts < 2 || version_parts > 4) -+ return FALSE; -+ -+ /* FIXME: we should set build & revision to -1 (instead of 0) -+ if these are not set in the version string. That way, later on, -+ we can still determine if these were specified. */ -+ aname->major = major; -+ aname->minor = minor; -+ if (version_parts >= 3) -+ aname->build = build; -+ else -+ aname->build = 0; -+ if (version_parts == 4) -+ aname->revision = revision; -+ else -+ aname->revision = 0; -+ } -+ -+ aname->flags = flags; -+ aname->name = g_strdup (name); -+ -+ if (culture) { -+ if (g_ascii_strcasecmp (culture, "neutral") == 0) -+ aname->culture = g_strdup (""); -+ else -+ aname->culture = g_strdup (culture); -+ } -+ -+ if (token && strncmp (token, "null", 4) != 0) { -+ /* the constant includes the ending NULL, hence the -1 */ -+ if (strlen (token) != (MONO_PUBLIC_KEY_TOKEN_LENGTH - 1)) { -+ return FALSE; -+ } -+ char *lower = g_ascii_strdown (token, MONO_PUBLIC_KEY_TOKEN_LENGTH); -+ g_strlcpy ((char*)aname->public_key_token, lower, MONO_PUBLIC_KEY_TOKEN_LENGTH); -+ g_free (lower); -+ } -+ -+ if (key) { -+ if (strcmp (key, "null") == 0 || !parse_public_key (key, &pkey)) { -+ mono_assembly_name_free (aname); -+ return FALSE; -+ } -+ -+ len = mono_metadata_decode_blob_size ((const gchar *) pkey, (const gchar **) &pkeyptr); -+ // We also need to generate the key token -+ mono_digest_get_public_token ((guchar*) tok, (guint8*) pkeyptr, len); -+ encoded = encode_public_tok ((guchar*) tok, 8); -+ g_strlcpy ((gchar*)aname->public_key_token, encoded, MONO_PUBLIC_KEY_TOKEN_LENGTH); -+ g_free (encoded); -+ -+ if (save_public_key) -+ aname->public_key = (guint8*) pkey; -+ else -+ g_free (pkey); -+ } -+ -+ return TRUE; -+} -+ -+static gboolean -+parse_assembly_directory_name (const char *name, const char *dirname, MonoAssemblyName *aname) -+{ -+ gchar **parts; -+ gboolean res; -+ -+ parts = g_strsplit (dirname, "_", 3); -+ if (!parts || !parts[0] || !parts[1] || !parts[2]) { -+ g_strfreev (parts); -+ return FALSE; -+ } -+ -+ res = build_assembly_name (name, parts[0], parts[1], parts[2], NULL, 0, aname, FALSE); -+ g_strfreev (parts); -+ return res; -+} -+ -+gboolean -+mono_assembly_name_parse_full (const char *name, MonoAssemblyName *aname, gboolean save_public_key, gboolean *is_version_defined, gboolean *is_token_defined) -+{ -+ gchar *dllname; -+ gchar *version = NULL; -+ gchar *culture = NULL; -+ gchar *token = NULL; -+ gchar *key = NULL; -+ gchar *retargetable = NULL; -+ gboolean res; -+ gchar *value; -+ gchar **parts; -+ gchar **tmp; -+ gboolean version_defined; -+ gboolean token_defined; -+ guint32 flags = 0; -+ -+ if (!is_version_defined) -+ is_version_defined = &version_defined; -+ *is_version_defined = FALSE; -+ if (!is_token_defined) -+ is_token_defined = &token_defined; -+ *is_token_defined = FALSE; -+ -+ parts = tmp = g_strsplit (name, ",", 6); -+ if (!tmp || !*tmp) { -+ g_strfreev (tmp); -+ return FALSE; -+ } -+ -+ dllname = g_strstrip (*tmp); -+ -+ tmp++; -+ -+ while (*tmp) { -+ value = g_strstrip (*tmp); -+ if (!g_ascii_strncasecmp (value, "Version=", 8)) { -+ *is_version_defined = TRUE; -+ version = g_strstrip (value + 8); -+ if (strlen (version) == 0) { -+ return FALSE; -+ } -+ tmp++; -+ continue; -+ } -+ -+ if (!g_ascii_strncasecmp (value, "Culture=", 8)) { -+ culture = g_strstrip (value + 8); -+ if (strlen (culture) == 0) { -+ return FALSE; -+ } -+ tmp++; -+ continue; -+ } -+ -+ if (!g_ascii_strncasecmp (value, "PublicKeyToken=", 15)) { -+ *is_token_defined = TRUE; -+ token = g_strstrip (value + 15); -+ if (strlen (token) == 0) { -+ return FALSE; -+ } -+ tmp++; -+ continue; -+ } -+ -+ if (!g_ascii_strncasecmp (value, "PublicKey=", 10)) { -+ key = g_strstrip (value + 10); -+ if (strlen (key) == 0) { -+ return FALSE; -+ } -+ tmp++; -+ continue; -+ } -+ -+ if (!g_ascii_strncasecmp (value, "Retargetable=", 13)) { -+ retargetable = g_strstrip (value + 13); -+ if (strlen (retargetable) == 0) { -+ return FALSE; -+ } -+ if (!g_ascii_strcasecmp (retargetable, "yes")) { -+ flags |= ASSEMBLYREF_RETARGETABLE_FLAG; -+ } else if (g_ascii_strcasecmp (retargetable, "no")) { -+ return FALSE; -+ } -+ tmp++; -+ continue; -+ } -+ -+ if (!g_ascii_strncasecmp (value, "ProcessorArchitecture=", 22)) { -+ /* this is ignored for now, until we can change MonoAssemblyName */ -+ tmp++; -+ continue; -+ } -+ -+ g_strfreev (parts); -+ return FALSE; -+ } -+ -+ /* if retargetable flag is set, then we must have a fully qualified name */ -+ if (retargetable != NULL && (version == NULL || culture == NULL || (key == NULL && token == NULL))) { -+ return FALSE; -+ } -+ -+ res = build_assembly_name (dllname, version, culture, token, key, flags, -+ aname, save_public_key); -+ g_strfreev (parts); -+ return res; -+} -+ -+/** -+ * mono_assembly_name_parse: -+ * @name: name to parse -+ * @aname: the destination assembly name -+ * -+ * Parses an assembly qualified type name and assigns the name, -+ * version, culture and token to the provided assembly name object. -+ * -+ * Returns: true if the name could be parsed. -+ */ -+gboolean -+mono_assembly_name_parse (const char *name, MonoAssemblyName *aname) -+{ -+ return mono_assembly_name_parse_full (name, aname, FALSE, NULL, NULL); -+} -+ -+static MonoAssembly* -+probe_for_partial_name (const char *basepath, const char *fullname, MonoAssemblyName *aname, MonoImageOpenStatus *status) -+{ -+ gchar *fullpath = NULL; -+ GDir *dirhandle; -+ const char* direntry; -+ MonoAssemblyName gac_aname; -+ gint major=-1, minor=0, build=0, revision=0; -+ gboolean exact_version; -+ -+ dirhandle = g_dir_open (basepath, 0, NULL); -+ if (!dirhandle) -+ return NULL; -+ -+ exact_version = (aname->major | aname->minor | aname->build | aname->revision) != 0; -+ -+ while ((direntry = g_dir_read_name (dirhandle))) { -+ gboolean match = TRUE; -+ -+ if(!parse_assembly_directory_name (aname->name, direntry, &gac_aname)) -+ continue; -+ -+ if (aname->culture != NULL && strcmp (aname->culture, gac_aname.culture) != 0) -+ match = FALSE; -+ -+ if (match && strlen ((char*)aname->public_key_token) > 0 && -+ strcmp ((char*)aname->public_key_token, (char*)gac_aname.public_key_token) != 0) -+ match = FALSE; -+ -+ if (match) { -+ if (exact_version) { -+ match = (aname->major == gac_aname.major && aname->minor == gac_aname.minor && -+ aname->build == gac_aname.build && aname->revision == gac_aname.revision); -+ } -+ else if (gac_aname.major < major) -+ match = FALSE; -+ else if (gac_aname.major == major) { -+ if (gac_aname.minor < minor) -+ match = FALSE; -+ else if (gac_aname.minor == minor) { -+ if (gac_aname.build < build) -+ match = FALSE; -+ else if (gac_aname.build == build && gac_aname.revision <= revision) -+ match = FALSE; -+ } -+ } -+ } -+ -+ if (match) { -+ major = gac_aname.major; -+ minor = gac_aname.minor; -+ build = gac_aname.build; -+ revision = gac_aname.revision; -+ g_free (fullpath); -+ fullpath = g_build_path (G_DIR_SEPARATOR_S, basepath, direntry, fullname, NULL); -+ } -+ -+ mono_assembly_name_free (&gac_aname); -+ } -+ -+ g_dir_close (dirhandle); -+ -+ if (fullpath == NULL) -+ return NULL; -+ else { -+ MonoAssembly *res = mono_assembly_open (fullpath, status); -+ g_free (fullpath); -+ return res; -+ } -+} -+ -+MonoAssembly* -+mono_assembly_load_with_partial_name (const char *name, MonoImageOpenStatus *status) -+{ -+ MonoAssembly *res; -+ MonoAssemblyName *aname, base_name, maped_aname; -+ gchar *fullname, *gacpath; -+ gchar **paths; -+ -+ memset (&base_name, 0, sizeof (MonoAssemblyName)); -+ aname = &base_name; -+ -+ if (!mono_assembly_name_parse (name, aname)) -+ return NULL; -+ -+ /* -+ * If no specific version has been requested, make sure we load the -+ * correct version for system assemblies. -+ */ -+ if ((aname->major | aname->minor | aname->build | aname->revision) == 0) -+ aname = mono_assembly_remap_version (aname, &maped_aname); -+ -+ res = mono_assembly_loaded (aname); -+ if (res) { -+ mono_assembly_name_free (aname); -+ return res; -+ } -+ -+ res = invoke_assembly_preload_hook (aname, assemblies_path); -+ if (res) { -+ res->in_gac = FALSE; -+ mono_assembly_name_free (aname); -+ return res; -+ } -+ -+ fullname = g_strdup_printf ("%s.dll", aname->name); -+ -+ if (extra_gac_paths) { -+ paths = extra_gac_paths; -+ while (!res && *paths) { -+ gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL); -+ res = probe_for_partial_name (gacpath, fullname, aname, status); -+ g_free (gacpath); -+ paths++; -+ } -+ } -+ -+ if (res) { -+ res->in_gac = TRUE; -+ g_free (fullname); -+ mono_assembly_name_free (aname); -+ return res; -+ } -+ -+ gacpath = g_build_path (G_DIR_SEPARATOR_S, mono_assembly_getrootdir (), "mono", "gac", aname->name, NULL); -+ res = probe_for_partial_name (gacpath, fullname, aname, status); -+ g_free (gacpath); -+ -+ if (res) -+ res->in_gac = TRUE; -+ else { -+ MonoDomain *domain = mono_domain_get (); -+ MonoReflectionAssembly *refasm = mono_try_assembly_resolve (domain, mono_string_new (domain, name), FALSE); -+ if (refasm) -+ res = refasm->assembly; -+ } -+ -+ g_free (fullname); -+ mono_assembly_name_free (aname); -+ -+ return res; -+} -+ -+static MonoImage* -+mono_assembly_load_publisher_policy (MonoAssemblyName *aname) -+{ -+ MonoImage *image; -+ gchar *filename, *pname, *name, *culture, *version, *fullpath, *subpath; -+ gchar **paths; -+ gint32 len; -+ -+ if (strstr (aname->name, ".dll")) { -+ len = strlen (aname->name) - 4; -+ name = g_malloc (len); -+ strncpy (name, aname->name, len); -+ } else -+ name = g_strdup (aname->name); -+ -+ if (aname->culture) { -+ culture = g_strdup (aname->culture); -+ g_strdown (culture); -+ } else -+ culture = g_strdup (""); -+ -+ pname = g_strdup_printf ("policy.%d.%d.%s", aname->major, aname->minor, name); -+ version = g_strdup_printf ("0.0.0.0_%s_%s", culture, aname->public_key_token); -+ g_free (name); -+ g_free (culture); -+ -+ filename = g_strconcat (pname, ".dll", NULL); -+ subpath = g_build_path (G_DIR_SEPARATOR_S, pname, version, filename, NULL); -+ g_free (pname); -+ g_free (version); -+ g_free (filename); -+ -+ image = NULL; -+ if (extra_gac_paths) { -+ paths = extra_gac_paths; -+ while (!image && *paths) { -+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, -+ "lib", "mono", "gac", subpath, NULL); -+ image = mono_image_open (fullpath, NULL); -+ g_free (fullpath); -+ paths++; -+ } -+ } -+ -+ if (image) { -+ g_free (subpath); -+ return image; -+ } -+ -+ fullpath = g_build_path (G_DIR_SEPARATOR_S, mono_assembly_getrootdir (), -+ "mono", "gac", subpath, NULL); -+ image = mono_image_open (fullpath, NULL); -+ g_free (subpath); -+ g_free (fullpath); -+ -+ return image; -+} -+ -+static MonoAssemblyName* -+mono_assembly_bind_version (MonoAssemblyBindingInfo *info, MonoAssemblyName *aname, MonoAssemblyName *dest_name) -+{ -+ memcpy (dest_name, aname, sizeof (MonoAssemblyName)); -+ dest_name->major = info->new_version.major; -+ dest_name->minor = info->new_version.minor; -+ dest_name->build = info->new_version.build; -+ dest_name->revision = info->new_version.revision; -+ -+ return dest_name; -+} -+ -+/* LOCKING: Assumes that we are already locked */ -+static MonoAssemblyBindingInfo* -+search_binding_loaded (MonoAssemblyName *aname) -+{ -+ GSList *tmp; -+ -+ for (tmp = loaded_assembly_bindings; tmp; tmp = tmp->next) { -+ MonoAssemblyBindingInfo *info = tmp->data; -+ if (assembly_binding_maps_name (info, aname)) -+ return info; -+ } -+ -+ return NULL; -+} -+ -+static MonoAssemblyName* -+mono_assembly_apply_binding (MonoAssemblyName *aname, MonoAssemblyName *dest_name) -+{ -+ MonoAssemblyBindingInfo *info, *info2; -+ MonoImage *ppimage; -+ -+ if (aname->public_key_token [0] == 0) -+ return aname; -+ -+ mono_loader_lock (); -+ info = search_binding_loaded (aname); -+ mono_loader_unlock (); -+ if (info) { -+ if (!check_policy_versions (info, aname)) -+ return aname; -+ -+ mono_assembly_bind_version (info, aname, dest_name); -+ return dest_name; -+ } -+ -+ info = g_new0 (MonoAssemblyBindingInfo, 1); -+ info->major = aname->major; -+ info->minor = aname->minor; -+ -+ ppimage = mono_assembly_load_publisher_policy (aname); -+ if (ppimage) { -+ get_publisher_policy_info (ppimage, aname, info); -+ mono_image_close (ppimage); -+ } -+ -+ /* Define default error value if needed */ -+ if (!info->is_valid) { -+ info->name = g_strdup (aname->name); -+ info->culture = g_strdup (aname->culture); -+ g_strlcpy ((char *)info->public_key_token, (const char *)aname->public_key_token, MONO_PUBLIC_KEY_TOKEN_LENGTH); -+ } -+ -+ mono_loader_lock (); -+ info2 = search_binding_loaded (aname); -+ if (info2) { -+ /* This binding was added by another thread -+ * before us */ -+ mono_assembly_binding_info_free (info); -+ g_free (info); -+ -+ info = info2; -+ } else -+ loaded_assembly_bindings = g_slist_prepend (loaded_assembly_bindings, info); -+ -+ mono_loader_unlock (); -+ -+ if (!info->is_valid || !check_policy_versions (info, aname)) -+ return aname; -+ -+ mono_assembly_bind_version (info, aname, dest_name); -+ return dest_name; -+} -+ -+/** -+ * mono_assembly_load_from_gac -+ * -+ * @aname: The assembly name object -+ */ -+static MonoAssembly* -+mono_assembly_load_from_gac (MonoAssemblyName *aname, gchar *filename, MonoImageOpenStatus *status, MonoBoolean refonly) -+{ -+ MonoAssembly *result = NULL; -+ gchar *name, *version, *culture, *fullpath, *subpath; -+ gint32 len; -+ gchar **paths; -+ -+ if (aname->public_key_token [0] == 0) { -+ return NULL; -+ } -+ -+ if (strstr (aname->name, ".dll")) { -+ len = strlen (filename) - 4; -+ name = g_malloc (len); -+ strncpy (name, aname->name, len); -+ } else { -+ name = g_strdup (aname->name); -+ } -+ -+ if (aname->culture) { -+ culture = g_strdup (aname->culture); -+ g_strdown (culture); -+ } else { -+ culture = g_strdup (""); -+ } -+ -+ version = g_strdup_printf ("%d.%d.%d.%d_%s_%s", aname->major, -+ aname->minor, aname->build, aname->revision, -+ culture, aname->public_key_token); -+ -+ subpath = g_build_path (G_DIR_SEPARATOR_S, name, version, filename, NULL); -+ g_free (name); -+ g_free (version); -+ g_free (culture); -+ -+ if (extra_gac_paths) { -+ paths = extra_gac_paths; -+ while (!result && *paths) { -+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL); -+ result = mono_assembly_open_full (fullpath, status, refonly); -+ g_free (fullpath); -+ paths++; -+ } -+ } -+ -+ if (result) { -+ result->in_gac = TRUE; -+ g_free (subpath); -+ return result; -+ } -+ -+ fullpath = g_build_path (G_DIR_SEPARATOR_S, mono_assembly_getrootdir (), -+ "mono", "gac", subpath, NULL); -+ result = mono_assembly_open_full (fullpath, status, refonly); -+ g_free (fullpath); -+ -+ if (result) -+ result->in_gac = TRUE; -+ -+ g_free (subpath); -+ -+ return result; -+} -+ -+ -+MonoAssembly* -+mono_assembly_load_corlib (const MonoRuntimeInfo *runtime, MonoImageOpenStatus *status) -+{ -+ char *corlib_file; -+ -+ if (corlib) { -+ /* g_print ("corlib already loaded\n"); */ -+ return corlib; -+ } -+ -+ if (assemblies_path) { -+ corlib = load_in_path ("mscorlib.dll", (const char**)assemblies_path, status, FALSE); -+ if (corlib) -+ return corlib; -+ } -+ -+ /* Load corlib from mono/ */ -+ -+ corlib_file = g_build_filename ("mono", runtime->framework_version, "mscorlib.dll", NULL); -+ if (assemblies_path) { -+ corlib = load_in_path (corlib_file, (const char**)assemblies_path, status, FALSE); -+ if (corlib) { -+ g_free (corlib_file); -+ return corlib; -+ } -+ } -+ corlib = load_in_path (corlib_file, default_path, status, FALSE); -+ g_free (corlib_file); -+ -+ return corlib; -+} -+ -+MonoAssembly* mono_assembly_load_full_nosearch (MonoAssemblyName *aname, -+ const char *basedir, -+ MonoImageOpenStatus *status, -+ gboolean refonly) -+{ -+ MonoAssembly *result; -+ char *fullpath, *filename; -+ MonoAssemblyName maped_aname, maped_name_pp; -+ int ext_index; -+ const char *ext; -+ int len; -+ -+ aname = mono_assembly_remap_version (aname, &maped_aname); -+ -+ /* Reflection only assemblies don't get assembly binding */ -+ if (!refonly) -+ aname = mono_assembly_apply_binding (aname, &maped_name_pp); -+ -+ result = mono_assembly_loaded_full (aname, refonly); -+ if (result) -+ return result; -+ -+ result = refonly ? invoke_assembly_refonly_preload_hook (aname, assemblies_path) : invoke_assembly_preload_hook (aname, assemblies_path); -+ if (result) { -+ result->in_gac = FALSE; -+ return result; -+ } -+ -+ /* Currently we retrieve the loaded corlib for reflection -+ * only requests, like a common reflection only assembly -+ */ -+ if (strcmp (aname->name, "mscorlib") == 0 || strcmp (aname->name, "mscorlib.dll") == 0) { -+ return mono_assembly_load_corlib (mono_get_runtime_info (), status); -+ } -+ -+ len = strlen (aname->name); -+ for (ext_index = 0; ext_index < 2; ext_index ++) { -+ ext = ext_index == 0 ? ".dll" : ".exe"; -+ if (len > 4 && (!strcmp (aname->name + len - 4, ".dll") || !strcmp (aname->name + len - 4, ".exe"))) { -+ filename = g_strdup (aname->name); -+ /* Don't try appending .dll/.exe if it already has one of those extensions */ -+ ext_index++; -+ } else { -+ filename = g_strconcat (aname->name, ext, NULL); -+ } -+ -+ result = mono_assembly_load_from_gac (aname, filename, status, refonly); -+ if (result) { -+ g_free (filename); -+ return result; -+ } -+ -+ if (basedir) { -+ fullpath = g_build_filename (basedir, filename, NULL); -+ result = mono_assembly_open_full (fullpath, status, refonly); -+ g_free (fullpath); -+ if (result) { -+ result->in_gac = FALSE; -+ g_free (filename); -+ return result; -+ } -+ } -+ -+ result = load_in_path (filename, default_path, status, refonly); -+ if (result) -+ result->in_gac = FALSE; -+ g_free (filename); -+ if (result) -+ return result; -+ } -+ -+ return result; -+} -+ -+/** -+ * mono_assembly_load_full: -+ * @aname: A MonoAssemblyName with the assembly name to load. -+ * @basedir: A directory to look up the assembly at. -+ * @status: a pointer to a MonoImageOpenStatus to return the status of the load operation -+ * @refonly: Whether this assembly is being opened in "reflection-only" mode. -+ * -+ * Loads the assembly referenced by @aname, if the value of @basedir is not NULL, it -+ * attempts to load the assembly from that directory before probing the standard locations. -+ * -+ * If the assembly is being opened in reflection-only mode (@refonly set to TRUE) then no -+ * assembly binding takes place. -+ * -+ * Returns: the assembly referenced by @aname loaded or NULL on error. On error the -+ * value pointed by status is updated with an error code. -+ */ -+MonoAssembly* -+mono_assembly_load_full (MonoAssemblyName *aname, const char *basedir, MonoImageOpenStatus *status, gboolean refonly) -+{ -+ MonoAssembly *result = mono_assembly_load_full_nosearch (aname, basedir, status, refonly); -+ -+ if (!result) -+ /* Try a postload search hook */ -+ result = mono_assembly_invoke_search_hook_internal (aname, refonly, TRUE); -+ return result; -+} -+ -+/** -+ * mono_assembly_load: -+ * @aname: A MonoAssemblyName with the assembly name to load. -+ * @basedir: A directory to look up the assembly at. -+ * @status: a pointer to a MonoImageOpenStatus to return the status of the load operation -+ * -+ * Loads the assembly referenced by @aname, if the value of @basedir is not NULL, it -+ * attempts to load the assembly from that directory before probing the standard locations. -+ * -+ * Returns: the assembly referenced by @aname loaded or NULL on error. On error the -+ * value pointed by status is updated with an error code. -+ */ -+MonoAssembly* -+mono_assembly_load (MonoAssemblyName *aname, const char *basedir, MonoImageOpenStatus *status) -+{ -+ return mono_assembly_load_full (aname, basedir, status, FALSE); -+} -+ -+MonoAssembly* -+mono_assembly_loaded_full (MonoAssemblyName *aname, gboolean refonly) -+{ -+ MonoAssembly *res; -+ MonoAssemblyName maped_aname; -+ -+ aname = mono_assembly_remap_version (aname, &maped_aname); -+ -+ res = mono_assembly_invoke_search_hook_internal (aname, refonly, FALSE); -+ -+ return res; -+} -+ -+/** -+ * mono_assembly_loaded: -+ * @aname: an assembly to look for. -+ * -+ * Returns: NULL If the given @aname assembly has not been loaded, or a pointer to -+ * a MonoAssembly that matches the MonoAssemblyName specified. -+ */ -+MonoAssembly* -+mono_assembly_loaded (MonoAssemblyName *aname) -+{ -+ return mono_assembly_loaded_full (aname, FALSE); -+} -+ -+/** -+ * mono_assembly_close: -+ * @assembly: the assembly to release. -+ * -+ * This method releases a reference to the @assembly. The assembly is -+ * only released when all the outstanding references to it are released. -+ */ -+void -+mono_assembly_close (MonoAssembly *assembly) -+{ -+ GSList *tmp; -+ g_return_if_fail (assembly != NULL); -+ -+ if (assembly == REFERENCE_MISSING) -+ return; -+ -+ /* Might be 0 already */ -+ if (InterlockedDecrement (&assembly->ref_count) > 0) -+ return; -+ -+ mono_profiler_assembly_event (assembly, MONO_PROFILE_START_UNLOAD); -+ -+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading assembly %s [%p].", assembly->aname.name, assembly); -+ -+ mono_debug_close_image (assembly->image); -+ -+ mono_assemblies_lock (); -+ loaded_assemblies = g_list_remove (loaded_assemblies, assembly); -+ mono_assemblies_unlock (); -+ -+ assembly->image->assembly = NULL; -+ -+ mono_image_close (assembly->image); -+ -+ for (tmp = assembly->friend_assembly_names; tmp; tmp = tmp->next) { -+ MonoAssemblyName *fname = tmp->data; -+ mono_assembly_name_free (fname); -+ g_free (fname); -+ } -+ g_slist_free (assembly->friend_assembly_names); -+ g_free (assembly->basedir); -+ if (assembly->dynamic) { -+ g_free ((char*)assembly->aname.culture); -+ } else { -+ g_free (assembly); -+ } -+ -+ mono_profiler_assembly_event (assembly, MONO_PROFILE_END_UNLOAD); -+} -+ -+MonoImage* -+mono_assembly_load_module (MonoAssembly *assembly, guint32 idx) -+{ -+ return mono_image_load_file_for_image (assembly->image, idx); -+} -+ -+void -+mono_assembly_foreach (GFunc func, gpointer user_data) -+{ -+ GList *copy; -+ -+ /* -+ * We make a copy of the list to avoid calling the callback inside the -+ * lock, which could lead to deadlocks. -+ */ -+ mono_assemblies_lock (); -+ copy = g_list_copy (loaded_assemblies); -+ mono_assemblies_unlock (); -+ -+ g_list_foreach (loaded_assemblies, func, user_data); -+ -+ g_list_free (copy); -+} -+ -+/** -+ * mono_assemblies_cleanup: -+ * -+ * Free all resources used by this module. -+ */ -+void -+mono_assemblies_cleanup (void) -+{ -+ GSList *l; -+ -+ DeleteCriticalSection (&assemblies_mutex); -+ -+ for (l = loaded_assembly_bindings; l; l = l->next) { -+ MonoAssemblyBindingInfo *info = l->data; -+ -+ mono_assembly_binding_info_free (info); -+ g_free (info); -+ } -+ g_slist_free (loaded_assembly_bindings); -+ -+ free_assembly_load_hooks (); -+ free_assembly_search_hooks (); -+ free_assembly_preload_hooks (); -+} -+ -+/* -+ * Holds the assembly of the application, for -+ * System.Diagnostics.Process::MainModule -+ */ -+static MonoAssembly *main_assembly=NULL; -+ -+void -+mono_assembly_set_main (MonoAssembly *assembly) -+{ -+ main_assembly = assembly; -+} -+ -+/** -+ * mono_assembly_get_main: -+ * -+ * Returns: the assembly for the application, the first assembly that is loaded by the VM -+ */ -+MonoAssembly * -+mono_assembly_get_main (void) -+{ -+ return (main_assembly); -+} -+ -+/** -+ * mono_assembly_get_image: -+ * @assembly: The assembly to retrieve the image from -+ * -+ * Returns: the MonoImage associated with this assembly. -+ */ -+MonoImage* -+mono_assembly_get_image (MonoAssembly *assembly) -+{ -+ return assembly->image; -+} -+ -+void -+mono_register_bundled_assemblies (const MonoBundledAssembly **assemblies) -+{ -+ bundles = assemblies; -+} -diff -urNad mono-1.9.1+dfsg~/mono/metadata/class.c mono-1.9.1+dfsg/mono/metadata/class.c ---- mono-1.9.1+dfsg~/mono/metadata/class.c 2008-10-13 22:43:51.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/metadata/class.c 2008-10-13 22:44:32.000000000 +0200 -@@ -6238,6 +6238,7 @@ - return TRUE; - if (!accessed || !accessing) - return FALSE; -+ mono_assembly_load_friends (accessed); - for (tmp = accessed->friend_assembly_names; tmp; tmp = tmp->next) { - MonoAssemblyName *friend = tmp->data; - /* Be conservative with checks */ -diff -urNad mono-1.9.1+dfsg~/mono/metadata/metadata-internals.h mono-1.9.1+dfsg/mono/metadata/metadata-internals.h ---- mono-1.9.1+dfsg~/mono/metadata/metadata-internals.h 2008-10-13 22:43:51.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/metadata/metadata-internals.h 2008-10-13 22:44:32.000000000 +0200 -@@ -25,7 +25,8 @@ - MonoAssemblyName aname; - MonoDl *aot_module; - MonoImage *image; -- GSList *friend_assembly_names; -+ GSList *friend_assembly_names; /* Computed by mono_assembly_load_friends () */ -+ guint8 friend_assembly_names_inited; - guint8 in_gac; - guint8 dynamic; - guint8 corlib_internal; Index: patches/fix_stack_alignment_r105650_r105651.dpatch =================================================================== --- patches/fix_stack_alignment_r105650_r105651.dpatch (revision 3728) +++ patches/fix_stack_alignment_r105650_r105651.dpatch (working copy) @@ -1,74 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_stack_alignment_r105650_r105651.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixes stack alignment, caused assertions on AMD64, see: -## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473119 -## DP: Patch taken from upstream SVN revision 105650 and 105651. - -@DPATCH@ -diff -urNad mono-1.9.1+dfsg~/mono/metadata/threads.c mono-1.9.1+dfsg/mono/metadata/threads.c ---- mono-1.9.1+dfsg~/mono/metadata/threads.c 2008-01-29 23:02:34.000000000 +0100 -+++ mono-1.9.1+dfsg/mono/metadata/threads.c 2008-06-17 23:42:04.000000000 +0200 -@@ -700,8 +700,8 @@ - /* - * mono_thread_get_stack_bounds: - * -- * Return the address and size of the current threads stack. Return NULL as the stack -- * address if the stack address cannot be determined. -+ * Return the address and size of the current threads stack. Return NULL as the -+ * stack address if the stack address cannot be determined. - */ - void - mono_thread_get_stack_bounds (guint8 **staddr, size_t *stsize) -@@ -709,6 +709,7 @@ - #if defined(HAVE_PTHREAD_GET_STACKSIZE_NP) && defined(HAVE_PTHREAD_GET_STACKADDR_NP) - *staddr = (guint8*)pthread_get_stackaddr_np (pthread_self ()); - *stsize = pthread_get_stacksize_np (pthread_self ()); -+ *staddr = (guint8*)((gssize)*staddr & ~(mono_pagesize () - 1)); - return; - /* FIXME: simplify the mess below */ - #elif !defined(PLATFORM_WIN32) -@@ -717,28 +718,31 @@ - - pthread_attr_init (&attr); - #ifdef HAVE_PTHREAD_GETATTR_NP -- pthread_getattr_np (pthread_self(), &attr); -+ pthread_getattr_np (pthread_self(), &attr); - #else - #ifdef HAVE_PTHREAD_ATTR_GET_NP -- pthread_attr_get_np (pthread_self(), &attr); -+ pthread_attr_get_np (pthread_self(), &attr); - #elif defined(sun) -- *staddr = NULL; -- pthread_attr_getstacksize (&attr, &stsize); -+ *staddr = NULL; -+ pthread_attr_getstacksize (&attr, &stsize); - #else -- *staddr = NULL; -- *stsize = 0; -- return; -+ *staddr = NULL; -+ *stsize = 0; -+ return; - #endif - #endif - - #ifndef sun -- pthread_attr_getstack (&attr, (void**)staddr, stsize); -- if (*staddr) -- g_assert ((current > *staddr) && (current < *staddr + *stsize)); -+ pthread_attr_getstack (&attr, (void**)staddr, stsize); -+ if (*staddr) -+ g_assert ((current > *staddr) && (current < *staddr + *stsize)); - #endif - -- pthread_attr_destroy (&attr); -+ pthread_attr_destroy (&attr); - #endif -+ -+ /* When running under emacs, sometimes staddr is not aligned to a page size */ -+ *staddr = (guint8*)((gssize)*staddr & ~(mono_pagesize () - 1)); - } - - MonoThread * Index: patches/armel_fix_configure_fpu_check.dpatch =================================================================== --- patches/armel_fix_configure_fpu_check.dpatch (revision 3728) +++ patches/armel_fix_configure_fpu_check.dpatch (working copy) @@ -1,277 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## armel_fix_configure_fpu_check.dpatch by Riku Voipio -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.2.5~/configure.in mono-1.2.5/configure.in ---- mono-1.2.5~/configure.in 2007-08-17 19:41:56.000000000 +0200 -+++ mono-1.2.5/configure.in 2007-08-17 19:42:47.000000000 +0200 -@@ -1893,19 +1893,24 @@ - ]) - fi - -+AC_ARG_WITH(fpu, [ --with-fpu=FPA,VFP,NONE Select fpu to use on arm],[fpu=$withval]) -+ - if test ${TARGET} = ARM; then - dnl ****************************************** - dnl *** Check to see what FPU is available *** - dnl ****************************************** - AC_MSG_CHECKING(which FPU to use) - -- AC_TRY_COMPILE([], [ -- __asm__ ("ldfd f0, [r0]"); -- ], fpu=FPA, [ -- AC_TRY_COMPILE([], [ -- __asm__ ("fldd d0, [r0]"); -- ], fpu=VFP, fpu=NONE) -- ]) -+ if test "x$fpu" = "x"; then -+ -+ AC_TRY_COMPILE([], [ -+ __asm__ ("ldfd f0, [r0]"); -+ ], fpu=FPA, [ -+ AC_TRY_COMPILE([], [ -+ __asm__ ("fldd d0, [r0]"); -+ ], fpu=VFP, fpu=NONE) -+ ]) -+ fi - - AC_MSG_RESULT($fpu) - CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" -diff -urNad mono-1.2.5~/configure mono-1.2.5/configure ---- mono-1.2.5~/configure 2007-08-17 19:41:56.000000000 +0200 -+++ mono-1.2.5/configure 2007-08-17 19:43:15.000000000 +0200 -@@ -1610,6 +1610,7 @@ - --with-jit=yes,no If you want to build scripts that default to the JIT - --with-interp=yes,no If you want to build scripts that default to the interpreter - --with-x use the X Window System -+ --with-fpu=FPA,VFP,NONE Select fpu to use on arm - --with-preview=yes,no If you want to install the 2.0 FX preview - --with-moonlight=yes,no If you want to build the Moonlight 2.1 assemblies - -@@ -6545,7 +6546,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 6548 "configure"' > conftest.$ac_ext -+ echo '#line 6549 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -9344,11 +9345,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9347: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9348: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9351: \$? = $ac_status" >&5 -+ echo "$as_me:9352: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -9612,11 +9613,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9615: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9616: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9619: \$? = $ac_status" >&5 -+ echo "$as_me:9620: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -9716,11 +9717,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9719: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9720: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9723: \$? = $ac_status" >&5 -+ echo "$as_me:9724: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -12168,7 +12169,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <&5) -+ (eval echo "\"\$as_me:14640: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14643: \$? = $ac_status" >&5 -+ echo "$as_me:14644: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -14740,11 +14741,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14743: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14744: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14747: \$? = $ac_status" >&5 -+ echo "$as_me:14748: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -16310,11 +16311,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16313: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16314: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16317: \$? = $ac_status" >&5 -+ echo "$as_me:16318: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -16414,11 +16415,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16417: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16418: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16421: \$? = $ac_status" >&5 -+ echo "$as_me:16422: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -18644,11 +18645,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18647: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18648: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18651: \$? = $ac_status" >&5 -+ echo "$as_me:18652: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -18912,11 +18913,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18915: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18916: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18919: \$? = $ac_status" >&5 -+ echo "$as_me:18920: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -19016,11 +19017,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:19019: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19020: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:19023: \$? = $ac_status" >&5 -+ echo "$as_me:19024: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -40617,11 +40618,20 @@ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - -+ -+# Check whether --with-fpu was given. -+if test "${with_fpu+set}" = set; then -+ withval=$with_fpu; fpu=$withval -+fi -+ -+ - if test ${TARGET} = ARM; then - { echo "$as_me:$LINENO: checking which FPU to use" >&5 - echo $ECHO_N "checking which FPU to use... $ECHO_C" >&6; } - -- cat >conftest.$ac_ext <<_ACEOF -+ if test "x$fpu" = "x"; then -+ -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -40632,7 +40642,7 @@ - main () - { - -- __asm__ ("ldfd f0, [r0]"); -+ __asm__ ("ldfd f0, [r0]"); - - ; - return 0; -@@ -40678,7 +40688,7 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - -- cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -40689,7 +40699,7 @@ - main () - { - -- __asm__ ("fldd d0, [r0]"); -+ __asm__ ("fldd d0, [r0]"); - - ; - return 0; -@@ -40742,6 +40752,7 @@ - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ fi - - { echo "$as_me:$LINENO: result: $fpu" >&5 - echo "${ECHO_T}$fpu" >&6; } Index: patches/remove_broken_dllmap_from_mono-shlib-cop.dpatch =================================================================== --- patches/remove_broken_dllmap_from_mono-shlib-cop.dpatch (revision 3728) +++ patches/remove_broken_dllmap_from_mono-shlib-cop.dpatch (working copy) @@ -1,15 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## remove_broken_dllmap_from_mono-shlib-cop.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config /tmp/dpep-work.cUJt1r/mono-1.1.9/mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config ---- ./mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config 2005-07-18 17:02:26.000000000 +0200 -+++ /tmp/dpep-work.cUJt1r/mono-1.1.9/mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config 2005-09-10 19:53:18.000000000 +0200 -@@ -1,4 +1,3 @@ - -- - - Index: patches/fix_Dictionary_preventing_GC_r102114.dpatch =================================================================== --- patches/fix_Dictionary_preventing_GC_r102114.dpatch (revision 3728) +++ patches/fix_Dictionary_preventing_GC_r102114.dpatch (working copy) @@ -1,35 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_Dictionary_preventing_GC_r102114.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: * Dictionary.cs (Clear, Remove): Clear empty slots in keySlots -## DP: and valueSlots. Otherwise the garbage collector cannot reclaim -## DP: the referenced key/value. Fixes bug #384723. - -@DPATCH@ -diff -urNad mono-1.9.1+dfsg~/mcs/class/corlib/System.Collections.Generic/Dictionary.cs mono-1.9.1+dfsg/mcs/class/corlib/System.Collections.Generic/Dictionary.cs ---- mono-1.9.1+dfsg~/mcs/class/corlib/System.Collections.Generic/Dictionary.cs 2007-11-08 23:13:53.000000000 +0100 -+++ mono-1.9.1+dfsg/mcs/class/corlib/System.Collections.Generic/Dictionary.cs 2008-07-08 14:13:04.000000000 +0200 -@@ -383,7 +383,10 @@ - { - count = 0; - // clear the hash table -- Array.Clear(table, 0, table.Length); -+ Array.Clear (table, 0, table.Length); -+ // clear key and value arrays -+ Array.Clear (keySlots, 0, keySlots.Length); -+ Array.Clear (valueSlots, 0, valueSlots.Length); - - // empty the "empty slots chain" - emptySlot = NO_SLOT; -@@ -510,6 +513,10 @@ - linkSlots [cur].Next = emptySlot; - emptySlot = cur; - -+ // clear empty key and value slots -+ keySlots [cur] = default (TKey); -+ valueSlots [cur] = default (TValue); -+ - generation++; - return true; - } Index: patches/kfreebsd_support.dpatch =================================================================== --- patches/kfreebsd_support.dpatch (revision 3728) +++ patches/kfreebsd_support.dpatch (working copy) @@ -1,203 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## -## -## All lines beginning with ## DP:' are a description of the patch. -## DP: kfreebsd support - mainly backport of gc 6.8 - -@DPATCH@ -diff -urNad mono-1.2.6~/configure.in mono-1.2.6/configure.in ---- mono-1.2.6~/configure.in 2007-12-16 15:41:43.000000000 +0100 -+++ mono-1.2.6/configure.in 2007-12-16 15:42:43.000000000 +0100 -@@ -93,6 +93,16 @@ - libgc_threads=pthreads - with_sigaltstack=no - ;; -+ *-*-kfreebsd*-gnu) -+ platform_win32=no -+ CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread" -+ libmono_cflags="-D_REENTRANT -DTHREAD_LOCAL_ALLOC -pthread" -+ libmono_ldflags="-lpthread -pthread" -+ libdl="-ldl" -+ libgc_threads=pthreads -+ need_link_unlink=yes -+ with_sigaltstack=no -+ ;; - # these flags will work for all versions of -STABLE - # - *-*-*freebsd4*) -@@ -1855,6 +1865,11 @@ - LIBC="libc.so.12" - INTL="libintl.so.0" - ;; -+ *-*-kfreebsd*-gnu) -+ LIBC="libc.so.0.1" -+ INTL="libc.so.0.1" -+ X11="libX11.so.6" -+ ;; - *-*-*freebsd*) - LIBC="libc.so" - INTL="libintl.so" -diff -urNad mono-1.2.6~/libgc/configure.in mono-1.2.6/libgc/configure.in ---- mono-1.2.6~/libgc/configure.in 2007-12-16 15:41:43.000000000 +0100 -+++ mono-1.2.6/libgc/configure.in 2007-12-16 15:42:43.000000000 +0100 -@@ -103,6 +103,17 @@ - AC_DEFINE(THREAD_LOCAL_ALLOC) - THREADDLLIBS="-lpthread -lrt" - ;; -+ *-*-kfreebsd*-gnu) -+ AC_DEFINE(GC_FREEBSD_THREADS) -+ INCLUDES="$INCLUDES -pthread" -+ THREADDLLIBS=-pthread -+ AC_DEFINE(_REENTRANT) -+ if test "${enable_parallel_mark}" = yes; then -+ AC_DEFINE(PARALLEL_MARK) -+ fi -+ AC_DEFINE(THREAD_LOCAL_ALLOC) -+ AC_DEFINE(USE_COMPILER_TLS) -+ ;; - *-*-freebsd4*) - AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.") - AC_DEFINE(GC_FREEBSD_THREADS) -diff -urNad mono-1.2.6~/libgc/dyn_load.c mono-1.2.6/libgc/dyn_load.c ---- mono-1.2.6~/libgc/dyn_load.c 2007-12-16 15:41:43.000000000 +0100 -+++ mono-1.2.6/libgc/dyn_load.c 2007-12-16 15:42:43.000000000 +0100 -@@ -26,7 +26,7 @@ - * None of this is safe with dlclose and incremental collection. - * But then not much of anything is safe in the presence of dlclose. - */ --#if defined(__linux__) && !defined(_GNU_SOURCE) -+#if (defined(__linux__) || defined(__GLIBC__)) && !defined(_GNU_SOURCE) - /* Can't test LINUX, since this must be define before other includes */ - # define _GNU_SOURCE - #endif -@@ -386,7 +386,7 @@ - /* For glibc 2.2.4+. Unfortunately, it doesn't work for older */ - /* versions. Thanks to Jakub Jelinek for most of the code. */ - --# if defined(LINUX) /* Are others OK here, too? */ \ -+# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \ - && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ - || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) - -diff -urNad mono-1.2.6~/libgc/include/gc.h mono-1.2.6/libgc/include/gc.h ---- mono-1.2.6~/libgc/include/gc.h 2007-12-16 15:41:43.000000000 +0100 -+++ mono-1.2.6/libgc/include/gc.h 2007-12-16 15:42:43.000000000 +0100 -@@ -484,7 +484,7 @@ - # define GC_RETURN_ADDR (GC_word)__return_address - #endif - --#ifdef __linux__ -+#if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ - && !defined(__ia64__) -diff -urNad mono-1.2.6~/libgc/include/private/gcconfig.h mono-1.2.6/libgc/include/private/gcconfig.h ---- mono-1.2.6~/libgc/include/private/gcconfig.h 2007-12-16 15:41:43.000000000 +0100 -+++ mono-1.2.6/libgc/include/private/gcconfig.h 2007-12-16 15:42:43.000000000 +0100 -@@ -55,7 +55,7 @@ - # endif - - /* And one for FreeBSD: */ --# if defined(__FreeBSD__) && !defined(FREEBSD) -+# if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD) - # define FREEBSD - # endif - -@@ -1279,8 +1279,15 @@ - # ifndef GC_FREEBSD_THREADS - # define MPROTECT_VDB - # endif --# define SIG_SUSPEND SIGTSTP --# define SIG_THR_RESTART SIGCONT -+# ifdef __GLIBC__ -+# define SIG_SUSPEND (32+6) -+# define SIG_THR_RESTART (32+5) -+ extern int _end[]; -+# define DATAEND (_end) -+# else -+# define SIG_SUSPEND SIGTSTP -+# define SIG_THR_RESTART SIGCONT -+# endif - # define FREEBSD_STACKBOTTOM - # ifdef __ELF__ - # define DYNAMIC_LOADING -@@ -2009,6 +2016,28 @@ - extern char * GC_FreeBSDGetDataStart(); - # define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext) - # endif -+# ifdef FREEBSD -+# define OS_TYPE "FREEBSD" -+# ifndef GC_FREEBSD_THREADS -+# define MPROTECT_VDB -+# endif -+# ifdef __GLIBC__ -+# define SIG_SUSPEND (32+6) -+# define SIG_THR_RESTART (32+5) -+ extern int _end[]; -+# define DATAEND (_end) -+# else -+# define SIG_SUSPEND SIGUSR1 -+# define SIG_THR_RESTART SIGUSR2 -+# endif -+# define FREEBSD_STACKBOTTOM -+# ifdef __ELF__ -+# define DYNAMIC_LOADING -+# endif -+ extern char etext[]; -+ extern char * GC_FreeBSDGetDataStart(); -+# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext) -+# endif - # ifdef NETBSD - # define OS_TYPE "NETBSD" - # ifdef __ELF__ -@@ -2080,7 +2109,7 @@ - # define SUNOS5SIGS - # endif - --# if defined(FREEBSD) && (__FreeBSD__ >= 4) -+# if defined(FREEBSD) && ((__FreeBSD__ >= 4) || (__FreeBSD_kernel__ >= 4)) - # define SUNOS5SIGS - # endif - -@@ -2143,7 +2172,7 @@ - # define CACHE_LINE_SIZE 32 /* Wild guess */ - # endif - --# ifdef LINUX -+# if defined(LINUX) || defined(__GLIBC__) - # define REGISTER_LIBRARIES_EARLY - /* We sometimes use dl_iterate_phdr, which may acquire an internal */ - /* lock. This isn't safe after the world has stopped. So we must */ -@@ -2224,7 +2253,7 @@ - #if defined(SPARC) - # define CAN_SAVE_CALL_ARGS - #endif --#if (defined(I386) || defined(X86_64)) && defined(LINUX) -+#if (defined(I386) || defined(X86_64)) && (defined(LINUX) || defined(__GLIBC__)) - /* SAVE_CALL_CHAIN is supported if the code is compiled to save */ - /* frame pointers by default, i.e. no -fomit-frame-pointer flag. */ - # define CAN_SAVE_CALL_ARGS -diff -urNad mono-1.2.6~/mono/mini/exceptions-amd64.c mono-1.2.6/mono/mini/exceptions-amd64.c ---- mono-1.2.6~/mono/mini/exceptions-amd64.c 2007-12-16 15:41:43.000000000 +0100 -+++ mono-1.2.6/mono/mini/exceptions-amd64.c 2007-12-16 15:42:43.000000000 +0100 -@@ -682,7 +682,7 @@ - static inline guint64* - gregs_from_ucontext (ucontext_t *ctx) - { --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - guint64 *gregs = (guint64 *) &ctx->uc_mcontext; - #else - guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs; -diff -urNad mono-1.2.6~/mono/mini/mini-amd64.h mono-1.2.6/mono/mini/mini-amd64.h ---- mono-1.2.6~/mono/mini/mini-amd64.h 2007-12-16 15:41:43.000000000 +0100 -+++ mono-1.2.6/mono/mini/mini-amd64.h 2007-12-16 15:42:43.000000000 +0100 -@@ -220,7 +220,7 @@ - - #endif /* PLATFORM_WIN32 */ - --#ifdef __FreeBSD__ -+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) - - #define REG_RAX 7 - #define REG_RCX 4 Index: patches/fix_CRLF_injection_CVE-2008-3906.dpatch =================================================================== --- patches/fix_CRLF_injection_CVE-2008-3906.dpatch (revision 3728) +++ patches/fix_CRLF_injection_CVE-2008-3906.dpatch (working copy) @@ -1,101 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_CRLF_injection_CVE-2008-3906.dpatch by Jo Shields -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix injection of arbitrary HTTP headers via CRLF -## DP: Taken from SVN revisions 111120 and 111129 - -@DPATCH@ -Index: mono-1.9.1+dfsg/mcs/class/System.Web/System.Web/HttpResponseHeader.cs -=================================================================== ---- mono-1.9.1+dfsg/mcs/class/System.Web/System.Web/HttpResponseHeader.cs (revision 111119) -+++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web/HttpResponseHeader.cs (revision 111129) -@@ -30,17 +30,65 @@ - - using System.Collections; - using System.Text; -+using System.Web.Configuration; - - namespace System.Web { - - internal abstract class BaseResponseHeader { -- public string Value; -+ string headerValue; -+ -+ public string Value { -+ get { return headerValue; } -+ set { headerValue = EncodeHeader (value); } -+ } - -+ static bool headerCheckingEnabled; -+ -+ static BaseResponseHeader () { -+#if NET_2_0 -+ HttpRuntimeSection section = WebConfigurationManager.GetSection ("system.web/httpRuntime") as HttpRuntimeSection; -+#else -+ HttpRuntimeConfig section = HttpContext.GetAppConfig ("system.web/httpRuntime") as HttpRuntimeConfig; -+#endif -+ headerCheckingEnabled = section == null || section.EnableHeaderChecking; -+ } -+ -+ - internal BaseResponseHeader (string val) - { - Value = val; - } - -+ string EncodeHeader (string value) -+ { -+ if (value == null || value.Length == 0) -+ return value; -+ -+ if (headerCheckingEnabled) { -+ StringBuilder ret = new StringBuilder (); -+ int len = value.Length; -+ -+ for (int i = 0; i < len; i++) { -+ switch (value [i]) { -+ case '\r': -+ ret.Append ("%0d"); -+ break; -+ -+ case '\n': -+ ret.Append ("%0a"); -+ break; -+ -+ default: -+ ret.Append (value [i]); -+ break; -+ } -+ } -+ -+ return ret.ToString (); -+ } else -+ return value; -+ } -+ - internal abstract void SendContent (HttpWorkerRequest wr); - } - -Index: mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.Configuration/HttpRuntimeConfig.cs -=================================================================== ---- mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.Configuration/HttpRuntimeConfig.cs (revision 111119) -+++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.Configuration/HttpRuntimeConfig.cs (revision 111129) -@@ -55,7 +55,8 @@ - public int IdleTimeout = 20; // minutes - public bool Enable = true; - public string VersionHeader; -- -+ public bool EnableHeaderChecking = true; -+ - /* Only the config. handler should create instances of this. Use GetInstance (context) */ - public HttpRuntimeConfig (object p) - { -@@ -92,6 +93,7 @@ - RequireRootSaveAsPath = parent.RequireRootSaveAsPath; - IdleTimeout = parent.IdleTimeout; - Enable = parent.Enable; -+ EnableHeaderChecking = parent.EnableHeaderChecking; - } - } - } Index: patches/fix_IsolatedStorage_regression_r99231_r101171_r101172.dpatch =================================================================== --- patches/fix_IsolatedStorage_regression_r99231_r101171_r101172.dpatch (revision 3728) +++ patches/fix_IsolatedStorage_regression_r99231_r101171_r101172.dpatch (working copy) @@ -1,123 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_IsolatedStorage_regression_r99231_r101171_r101172.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix IsolatedStorage regression causing exceptions on subdirectories -## DP: Taken from SVN revision r99231, r101171, r101172 - -@DPATCH@ -diff -urNad mono-1.9.1+dfsg~/mcs/class/corlib/System.IO/Path.cs mono-1.9.1+dfsg/mcs/class/corlib/System.IO/Path.cs ---- mono-1.9.1+dfsg~/mcs/class/corlib/System.IO/Path.cs 2008-10-10 14:41:26.000000000 +0100 -+++ mono-1.9.1+dfsg/mcs/class/corlib/System.IO/Path.cs 2008-10-10 14:41:40.000000000 +0100 -@@ -69,7 +69,7 @@ - internal static readonly string DirectorySeparatorStr; - public static readonly char VolumeSeparatorChar; - -- private static readonly char[] PathSeparatorChars; -+ internal static readonly char[] PathSeparatorChars; - private static readonly bool dirEqualsVolume; - - // class methods -diff -urNad mono-1.9.1+dfsg~/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs mono-1.9.1+dfsg/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs ---- mono-1.9.1+dfsg~/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs 2008-10-10 14:41:26.000000000 +0100 -+++ mono-1.9.1+dfsg/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs 2008-10-10 14:41:40.000000000 +0100 -@@ -453,13 +453,36 @@ - - public void CreateDirectory (string dir) - { -- directory.CreateSubdirectory (dir); -+ if (dir == null) -+ throw new ArgumentNullException ("dir"); -+ -+ if (dir.IndexOfAny (Path.PathSeparatorChars) < 0) { -+ if (directory.GetFiles (dir).Length > 0) -+ throw new IOException (Locale.GetText ("Directory name already exists as a file.")); -+ directory.CreateSubdirectory (dir); -+ } else { -+ string[] dirs = dir.Split (Path.PathSeparatorChars); -+ DirectoryInfo dinfo = directory; -+ -+ for (int i = 0; i < dirs.Length; i++) { -+ if (dinfo.GetFiles (dirs [i]).Length > 0) -+ throw new IOException (Locale.GetText ( -+ "Part of the directory name already exists as a file.")); -+ dinfo = dinfo.CreateSubdirectory (dirs [i]); -+ } -+ } - } - - public void DeleteDirectory (string dir) - { -- DirectoryInfo subdir = directory.CreateSubdirectory (dir); -- subdir.Delete (); -+ try { -+ DirectoryInfo subdir = directory.CreateSubdirectory (dir); -+ subdir.Delete (); -+ } -+ catch { -+ // hide the real exception to avoid leaking the full path -+ throw new IsolatedStorageException (Locale.GetText ("Could not delete directory '{0}'", dir)); -+ } - } - - public void DeleteFile (string file) -@@ -475,7 +498,28 @@ - - public string[] GetDirectoryNames (string searchPattern) - { -- DirectoryInfo[] adi = directory.GetDirectories (searchPattern); -+ if (searchPattern == null) -+ throw new ArgumentNullException ("searchPattern"); -+ -+ // note: IsolatedStorageFile accept a "dir/file" pattern which is not allowed by DirectoryInfo -+ // so we need to split them to get the right results -+ string path = Path.GetDirectoryName (searchPattern); -+ string pattern = Path.GetFileName (searchPattern); -+ DirectoryInfo[] adi = null; -+ if (path == null || path.Length == 0) { -+ adi = directory.GetDirectories (searchPattern); -+ } else { -+ DirectoryInfo[] subdirs = directory.GetDirectories (path); -+ // we're looking for a single result, identical to path (no pattern here) -+ // we're also looking for something under the current path (not outside isolated storage) -+ if ((subdirs.Length == 1) && (subdirs [0].Name == path) && (subdirs [0].FullName.IndexOf (directory.FullName) >= 0)) { -+ adi = subdirs [0].GetDirectories (pattern); -+ } else { -+ // CAS, even in FullTrust, normally enforce IsolatedStorage -+ throw new SecurityException (); -+ } -+ } -+ - return GetNames (adi); - } - -@@ -489,7 +533,28 @@ - - public string[] GetFileNames (string searchPattern) - { -- FileInfo[] afi = directory.GetFiles (searchPattern); -+ if (searchPattern == null) -+ throw new ArgumentNullException ("searchPattern"); -+ -+ // note: IsolatedStorageFile accept a "dir/file" pattern which is not allowed by DirectoryInfo -+ // so we need to split them to get the right results -+ string path = Path.GetDirectoryName (searchPattern); -+ string pattern = Path.GetFileName (searchPattern); -+ FileInfo[] afi = null; -+ if (path == null || path.Length == 0) { -+ afi = directory.GetFiles (searchPattern); -+ } else { -+ DirectoryInfo[] subdirs = directory.GetDirectories (path); -+ // we're looking for a single result, identical to path (no pattern here) -+ // we're also looking for something under the current path (not outside isolated storage) -+ if ((subdirs.Length == 1) && (subdirs [0].Name == path) && (subdirs [0].FullName.IndexOf (directory.FullName) >= 0)) { -+ afi = subdirs [0].GetFiles (pattern); -+ } else { -+ // CAS, even in FullTrust, normally enforce IsolatedStorage -+ throw new SecurityException (); -+ } -+ } -+ - return GetNames (afi); - } - Index: patches/fix_softfloat_r105848.dpatch =================================================================== --- patches/fix_softfloat_r105848.dpatch (revision 3728) +++ patches/fix_softfloat_r105848.dpatch (working copy) @@ -1,120 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_softfloat_r105848.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixes softfloat issues causing SIGABRT on armel, see -## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485112 -## DP: Patch taken from upstream SVN revision 105848. - -@DPATCH@ -diff -urNad mono-1.9.1+dfsg~/mono/mini/mini.c mono-1.9.1+dfsg/mono/mini/mini.c ---- mono-1.9.1+dfsg~/mono/mini/mini.c 2008-02-06 21:28:25.000000000 +0100 -+++ mono-1.9.1+dfsg/mono/mini/mini.c 2008-06-17 23:29:29.000000000 +0200 -@@ -622,7 +622,6 @@ - (cfg)->disable_ssa = TRUE; \ - } while (0) - -- - #define NEW_INDLOAD(cfg,dest,addr,vtype) do { \ - (dest) = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \ - (dest)->inst_left = addr; \ -@@ -2857,11 +2856,23 @@ - MONO_INST_NEW (cfg, (ins), OP_NOP); \ - } \ - } while (0) -+ -+#define NEW_TEMPLOAD_SOFT_FLOAT(cfg,bblock,ins,num) do { \ -+ if ((ins)->opcode == CEE_LDIND_R4) { \ -+ int idx = (num); \ -+ int temp; \ -+ NEW_TEMPLOADA (cfg, (ins), (idx)); \ -+ temp = handle_load_float (cfg, (bblock), (ins), ip); \ -+ NEW_TEMPLOAD (cfg, (ins), (temp)); \ -+ } \ -+ } while (0) -+ - #else - #define LDLOC_SOFT_FLOAT(cfg,ins,idx,ip) - #define STLOC_SOFT_FLOAT(cfg,ins,idx,ip) - #define LDARG_SOFT_FLOAT(cfg,ins,idx,ip) - #define STARG_SOFT_FLOAT(cfg,ins,idx,ip) -+#define NEW_TEMPLOAD_SOFT_FLOAT(cfg,bblock,ins,num) - #endif - - static MonoMethod* -@@ -3820,14 +3831,7 @@ - - if (rvar) { - NEW_TEMPLOAD (cfg, ins, rvar->inst_c0); --#ifdef MONO_ARCH_SOFT_FLOAT -- if (ins->opcode == CEE_LDIND_R4) { -- int temp; -- NEW_TEMPLOADA (cfg, ins, rvar->inst_c0); -- temp = handle_load_float (cfg, bblock, ins, ip); -- NEW_TEMPLOAD (cfg, ins, temp); -- } --#endif -+ NEW_TEMPLOAD_SOFT_FLOAT (cfg, ebblock, ins, rvar->inst_c0); - *sp++ = ins; - } - *last_b = ebblock; -@@ -5549,7 +5553,6 @@ - //g_assert (returnvar != -1); - NEW_TEMPSTORE (cfg, store, return_var->inst_c0, *sp); - store->cil_code = sp [0]->cil_code; -- /* FIXME: handle CEE_STIND_R4 */ - if (store->opcode == CEE_STOBJ) { - g_assert_not_reached (); - NEW_TEMPLOADA (cfg, store, return_var->inst_c0); -@@ -5923,6 +5926,31 @@ - case CEE_CONV_R_UN: - CHECK_STACK (1); - ADD_UNOP (*ip); -+ -+#ifdef MONO_ARCH_SOFT_FLOAT -+ /* -+ * Its rather hard to emit the soft float code during the decompose -+ * pass, so avoid it in some specific cases. -+ */ -+ if (ins->opcode == OP_LCONV_TO_R4) { -+ MonoInst *conv; -+ -+ ins->opcode = OP_LCONV_TO_R8; -+ ins->type = STACK_R8; -+ -+ --sp; -+ *sp++ = emit_tree (cfg, bblock, ins, ip + 1); -+ -+ MONO_INST_NEW (cfg, conv, CEE_CONV_R4); -+ conv->inst_left = sp [-1]; -+ conv->type = STACK_R8; -+ sp [-1] = ins; -+ -+ ip++; -+ break; -+ } -+#endif -+ - if (mono_find_jit_opcode_emulation (ins->opcode)) { - --sp; - *sp++ = emit_tree (cfg, bblock, ins, ip + 1); -@@ -6734,6 +6762,7 @@ - } else { - temp = mono_emit_method_call_spilled (cfg, bblock, wrapper, mono_method_signature (wrapper), iargs, ip, NULL); - NEW_TEMPLOAD (cfg, *sp, temp); -+ NEW_TEMPLOAD_SOFT_FLOAT (cfg, bblock, *sp, temp); - sp++; - } - } else { -diff -urNad mono-1.9.1+dfsg~/mono/mini/mini.h mono-1.9.1+dfsg/mono/mini/mini.h ---- mono-1.9.1+dfsg~/mono/mini/mini.h 2008-06-17 23:28:42.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/mini/mini.h 2008-06-17 23:29:29.000000000 +0200 -@@ -244,7 +244,7 @@ - mono_container_of(ptr, type, member)*/ - - #define MONO_INST_LIST_ENTRY(ptr, type, member) \ -- ((type *)(ptr)) -+ ((type *)(gpointer)(ptr)) - - #define MONO_INST_LIST_FIRST_ENTRY(ptr, type, member) \ - MONO_INST_LIST_ENTRY((ptr)->next, type, member) Index: patches/pass_CPPFLAGS_nicely_r98803.dpatch =================================================================== --- patches/pass_CPPFLAGS_nicely_r98803.dpatch (revision 3728) +++ patches/pass_CPPFLAGS_nicely_r98803.dpatch (working copy) @@ -1,52 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## pass_CPPFLAGS_nicely_r98803.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.9.1+dfsg~/configure.in mono-1.9.1+dfsg/configure.in ---- mono-1.9.1+dfsg~/configure.in 2008-04-22 20:16:11.000000000 +0200 -+++ mono-1.9.1+dfsg/configure.in 2008-04-22 20:16:15.000000000 +0200 -@@ -670,13 +670,6 @@ - ;; - - xincluded) -- AC_CONFIG_SUBDIRS(libgc) -- -- # Pass CPPFLAGS to libgc configure -- # Maybe we should use a separate variable for this to avoid passing useless and -- # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64) -- export CPPFLAGS -- - found_boehm=yes - gc_headers=yes - use_included_gc=yes -@@ -724,9 +717,6 @@ - CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG" - fi - --# tell libgc/configure about what we want --ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args" -- - AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes) - AC_SUBST(LIBGC_CFLAGS) - AC_SUBST(LIBGC_LIBS) -@@ -1985,6 +1975,17 @@ - CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS" - fi - -+case "x$gc" in -+ xincluded) -+ # Pass CPPFLAGS to libgc configure -+ # We should use a separate variable for this to avoid passing useless and -+ # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64) -+ # This should be executed late so we pick up the final version of CPPFLAGS -+ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\"" -+ AC_CONFIG_SUBDIRS(libgc) -+ ;; -+esac -+ - PREVIEW=yes - AC_ARG_WITH(preview, [ --with-preview=yes,no If you want to install the 2.0 FX preview],[ - if test x$with_preview = xno; then Index: patches/ppc_fix_memory_corruption_r81413.dpatch =================================================================== --- patches/ppc_fix_memory_corruption_r81413.dpatch (revision 3728) +++ patches/ppc_fix_memory_corruption_r81413.dpatch (working copy) @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run - -@DPATCH@ -diff -urNad mono-1.2.5~/mono/mini/mini-ppc.c mono-1.2.5/mono/mini/mini-ppc.c ---- mono-1.2.5~/mono/mini/mini-ppc.c 2007-08-17 19:54:05.000000000 +0200 -+++ mono-1.2.5/mono/mini/mini-ppc.c 2007-08-17 19:58:10.000000000 +0200 -@@ -2563,8 +2563,12 @@ - ppc_rlwinm (code, ppc_r11, ppc_r11, 0, 0, 27); - /* use ctr to store the number of words to 0 if needed */ - if (ins->flags & MONO_INST_INIT) { -- /* we zero 4 bytes at a time */ -- ppc_addi (code, ppc_r0, ins->sreg1, 3); -+ /* we zero 4 bytes at a time: -+ * we add 7 instead of 3 so that we set the counter to -+ * at least 1, otherwise the bdnz instruction will make -+ * it negative and iterate billions of times. -+ */ -+ ppc_addi (code, ppc_r0, ins->sreg1, 7); - ppc_srawi (code, ppc_r0, ppc_r0, 2); - ppc_mtctr (code, ppc_r0); - } -@@ -2574,7 +2578,10 @@ - - if (ins->flags & MONO_INST_INIT) { - /* adjust the dest reg by -4 so we can use stwu */ -- ppc_addi (code, ins->dreg, ppc_sp, (area_offset - 4)); -+ /* we actually adjust -8 because we let the loop -+ * run at least once -+ */ -+ ppc_addi (code, ins->dreg, ppc_sp, (area_offset - 8)); - ppc_li (code, ppc_r11, 0); - zero_loop_start = code; - ppc_stwu (code, ppc_r11, 4, ins->dreg); Index: patches/fix_delegate_memory_leak_r79001.dpatch =================================================================== --- patches/fix_delegate_memory_leak_r79001.dpatch (revision 3728) +++ patches/fix_delegate_memory_leak_r79001.dpatch (working copy) @@ -1,47 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_delegate_memory_leak.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.2.4~/mono/metadata/loader.c mono-1.2.4/mono/metadata/loader.c ---- mono-1.2.4~/mono/metadata/loader.c 2007-04-25 20:48:41.000000000 +0200 -+++ mono-1.2.4/mono/metadata/loader.c 2007-07-21 16:02:11.000000000 +0200 -@@ -1551,17 +1551,11 @@ - g_free ((char*)method->name); - if (mw->method.header) - g_free ((char*)mw->method.header->code); -+ g_free (mw->method.header); - g_free (mw->method_data); -- } -- -- if (method->dynamic && !(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) && ((MonoMethodNormal *)method)->header) { -- /* FIXME: Ditto */ -- /* mono_metadata_free_mh (((MonoMethodNormal *)method)->header); */ -- g_free (((MonoMethodNormal*)method)->header); -- } -- -- if (method->dynamic) -+ g_free (method->signature); - g_free (method); -+ } - } - - void -diff -urNad mono-1.2.4~/mono/metadata/marshal.c mono-1.2.4/mono/metadata/marshal.c ---- mono-1.2.4~/mono/metadata/marshal.c 2007-05-01 00:49:22.000000000 +0200 -+++ mono-1.2.4/mono/metadata/marshal.c 2007-07-21 16:02:11.000000000 +0200 -@@ -8765,7 +8765,11 @@ - - - /* we copy the signature, so that we can modify it */ -- csig = signature_dup (method->klass->image, sig); -+ if (this) -+ /* Need to free this later */ -+ csig = mono_metadata_signature_dup (sig); -+ else -+ csig = signature_dup (method->klass->image, sig); - csig->hasthis = 0; - csig->pinvoke = 1; - Index: patches/99_autoreconf.dpatch =================================================================== --- patches/99_autoreconf.dpatch (revision 3728) +++ patches/99_autoreconf.dpatch (working copy) @@ -1,8132 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99_autoreconf.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.9.1+dfsg~/Makefile.in mono-1.9.1+dfsg/Makefile.in ---- mono-1.9.1+dfsg~/Makefile.in 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -107,6 +107,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -142,6 +143,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -393,8 +395,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -419,8 +421,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -430,13 +432,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -510,6 +511,10 @@ - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) -@@ -536,6 +541,8 @@ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -@@ -688,18 +695,18 @@ - .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ -- dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ -- distclean distclean-generic distclean-hdr distclean-libtool \ -- distclean-tags distcleancheck distdir distuninstallcheck dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags tags-recursive uninstall uninstall-am -+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ -+ distcheck distclean distclean-generic distclean-hdr \ -+ distclean-libtool distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-recursive uninstall uninstall-am - - - # Distribute the 'mcs' tree too -diff -urNad mono-1.9.1+dfsg~/aclocal.m4 mono-1.9.1+dfsg/aclocal.m4 ---- mono-1.9.1+dfsg~/aclocal.m4 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/aclocal.m4 2008-06-17 23:58:14.000000000 +0200 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.10 -*- Autoconf -*- -+# generated automatically by aclocal 1.10.1 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,14 +11,17 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --m4_if(m4_PACKAGE_VERSION, [2.61],, --[m4_fatal([this file was generated for autoconf 2.61. --You have another version of autoconf. If you want to use that, --you should regenerate the build system entirely.], [63])]) -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(AC_AUTOCONF_VERSION, [2.61],, -+[m4_warning([this file was generated for autoconf 2.61. -+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'.])]) - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - --# serial 51 AC_PROG_LIBTOOL -+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -106,7 +109,6 @@ - AC_REQUIRE([AC_OBJEXT])dnl - AC_REQUIRE([AC_EXEEXT])dnl - dnl -- - AC_LIBTOOL_SYS_MAX_CMD_LEN - AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - AC_LIBTOOL_OBJDIR -@@ -208,6 +210,8 @@ - ;; - esac - -+_LT_REQUIRED_DARWIN_CHECKS -+ - AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], - enable_win32_dll=yes, enable_win32_dll=no) -@@ -287,9 +291,80 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - ])# _LT_LINKER_BOILERPLATE - -+# _LT_REQUIRED_DARWIN_CHECKS -+# -------------------------- -+# Check for some things on darwin -+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ -+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -+ [lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi]) -+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], -+ [lt_cv_ld_exported_symbols_list], -+ [lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" -+ ]) -+ case $host_os in -+ rhapsody* | darwin1.[[0123]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+]) - - # _LT_AC_SYS_LIBPATH_AIX - # ---------------------- -@@ -614,7 +689,11 @@ - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) LD="${LD-ld} -64" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; - esac - ;; - esac -@@ -707,7 +786,7 @@ - $2=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - ]) - -@@ -978,7 +1057,7 @@ - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], -@@ -986,7 +1065,7 @@ - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) -@@ -1303,7 +1382,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -1644,6 +1723,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -1824,6 +1915,13 @@ - AC_MSG_RESULT([$dynamic_linker]) - test "$dynamic_linker" = no && can_build_shared=no - -+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -2323,7 +2421,7 @@ - # whether `pass_all' will *always* work, you probably want this one. - - case $host_os in --aix4* | aix5*) -+aix[[4-9]]*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2418,7 +2516,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -2759,7 +2857,7 @@ - fi - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -2816,6 +2914,7 @@ - _LT_AC_TAGVAR(predeps, $1)= - _LT_AC_TAGVAR(postdeps, $1)= - _LT_AC_TAGVAR(compiler_lib_search_path, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= - - # Source file extension for C++ test sources. - ac_ext=cpp -@@ -2925,7 +3024,7 @@ - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- aix4* | aix5*) -+ aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -2938,7 +3037,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -3084,51 +3183,23 @@ - fi - ;; - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- -- if test "$GXX" = yes ; then -- lt_int_apple_cc_single_mod=no -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) -@@ -3379,7 +3450,7 @@ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -3452,7 +3523,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -3814,7 +3885,8 @@ - # compiler output when linking a shared library. - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. --AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl - dnl we can't use the lt_simple_compile_test_code here, - dnl because it contains code intended for an executable, - dnl not a library. It's possible we should let each -@@ -3939,6 +4011,11 @@ - - $rm -f confest.$objext - -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= -+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ - # PORTME: override above test on systems where it is broken - ifelse([$1],[CXX], - [case $host_os in -@@ -3995,7 +4072,6 @@ - ;; - esac - ]) -- - case " $_LT_AC_TAGVAR(postdeps, $1) " in - *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - esac -@@ -4080,7 +4156,7 @@ - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4* | aix5*) -+aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -4257,6 +4333,7 @@ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ -@@ -4319,7 +4396,7 @@ - # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - # - # This file is part of GNU Libtool: -@@ -4556,6 +4633,10 @@ - # shared library. - postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) -@@ -4905,7 +4986,7 @@ - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -4962,7 +5043,8 @@ - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform -@@ -4999,7 +5081,7 @@ - esac - else - case $host_os in -- aix4* | aix5*) -+ aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor -@@ -5095,7 +5177,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -@@ -5133,7 +5215,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -5246,7 +5328,8 @@ - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) -@@ -5316,7 +5399,8 @@ - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) -@@ -5453,7 +5537,7 @@ - # - if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; -@@ -5477,7 +5561,7 @@ - # - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" - AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -@@ -5493,7 +5577,7 @@ - ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- aix4* | aix5*) -+ aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -5508,10 +5592,14 @@ - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - ;; -+ linux* | k*bsd*-gnu) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -5542,12 +5630,14 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) -@@ -5597,7 +5687,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -5713,12 +5803,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -5816,7 +5907,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -5836,7 +5927,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -5996,11 +6087,10 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -6150,7 +6240,7 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -6729,7 +6819,7 @@ - - _PKG_TEXT - --To get pkg-config, see .])], -+To get pkg-config, see .])], - [$4]) - else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -@@ -6739,7 +6829,7 @@ - fi[]dnl - ])# PKG_CHECK_MODULES - --# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -6754,7 +6844,7 @@ - [am__api_version='1.10' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.10], [], -+m4_if([$1], [1.10.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -6770,8 +6860,10 @@ - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.10])dnl --_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) -+[AM_AUTOMAKE_VERSION([1.10.1])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) - - # Figure out how to run the assembler. -*- Autoconf -*- - -@@ -7088,7 +7180,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue -@@ -7148,13 +7240,13 @@ - # Do all the work for Automake. -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 12 -+# serial 13 - - # This macro actually does too much. Some checks are only needed if - # your package does certain things. But this isn't really a big deal. -@@ -7259,16 +7351,17 @@ - # our stamp files there. - AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], - [# Compute $1's index in $config_headers. -+_am_arg=$1 - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $1 | $1:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - - # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # -@@ -7586,7 +7679,7 @@ - - # _AM_SUBST_NOTMAKE(VARIABLE) - # --------------------------- --# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. - # This macro is traced by Automake. - AC_DEFUN([_AM_SUBST_NOTMAKE]) - -diff -urNad mono-1.9.1+dfsg~/configure mono-1.9.1+dfsg/configure ---- mono-1.9.1+dfsg~/configure 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/configure 2008-06-17 23:58:24.000000000 +0200 -@@ -884,6 +884,8 @@ - ECHO - AR - RANLIB -+DSYMUTIL -+NMEDIT - DLLTOOL - AS - OBJDUMP -@@ -2839,6 +2841,11 @@ - gc_default=boehm - fi - -+# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure -+# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0 -+CPPFLAGS_FOR_LIBGC=$CPPFLAGS -+CFLAGS_FOR_LIBGC=$CFLAGS -+ - # - # These are the flags that need to be stored in the mono.pc file for - # compiling code that will embed Mono -@@ -2900,6 +2907,16 @@ - libgc_threads=pthreads - with_sigaltstack=no - ;; -+ *-*-kfreebsd*-gnu) -+ platform_win32=no -+ CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread" -+ libmono_cflags="-D_REENTRANT -DTHREAD_LOCAL_ALLOC -pthread" -+ libmono_ldflags="-lpthread -pthread" -+ libdl="-ldl" -+ libgc_threads=pthreads -+ need_link_unlink=yes -+ with_sigaltstack=no -+ ;; - # these flags will work for all versions of -STABLE - # - *-*-*freebsd4*) -@@ -6276,7 +6293,7 @@ - # whether `pass_all' will *always* work, you probably want this one. - - case $host_os in --aix4* | aix5*) -+aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -6371,7 +6388,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -6491,7 +6508,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 6494 "configure"' > conftest.$ac_ext -+ echo '#line 6511 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -6663,7 +6680,11 @@ - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) LD="${LD-ld} -64" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; - esac - ;; - esac -@@ -8145,7 +8166,6 @@ - - - # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -- - # find the maximum length of command line arguments - { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 - echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -@@ -8460,7 +8480,7 @@ - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -9020,6 +9040,318 @@ - ;; - esac - -+ -+ case $host_os in -+ rhapsody* | darwin*) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$DSYMUTIL"; then -+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+DSYMUTIL=$ac_cv_prog_DSYMUTIL -+if test -n "$DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+echo "${ECHO_T}$DSYMUTIL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DSYMUTIL"; then -+ ac_ct_DSYMUTIL=$DSYMUTIL -+ # Extract the first word of "dsymutil", so it can be a program name with args. -+set dummy dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_DSYMUTIL"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -+if test -n "$ac_ct_DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_DSYMUTIL" = x; then -+ DSYMUTIL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ DSYMUTIL=$ac_ct_DSYMUTIL -+ fi -+else -+ DSYMUTIL="$ac_cv_prog_DSYMUTIL" -+fi -+ -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$NMEDIT"; then -+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+NMEDIT=$ac_cv_prog_NMEDIT -+if test -n "$NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+echo "${ECHO_T}$NMEDIT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_NMEDIT"; then -+ ac_ct_NMEDIT=$NMEDIT -+ # Extract the first word of "nmedit", so it can be a program name with args. -+set dummy nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_NMEDIT"; then -+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_NMEDIT="nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -+if test -n "$ac_ct_NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_NMEDIT" = x; then -+ NMEDIT=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ NMEDIT=$ac_ct_NMEDIT -+ fi -+else -+ NMEDIT="$ac_cv_prog_NMEDIT" -+fi -+ -+ -+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_apple_cc_single_mod+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } -+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ lt_cv_ld_exported_symbols_list=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ lt_cv_ld_exported_symbols_list=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } -+ case $host_os in -+ rhapsody* | darwin1.[0123]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[012]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+ -+ - enable_dlopen=no - enable_win32_dll=yes - -@@ -9085,7 +9417,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - -@@ -9113,11 +9445,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9116: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9448: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9120: \$? = $ac_status" >&5 -+ echo "$as_me:9452: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -9387,10 +9719,10 @@ - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works=no -+ lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" -@@ -9403,27 +9735,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9406: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9738: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9410: \$? = $ac_status" >&5 -+ echo "$as_me:9742: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works=yes -+ lt_cv_prog_compiler_pic_works=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } - --if test x"$lt_prog_compiler_pic_works" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -@@ -9450,10 +9782,10 @@ - wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works=no -+ lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -9466,20 +9798,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works=yes -+ lt_cv_prog_compiler_static_works=yes - fi - else -- lt_prog_compiler_static_works=yes -+ lt_cv_prog_compiler_static_works=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } - --if test x"$lt_prog_compiler_static_works" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : - else - lt_prog_compiler_static= -@@ -9507,11 +9839,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9510: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9842: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9514: \$? = $ac_status" >&5 -+ echo "$as_me:9846: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -9591,12 +9923,13 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -9655,7 +9988,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no -@@ -9771,12 +10104,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -9874,7 +10208,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -9894,7 +10228,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -10166,11 +10500,10 @@ - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -10320,7 +10653,7 @@ - link_all_deplibs=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -10690,7 +11023,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -11031,6 +11364,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -11212,6 +11557,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -11531,7 +11891,7 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 - echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } - if test $ac_cv_lib_dld_shl_load = yes; then -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" - else - { echo "$as_me:$LINENO: checking for dlopen" >&5 - echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -@@ -11807,7 +12167,7 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 - echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } - if test $ac_cv_lib_dld_dld_link = yes; then -- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" - fi - - -@@ -11856,7 +12216,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -12927,7 +13293,7 @@ - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -12940,7 +13306,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -13198,51 +13564,23 @@ - fi - ;; - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes -- -- if test "$GXX" = yes ; then -- lt_int_apple_cc_single_mod=no -+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) -@@ -13493,7 +13831,7 @@ - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -13566,7 +13904,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -13900,7 +14238,6 @@ - GCC_CXX="$GXX" - LD_CXX="$LD" - -- - cat > conftest.$ac_ext <&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_CXX=no -+ lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" -@@ -14376,27 +14717,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14379: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14720: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14383: \$? = $ac_status" >&5 -+ echo "$as_me:14724: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_CXX=yes -+ lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } - --if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -@@ -14423,10 +14764,10 @@ - wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_CXX+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_CXX=no -+ lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -14439,20 +14780,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_CXX=yes -+ lt_cv_prog_compiler_static_works_CXX=yes - fi - else -- lt_prog_compiler_static_works_CXX=yes -+ lt_cv_prog_compiler_static_works_CXX=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } - --if test x"$lt_prog_compiler_static_works_CXX" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : - else - lt_prog_compiler_static_CXX= -@@ -14480,11 +14821,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14483: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14824: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14487: \$? = $ac_status" >&5 -+ echo "$as_me:14828: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -14537,7 +14878,7 @@ - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- aix4* | aix5*) -+ aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -14552,10 +14893,14 @@ - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; -+ linux* | k*bsd*-gnu) -+ link_all_deplibs_CXX=no -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 - echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -@@ -14657,7 +15002,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -14997,6 +15342,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -15178,6 +15535,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -15261,6 +15633,7 @@ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ -+ compiler_lib_search_dirs_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ -@@ -15509,6 +15882,10 @@ - # shared library. - postdeps=$lt_postdeps_CXX - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -@@ -15723,7 +16100,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -15761,7 +16138,7 @@ - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4* | aix5*) -+aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -16026,10 +16403,10 @@ - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_F77=no -+ lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" -@@ -16042,27 +16419,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16045: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16422: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16049: \$? = $ac_status" >&5 -+ echo "$as_me:16426: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_F77=yes -+ lt_cv_prog_compiler_pic_works_F77=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } - --if test x"$lt_prog_compiler_pic_works_F77" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -@@ -16089,10 +16466,10 @@ - wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_F77=no -+ lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -16105,20 +16482,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_F77=yes -+ lt_cv_prog_compiler_static_works_F77=yes - fi - else -- lt_prog_compiler_static_works_F77=yes -+ lt_cv_prog_compiler_static_works_F77=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } - --if test x"$lt_prog_compiler_static_works_F77" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : - else - lt_prog_compiler_static_F77= -@@ -16146,11 +16523,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16149: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16526: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16153: \$? = $ac_status" >&5 -+ echo "$as_me:16530: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -16230,12 +16607,13 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -16294,7 +16672,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no -@@ -16410,12 +16788,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -16513,7 +16892,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -16533,7 +16912,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -16785,11 +17164,10 @@ - link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -16939,7 +17317,7 @@ - link_all_deplibs_F77=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -17258,7 +17636,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -17598,6 +17976,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -17779,6 +18169,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -17862,6 +18267,7 @@ - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ -+ compiler_lib_search_dirs_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ -@@ -18110,6 +18516,10 @@ - # shared library. - postdeps=$lt_postdeps_F77 - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_F77 -@@ -18284,7 +18694,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -18333,11 +18743,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18336: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18746: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18340: \$? = $ac_status" >&5 -+ echo "$as_me:18750: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -18397,7 +18807,7 @@ - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries -- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ - ;; - - darwin* | rhapsody*) -@@ -18467,7 +18877,7 @@ - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ - ;; - - hpux9* | hpux10* | hpux11*) -@@ -18607,10 +19017,10 @@ - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_GCJ=no -+ lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" -@@ -18623,27 +19033,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18626: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19036: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18630: \$? = $ac_status" >&5 -+ echo "$as_me:19040: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_GCJ=yes -+ lt_cv_prog_compiler_pic_works_GCJ=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } - --if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in - "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -@@ -18670,10 +19080,10 @@ - wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_GCJ=no -+ lt_cv_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -18686,20 +19096,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_GCJ=yes -+ lt_cv_prog_compiler_static_works_GCJ=yes - fi - else -- lt_prog_compiler_static_works_GCJ=yes -+ lt_cv_prog_compiler_static_works_GCJ=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } - --if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then - : - else - lt_prog_compiler_static_GCJ= -@@ -18727,11 +19137,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18730: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19140: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18734: \$? = $ac_status" >&5 -+ echo "$as_me:19144: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -18811,12 +19221,13 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -18875,7 +19286,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_GCJ=no -@@ -18991,12 +19402,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_GCJ=no - else - ld_shlibs_GCJ=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -19094,7 +19506,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -19114,7 +19526,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -19386,11 +19798,10 @@ - link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -19540,7 +19951,7 @@ - link_all_deplibs_GCJ=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -19859,7 +20270,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -20199,6 +20610,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -20380,6 +20803,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -20463,6 +20901,7 @@ - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ -+ compiler_lib_search_dirs_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ -@@ -20711,6 +21150,10 @@ - # shared library. - postdeps=$lt_postdeps_GCJ - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -@@ -20884,7 +21327,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -20944,6 +21387,7 @@ - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ -+ compiler_lib_search_dirs_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ -@@ -21192,6 +21636,10 @@ - # shared library. - postdeps=$lt_postdeps_RC - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_RC -@@ -21380,6 +21828,8 @@ - - - -+DOLT -+ - # Test whenever ld supports -version-script - - # Check whether --with-gnu-ld was given. -@@ -23687,6 +24137,7 @@ - esac - fi - CFLAGS="$CFLAGS -g $WARN" -+CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g" - - # Where's the 'mcs' source tree? - if test -d $srcdir/mcs; then -@@ -24044,7 +24495,7 @@ - and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - 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 -@@ -24054,7 +24505,7 @@ - and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -24243,6 +24694,8 @@ - - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } -+ # Pass it to libgc as well -+ CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs" - - else - echo "$as_me: failed program was:" >&5 -@@ -24812,14 +25265,6 @@ - ;; - - xincluded) -- subdirs="$subdirs libgc" -- -- -- # Pass CPPFLAGS to libgc configure -- # Maybe we should use a separate variable for this to avoid passing useless and -- # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64) -- export CPPFLAGS -- - found_boehm=yes - gc_headers=yes - use_included_gc=yes -@@ -24920,9 +25365,6 @@ - CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG" - fi - --# tell libgc/configure about what we want --ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args" -- - if test x$use_included_gc = xyes; then - INCLUDED_LIBGC_TRUE= - INCLUDED_LIBGC_FALSE='#' -@@ -37464,6 +37906,11 @@ - LIBC="libc.so.12" - INTL="libintl.so.0" - ;; -+ *-*-kfreebsd*-gnu) -+ LIBC="libc.so.0.1" -+ INTL="libc.so.0.1" -+ X11="libX11.so.6" -+ ;; - *-*-*freebsd*) - LIBC="libc.so" - INTL="libintl.so" -@@ -38057,6 +38504,21 @@ - CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS" - fi - -+case "x$gc" in -+ xincluded) -+ # Pass CPPFLAGS to libgc configure -+ # We should use a separate variable for this to avoid passing useless and -+ # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64) -+ # This should be executed late so we pick up the final version of CPPFLAGS -+ # The problem with this approach, is that during a reconfigure, the main -+ # configure scripts gets invoked with these arguments, so we use separate -+ # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS. -+ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\"" -+ subdirs="$subdirs libgc" -+ -+ ;; -+esac -+ - PREVIEW=yes - - # Check whether --with-preview was given. -@@ -39451,6 +39913,8 @@ - ECHO!$ECHO$ac_delim - AR!$AR$ac_delim - RANLIB!$RANLIB$ac_delim -+DSYMUTIL!$DSYMUTIL$ac_delim -+NMEDIT!$NMEDIT$ac_delim - DLLTOOL!$DLLTOOL$ac_delim - AS!$AS$ac_delim - OBJDUMP!$OBJDUMP$ac_delim -@@ -39526,8 +39990,6 @@ - SPARC64_FALSE!$SPARC64_FALSE$ac_delim - X86_TRUE!$X86_TRUE$ac_delim - X86_FALSE!$X86_FALSE$ac_delim --AMD64_TRUE!$AMD64_TRUE$ac_delim --AMD64_FALSE!$AMD64_FALSE$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -39569,6 +40031,8 @@ - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -+AMD64_TRUE!$AMD64_TRUE$ac_delim -+AMD64_FALSE!$AMD64_FALSE$ac_delim - ALPHA_TRUE!$ALPHA_TRUE$ac_delim - ALPHA_FALSE!$ALPHA_FALSE$ac_delim - IA64_TRUE!$IA64_TRUE$ac_delim -@@ -39604,7 +40068,7 @@ - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -40005,21 +40469,22 @@ - fi - rm -f "$tmp/out12" - # Compute $ac_file's index in $config_headers. -+_am_arg=$ac_file - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $ac_file | $ac_file:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || --$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X$ac_file : 'X\(//\)[^/]' \| \ -- X$ac_file : 'X\(//\)$' \| \ -- X$ac_file : 'X\(/\)' \| . 2>/dev/null || --echo X$ac_file | -+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$_am_arg" : 'X\(//\)[^/]' \| \ -+ X"$_am_arg" : 'X\(//\)$' \| \ -+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -40056,7 +40521,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ -diff -urNad mono-1.9.1+dfsg~/data/Makefile.in mono-1.9.1+dfsg/data/Makefile.in ---- mono-1.9.1+dfsg~/data/Makefile.in 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/data/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -105,6 +105,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -140,6 +141,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -409,8 +411,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -435,8 +437,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -446,13 +448,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/data/net_1_1/Makefile.in mono-1.9.1+dfsg/data/net_1_1/Makefile.in ---- mono-1.9.1+dfsg~/data/net_1_1/Makefile.in 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/data/net_1_1/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -88,6 +88,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -123,6 +124,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/data/net_2_0/Makefile.in mono-1.9.1+dfsg/data/net_2_0/Makefile.in ---- mono-1.9.1+dfsg~/data/net_2_0/Makefile.in 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/data/net_2_0/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -88,6 +88,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -123,6 +124,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/docs/Makefile.in mono-1.9.1+dfsg/docs/Makefile.in ---- mono-1.9.1+dfsg~/docs/Makefile.in 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/docs/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -78,6 +78,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -113,6 +114,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/ikvm-native/Makefile.in mono-1.9.1+dfsg/ikvm-native/Makefile.in ---- mono-1.9.1+dfsg~/ikvm-native/Makefile.in 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/ikvm-native/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -58,7 +58,7 @@ - libikvm_native_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libikvm_native_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -109,6 +109,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -144,6 +145,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -282,8 +284,8 @@ - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -@@ -291,8 +293,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: -@@ -347,8 +349,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -360,8 +362,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -371,13 +373,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/libgc/Makefile.in mono-1.9.1+dfsg/libgc/Makefile.in ---- mono-1.9.1+dfsg~/libgc/Makefile.in 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/libgc/Makefile.in 2008-06-17 23:58:23.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -170,6 +170,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -198,6 +199,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MY_CFLAGS = @MY_CFLAGS@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -619,8 +621,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -645,8 +647,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -656,13 +658,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -733,6 +734,10 @@ - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) -@@ -759,6 +764,8 @@ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -@@ -914,8 +921,8 @@ - .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags ctags-recursive \ -- dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \ -- dist-zip distcheck distclean distclean-compile \ -+ dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \ -+ dist-tarZ dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ -diff -urNad mono-1.9.1+dfsg~/libgc/aclocal.m4 mono-1.9.1+dfsg/libgc/aclocal.m4 ---- mono-1.9.1+dfsg~/libgc/aclocal.m4 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/libgc/aclocal.m4 2008-06-17 23:58:21.000000000 +0200 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.10 -*- Autoconf -*- -+# generated automatically by aclocal 1.10.1 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,14 +11,17 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --m4_if(m4_PACKAGE_VERSION, [2.61],, --[m4_fatal([this file was generated for autoconf 2.61. --You have another version of autoconf. If you want to use that, --you should regenerate the build system entirely.], [63])]) -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(AC_AUTOCONF_VERSION, [2.61],, -+[m4_warning([this file was generated for autoconf 2.61. -+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'.])]) - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - --# serial 51 AC_PROG_LIBTOOL -+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -106,7 +109,6 @@ - AC_REQUIRE([AC_OBJEXT])dnl - AC_REQUIRE([AC_EXEEXT])dnl - dnl -- - AC_LIBTOOL_SYS_MAX_CMD_LEN - AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - AC_LIBTOOL_OBJDIR -@@ -208,6 +210,8 @@ - ;; - esac - -+_LT_REQUIRED_DARWIN_CHECKS -+ - AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], - enable_win32_dll=yes, enable_win32_dll=no) -@@ -287,9 +291,80 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - ])# _LT_LINKER_BOILERPLATE - -+# _LT_REQUIRED_DARWIN_CHECKS -+# -------------------------- -+# Check for some things on darwin -+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ -+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -+ [lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi]) -+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], -+ [lt_cv_ld_exported_symbols_list], -+ [lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" -+ ]) -+ case $host_os in -+ rhapsody* | darwin1.[[0123]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+]) - - # _LT_AC_SYS_LIBPATH_AIX - # ---------------------- -@@ -614,7 +689,11 @@ - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) LD="${LD-ld} -64" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; - esac - ;; - esac -@@ -707,7 +786,7 @@ - $2=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - ]) - -@@ -978,7 +1057,7 @@ - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], -@@ -986,7 +1065,7 @@ - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) -@@ -1303,7 +1382,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -1644,6 +1723,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -1824,6 +1915,13 @@ - AC_MSG_RESULT([$dynamic_linker]) - test "$dynamic_linker" = no && can_build_shared=no - -+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -2323,7 +2421,7 @@ - # whether `pass_all' will *always* work, you probably want this one. - - case $host_os in --aix4* | aix5*) -+aix[[4-9]]*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2418,7 +2516,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -2759,7 +2857,7 @@ - fi - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -2816,6 +2914,7 @@ - _LT_AC_TAGVAR(predeps, $1)= - _LT_AC_TAGVAR(postdeps, $1)= - _LT_AC_TAGVAR(compiler_lib_search_path, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= - - # Source file extension for C++ test sources. - ac_ext=cpp -@@ -2925,7 +3024,7 @@ - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- aix4* | aix5*) -+ aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -2938,7 +3037,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -3084,51 +3183,23 @@ - fi - ;; - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- -- if test "$GXX" = yes ; then -- lt_int_apple_cc_single_mod=no -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) -@@ -3379,7 +3450,7 @@ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -3452,7 +3523,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -3814,7 +3885,8 @@ - # compiler output when linking a shared library. - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. --AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl - dnl we can't use the lt_simple_compile_test_code here, - dnl because it contains code intended for an executable, - dnl not a library. It's possible we should let each -@@ -3939,6 +4011,11 @@ - - $rm -f confest.$objext - -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= -+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ - # PORTME: override above test on systems where it is broken - ifelse([$1],[CXX], - [case $host_os in -@@ -3995,7 +4072,6 @@ - ;; - esac - ]) -- - case " $_LT_AC_TAGVAR(postdeps, $1) " in - *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - esac -@@ -4080,7 +4156,7 @@ - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4* | aix5*) -+aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -4257,6 +4333,7 @@ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ -@@ -4319,7 +4396,7 @@ - # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - # - # This file is part of GNU Libtool: -@@ -4556,6 +4633,10 @@ - # shared library. - postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) -@@ -4905,7 +4986,7 @@ - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -4962,7 +5043,8 @@ - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform -@@ -4999,7 +5081,7 @@ - esac - else - case $host_os in -- aix4* | aix5*) -+ aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor -@@ -5095,7 +5177,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -@@ -5133,7 +5215,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -5246,7 +5328,8 @@ - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) -@@ -5316,7 +5399,8 @@ - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) -@@ -5453,7 +5537,7 @@ - # - if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; -@@ -5477,7 +5561,7 @@ - # - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" - AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -@@ -5493,7 +5577,7 @@ - ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- aix4* | aix5*) -+ aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -5508,10 +5592,14 @@ - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - ;; -+ linux* | k*bsd*-gnu) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -5542,12 +5630,14 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) -@@ -5597,7 +5687,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -5713,12 +5803,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -5816,7 +5907,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -5836,7 +5927,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -5996,11 +6087,10 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -6150,7 +6240,7 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -6581,7 +6671,7 @@ - AC_MSG_RESULT([$SED]) - ]) - --# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -6596,7 +6686,7 @@ - [am__api_version='1.10' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.10], [], -+m4_if([$1], [1.10.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -6612,8 +6702,10 @@ - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.10])dnl --_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) -+[AM_AUTOMAKE_VERSION([1.10.1])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) - - # Figure out how to run the assembler. -*- Autoconf -*- - -@@ -6907,7 +6999,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue -@@ -6955,13 +7047,13 @@ - # Do all the work for Automake. -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 12 -+# serial 13 - - # This macro actually does too much. Some checks are only needed if - # your package does certain things. But this isn't really a big deal. -@@ -7066,16 +7158,17 @@ - # our stamp files there. - AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], - [# Compute $1's index in $config_headers. -+_am_arg=$1 - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $1 | $1:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - - # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # -@@ -7376,7 +7469,7 @@ - - # _AM_SUBST_NOTMAKE(VARIABLE) - # --------------------------- --# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. - # This macro is traced by Automake. - AC_DEFUN([_AM_SUBST_NOTMAKE]) - -diff -urNad mono-1.9.1+dfsg~/libgc/configure mono-1.9.1+dfsg/libgc/configure ---- mono-1.9.1+dfsg~/libgc/configure 2008-04-23 21:53:57.000000000 +0200 -+++ mono-1.9.1+dfsg/libgc/configure 2008-06-17 23:58:22.000000000 +0200 -@@ -890,6 +890,8 @@ - EGREP - LN_S - ECHO -+DSYMUTIL -+NMEDIT - CPP - CXXCPP - F77 -@@ -4515,6 +4517,15 @@ - - . ${srcdir}/configure.host - -+# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono -+# configure, because of autoconf brokeness -+if test "x$CPPFLAGS_FOR_LIBGC" != "x"; then -+ CPPFLAGS=$CPPFLAGS_FOR_LIBGC -+fi -+if test "x$CFLAGS_FOR_LIBGC" != "x"; then -+ CFLAGS=$CFLAGS_FOR_LIBGC -+fi -+ - GC_CFLAGS=${gc_cflags} - - -@@ -4626,6 +4637,32 @@ - - THREADDLLIBS="-lpthread -lrt" - ;; -+ *-*-kfreebsd*-gnu) -+ cat >>confdefs.h <<\_ACEOF -+#define GC_FREEBSD_THREADS 1 -+_ACEOF -+ -+ INCLUDES="$INCLUDES -pthread" -+ THREADDLLIBS=-pthread -+ cat >>confdefs.h <<\_ACEOF -+#define _REENTRANT 1 -+_ACEOF -+ -+ if test "${enable_parallel_mark}" = yes; then -+ cat >>confdefs.h <<\_ACEOF -+#define PARALLEL_MARK 1 -+_ACEOF -+ -+ fi -+ cat >>confdefs.h <<\_ACEOF -+#define THREAD_LOCAL_ALLOC 1 -+_ACEOF -+ -+ cat >>confdefs.h <<\_ACEOF -+#define USE_COMPILER_TLS 1 -+_ACEOF -+ -+ ;; - *-*-freebsd4*) - { echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5 - echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;} -@@ -5622,7 +5659,7 @@ - # whether `pass_all' will *always* work, you probably want this one. - - case $host_os in --aix4* | aix5*) -+aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -5717,7 +5754,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -5837,7 +5874,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5840 "configure"' > conftest.$ac_ext -+ echo '#line 5877 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -6009,7 +6046,11 @@ - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) LD="${LD-ld} -64" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; - esac - ;; - esac -@@ -7139,7 +7180,6 @@ - - - # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -- - # find the maximum length of command line arguments - { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 - echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -@@ -7454,7 +7494,7 @@ - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -8014,6 +8054,318 @@ - ;; - esac - -+ -+ case $host_os in -+ rhapsody* | darwin*) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$DSYMUTIL"; then -+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+DSYMUTIL=$ac_cv_prog_DSYMUTIL -+if test -n "$DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+echo "${ECHO_T}$DSYMUTIL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DSYMUTIL"; then -+ ac_ct_DSYMUTIL=$DSYMUTIL -+ # Extract the first word of "dsymutil", so it can be a program name with args. -+set dummy dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_DSYMUTIL"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -+if test -n "$ac_ct_DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_DSYMUTIL" = x; then -+ DSYMUTIL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ DSYMUTIL=$ac_ct_DSYMUTIL -+ fi -+else -+ DSYMUTIL="$ac_cv_prog_DSYMUTIL" -+fi -+ -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$NMEDIT"; then -+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+NMEDIT=$ac_cv_prog_NMEDIT -+if test -n "$NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+echo "${ECHO_T}$NMEDIT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_NMEDIT"; then -+ ac_ct_NMEDIT=$NMEDIT -+ # Extract the first word of "nmedit", so it can be a program name with args. -+set dummy nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_NMEDIT"; then -+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_NMEDIT="nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -+if test -n "$ac_ct_NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_NMEDIT" = x; then -+ NMEDIT=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ NMEDIT=$ac_ct_NMEDIT -+ fi -+else -+ NMEDIT="$ac_cv_prog_NMEDIT" -+fi -+ -+ -+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_apple_cc_single_mod+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } -+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ lt_cv_ld_exported_symbols_list=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ lt_cv_ld_exported_symbols_list=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } -+ case $host_os in -+ rhapsody* | darwin1.[0123]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[012]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+ -+ - enable_dlopen=no - enable_win32_dll=no - -@@ -8079,7 +8431,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - -@@ -8107,11 +8459,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8110: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8462: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8114: \$? = $ac_status" >&5 -+ echo "$as_me:8466: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -8381,10 +8733,10 @@ - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works=no -+ lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" -@@ -8397,27 +8749,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8400: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8752: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8404: \$? = $ac_status" >&5 -+ echo "$as_me:8756: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works=yes -+ lt_cv_prog_compiler_pic_works=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } - --if test x"$lt_prog_compiler_pic_works" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -@@ -8444,10 +8796,10 @@ - wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works=no -+ lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -8460,20 +8812,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works=yes -+ lt_cv_prog_compiler_static_works=yes - fi - else -- lt_prog_compiler_static_works=yes -+ lt_cv_prog_compiler_static_works=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } - --if test x"$lt_prog_compiler_static_works" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : - else - lt_prog_compiler_static= -@@ -8501,11 +8853,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8504: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8856: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8508: \$? = $ac_status" >&5 -+ echo "$as_me:8860: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -8585,12 +8937,13 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -8649,7 +9002,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no -@@ -8765,12 +9118,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -8868,7 +9222,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -8888,7 +9242,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -9160,11 +9514,10 @@ - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -9314,7 +9667,7 @@ - link_all_deplibs=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -9684,7 +10037,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -10025,6 +10378,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -10206,6 +10571,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -10525,7 +10905,7 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 - echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } - if test $ac_cv_lib_dld_shl_load = yes; then -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" - else - { echo "$as_me:$LINENO: checking for dlopen" >&5 - echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -@@ -10801,7 +11181,7 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 - echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } - if test $ac_cv_lib_dld_dld_link = yes; then -- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" - fi - - -@@ -10850,7 +11230,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -11921,7 +12307,7 @@ - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -11934,7 +12320,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -12192,51 +12578,23 @@ - fi - ;; - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes -- -- if test "$GXX" = yes ; then -- lt_int_apple_cc_single_mod=no -+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) -@@ -12487,7 +12845,7 @@ - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -12560,7 +12918,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -12894,7 +13252,6 @@ - GCC_CXX="$GXX" - LD_CXX="$LD" - -- - cat > conftest.$ac_ext <&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_CXX=no -+ lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" -@@ -13370,27 +13731,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13373: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13734: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:13377: \$? = $ac_status" >&5 -+ echo "$as_me:13738: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_CXX=yes -+ lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } - --if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -@@ -13417,10 +13778,10 @@ - wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_CXX+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_CXX=no -+ lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -13433,20 +13794,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_CXX=yes -+ lt_cv_prog_compiler_static_works_CXX=yes - fi - else -- lt_prog_compiler_static_works_CXX=yes -+ lt_cv_prog_compiler_static_works_CXX=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } - --if test x"$lt_prog_compiler_static_works_CXX" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : - else - lt_prog_compiler_static_CXX= -@@ -13474,11 +13835,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13477: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13838: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:13481: \$? = $ac_status" >&5 -+ echo "$as_me:13842: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -13531,7 +13892,7 @@ - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- aix4* | aix5*) -+ aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -13546,10 +13907,14 @@ - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; -+ linux* | k*bsd*-gnu) -+ link_all_deplibs_CXX=no -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 - echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -@@ -13651,7 +14016,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -13991,6 +14356,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -14172,6 +14549,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -14255,6 +14647,7 @@ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ -+ compiler_lib_search_dirs_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ -@@ -14503,6 +14896,10 @@ - # shared library. - postdeps=$lt_postdeps_CXX - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -@@ -14717,7 +15114,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -14755,7 +15152,7 @@ - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4* | aix5*) -+aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -15020,10 +15417,10 @@ - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_F77=no -+ lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" -@@ -15036,27 +15433,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15039: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15436: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15043: \$? = $ac_status" >&5 -+ echo "$as_me:15440: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_F77=yes -+ lt_cv_prog_compiler_pic_works_F77=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } - --if test x"$lt_prog_compiler_pic_works_F77" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -@@ -15083,10 +15480,10 @@ - wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_F77=no -+ lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -15099,20 +15496,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_F77=yes -+ lt_cv_prog_compiler_static_works_F77=yes - fi - else -- lt_prog_compiler_static_works_F77=yes -+ lt_cv_prog_compiler_static_works_F77=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } - --if test x"$lt_prog_compiler_static_works_F77" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : - else - lt_prog_compiler_static_F77= -@@ -15140,11 +15537,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15143: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15540: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15147: \$? = $ac_status" >&5 -+ echo "$as_me:15544: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -15224,12 +15621,13 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -15288,7 +15686,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no -@@ -15404,12 +15802,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -15507,7 +15906,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -15527,7 +15926,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -15779,11 +16178,10 @@ - link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -15933,7 +16331,7 @@ - link_all_deplibs_F77=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -16252,7 +16650,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -16592,6 +16990,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -16773,6 +17183,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -16856,6 +17281,7 @@ - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ -+ compiler_lib_search_dirs_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ -@@ -17104,6 +17530,10 @@ - # shared library. - postdeps=$lt_postdeps_F77 - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_F77 -@@ -17278,7 +17708,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -17327,11 +17757,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17330: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17760: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:17334: \$? = $ac_status" >&5 -+ echo "$as_me:17764: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -17391,7 +17821,7 @@ - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries -- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ - ;; - - darwin* | rhapsody*) -@@ -17461,7 +17891,7 @@ - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ - ;; - - hpux9* | hpux10* | hpux11*) -@@ -17601,10 +18031,10 @@ - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_GCJ=no -+ lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" -@@ -17617,27 +18047,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17620: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18050: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:17624: \$? = $ac_status" >&5 -+ echo "$as_me:18054: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_GCJ=yes -+ lt_cv_prog_compiler_pic_works_GCJ=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } - --if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in - "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -@@ -17664,10 +18094,10 @@ - wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_GCJ=no -+ lt_cv_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -17680,20 +18110,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_GCJ=yes -+ lt_cv_prog_compiler_static_works_GCJ=yes - fi - else -- lt_prog_compiler_static_works_GCJ=yes -+ lt_cv_prog_compiler_static_works_GCJ=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } - --if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then - : - else - lt_prog_compiler_static_GCJ= -@@ -17721,11 +18151,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17724: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18154: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:17728: \$? = $ac_status" >&5 -+ echo "$as_me:18158: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -17805,12 +18235,13 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -17869,7 +18300,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_GCJ=no -@@ -17985,12 +18416,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_GCJ=no - else - ld_shlibs_GCJ=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -18088,7 +18520,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -18108,7 +18540,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -18380,11 +18812,10 @@ - link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -18534,7 +18965,7 @@ - link_all_deplibs_GCJ=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -18853,7 +19284,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -19193,6 +19624,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -19374,6 +19817,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -19457,6 +19915,7 @@ - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ -+ compiler_lib_search_dirs_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ -@@ -19705,6 +20164,10 @@ - # shared library. - postdeps=$lt_postdeps_GCJ - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -@@ -19878,7 +20341,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -19938,6 +20401,7 @@ - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ -+ compiler_lib_search_dirs_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ -@@ -20186,6 +20650,10 @@ - # shared library. - postdeps=$lt_postdeps_RC - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_RC -@@ -21694,6 +22162,8 @@ - EGREP!$EGREP$ac_delim - LN_S!$LN_S$ac_delim - ECHO!$ECHO$ac_delim -+DSYMUTIL!$DSYMUTIL$ac_delim -+NMEDIT!$NMEDIT$ac_delim - CPP!$CPP$ac_delim - CXXCPP!$CXXCPP$ac_delim - F77!$F77$ac_delim -@@ -21708,7 +22178,7 @@ - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -22030,7 +22500,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ -diff -urNad mono-1.9.1+dfsg~/libgc/doc/Makefile.in mono-1.9.1+dfsg/libgc/doc/Makefile.in ---- mono-1.9.1+dfsg~/libgc/doc/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/libgc/doc/Makefile.in 2008-06-17 23:58:23.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -90,6 +90,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -118,6 +119,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MY_CFLAGS = @MY_CFLAGS@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -diff -urNad mono-1.9.1+dfsg~/libgc/include/Makefile.in mono-1.9.1+dfsg/libgc/include/Makefile.in ---- mono-1.9.1+dfsg~/libgc/include/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/libgc/include/Makefile.in 2008-06-17 23:58:23.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -81,6 +81,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -109,6 +110,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MY_CFLAGS = @MY_CFLAGS@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -298,8 +300,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -324,8 +326,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -335,13 +337,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/libgc/include/private/Makefile.in mono-1.9.1+dfsg/libgc/include/private/Makefile.in ---- mono-1.9.1+dfsg~/libgc/include/private/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/libgc/include/private/Makefile.in 2008-06-17 23:58:23.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -66,6 +66,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -94,6 +95,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MY_CFLAGS = @MY_CFLAGS@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -diff -urNad mono-1.9.1+dfsg~/man/Makefile.in mono-1.9.1+dfsg/man/Makefile.in ---- mono-1.9.1+dfsg~/man/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/man/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -83,6 +83,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -118,6 +119,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/Makefile.in mono-1.9.1+dfsg/mono/Makefile.in ---- mono-1.9.1+dfsg~/mono/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -90,6 +90,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -125,6 +126,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -336,8 +338,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -362,8 +364,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -373,13 +375,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/Makefile.in mono-1.9.1+dfsg/mono/arch/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -48,7 +48,7 @@ - @INTERP_SUPPORTED_TRUE@am_libmonoarch_la_OBJECTS = unknown.lo - libmonoarch_la_OBJECTS = $(am_libmonoarch_la_OBJECTS) - @INTERP_SUPPORTED_TRUE@am_libmonoarch_la_rpath = --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -108,6 +108,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -143,6 +144,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -401,8 +403,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -427,8 +429,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -438,13 +440,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/alpha/Makefile.in mono-1.9.1+dfsg/mono/arch/alpha/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/alpha/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/alpha/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -52,7 +52,7 @@ - test_SOURCES = test.c - test_OBJECTS = test.$(OBJEXT) - test_LDADD = $(LDADD) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -103,6 +103,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -138,6 +139,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -331,8 +333,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -344,8 +346,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -355,13 +357,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/amd64/Makefile.in mono-1.9.1+dfsg/mono/arch/amd64/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/amd64/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/amd64/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -46,7 +46,7 @@ - libmonoarch_amd64_la_LIBADD = - am_libmonoarch_amd64_la_OBJECTS = tramp.lo - libmonoarch_amd64_la_OBJECTS = $(am_libmonoarch_amd64_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -97,6 +97,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -132,6 +133,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -314,8 +316,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -327,8 +329,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -338,13 +340,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/arm/Makefile.in mono-1.9.1+dfsg/mono/arch/arm/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/arm/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/arm/Makefile.in 2008-06-17 23:58:25.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -48,7 +48,7 @@ - am_libmonoarch_arm_la_OBJECTS = $(am__objects_1) tramp.lo \ - arm-codegen.lo arm-dis.lo - libmonoarch_arm_la_OBJECTS = $(am_libmonoarch_arm_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -99,6 +99,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -134,6 +135,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -331,8 +333,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -344,8 +346,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -355,13 +357,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/hppa/Makefile.in mono-1.9.1+dfsg/mono/arch/hppa/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/hppa/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/hppa/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -46,7 +46,7 @@ - libmonoarch_hppa_la_LIBADD = - am_libmonoarch_hppa_la_OBJECTS = tramp.lo - libmonoarch_hppa_la_OBJECTS = $(am_libmonoarch_hppa_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -97,6 +97,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -132,6 +133,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -314,8 +316,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -327,8 +329,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -338,13 +340,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/ia64/Makefile.in mono-1.9.1+dfsg/mono/arch/ia64/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/ia64/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/ia64/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -78,6 +78,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -113,6 +114,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/arch/mips/Makefile.in mono-1.9.1+dfsg/mono/arch/mips/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/mips/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/mips/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -52,7 +52,7 @@ - test_SOURCES = test.c - test_OBJECTS = test.$(OBJEXT) - test_LDADD = $(LDADD) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -103,6 +103,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -138,6 +139,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -330,8 +332,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -343,8 +345,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -354,13 +356,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/ppc/Makefile.in mono-1.9.1+dfsg/mono/arch/ppc/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/ppc/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/ppc/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -54,7 +54,7 @@ - test_SOURCES = test.c - test_OBJECTS = test.$(OBJEXT) - test_LDADD = $(LDADD) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -105,6 +105,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -140,6 +141,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -333,8 +335,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -346,8 +348,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -357,13 +359,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/s390/Makefile.in mono-1.9.1+dfsg/mono/arch/s390/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/s390/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/s390/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -46,7 +46,7 @@ - libmonoarch_s390_la_LIBADD = - am_libmonoarch_s390_la_OBJECTS = tramp.lo - libmonoarch_s390_la_OBJECTS = $(am_libmonoarch_s390_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -97,6 +97,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -132,6 +133,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -314,8 +316,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -327,8 +329,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -338,13 +340,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/s390x/Makefile.in mono-1.9.1+dfsg/mono/arch/s390x/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/s390x/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/s390x/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -46,7 +46,7 @@ - libmonoarch_s390x_la_LIBADD = - am_libmonoarch_s390x_la_OBJECTS = tramp.lo - libmonoarch_s390x_la_OBJECTS = $(am_libmonoarch_s390x_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -97,6 +97,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -132,6 +133,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -314,8 +316,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -327,8 +329,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -338,13 +340,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/sparc/Makefile.in mono-1.9.1+dfsg/mono/arch/sparc/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/sparc/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/sparc/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -46,7 +46,7 @@ - libmonoarch_sparc_la_LIBADD = - am_libmonoarch_sparc_la_OBJECTS = tramp.lo - libmonoarch_sparc_la_OBJECTS = $(am_libmonoarch_sparc_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -97,6 +97,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -132,6 +133,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -314,8 +316,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -327,8 +329,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -338,13 +340,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/arch/x86/Makefile.in mono-1.9.1+dfsg/mono/arch/x86/Makefile.in ---- mono-1.9.1+dfsg~/mono/arch/x86/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/arch/x86/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -48,7 +48,7 @@ - @INTERP_SUPPORTED_TRUE@am_libmonoarch_x86_la_OBJECTS = tramp.lo - libmonoarch_x86_la_OBJECTS = $(am_libmonoarch_x86_la_OBJECTS) - @INTERP_SUPPORTED_TRUE@am_libmonoarch_x86_la_rpath = --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -99,6 +99,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -134,6 +135,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -316,8 +318,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -329,8 +331,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -340,13 +342,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/benchmark/Makefile.in mono-1.9.1+dfsg/mono/benchmark/Makefile.in ---- mono-1.9.1+dfsg~/mono/benchmark/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/benchmark/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -78,6 +78,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -113,6 +114,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/cil/Makefile.in mono-1.9.1+dfsg/mono/cil/Makefile.in ---- mono-1.9.1+dfsg~/mono/cil/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/cil/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -90,6 +90,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -125,6 +126,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/dis/Makefile.in mono-1.9.1+dfsg/mono/dis/Makefile.in ---- mono-1.9.1+dfsg~/mono/dis/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/dis/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -60,7 +60,7 @@ - am__DEPENDENCIES_1 = - monodis_DEPENDENCIES = libmonodis.a $(runtime_lib) \ - $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -114,6 +114,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -149,6 +150,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -319,8 +321,8 @@ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -432,8 +434,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -445,8 +447,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -456,13 +458,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/interpreter/Makefile.in mono-1.9.1+dfsg/mono/interpreter/Makefile.in ---- mono-1.9.1+dfsg~/mono/interpreter/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/interpreter/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -71,7 +71,7 @@ - am_mint_OBJECTS = main.$(OBJEXT) - mint_OBJECTS = $(am_mint_OBJECTS) - mint_DEPENDENCIES = libmint.la --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -127,6 +127,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -162,6 +163,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -339,8 +341,8 @@ - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -@@ -348,8 +350,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: -@@ -371,8 +373,8 @@ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -499,8 +501,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -512,8 +514,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -523,13 +525,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/io-layer/Makefile.in mono-1.9.1+dfsg/mono/io-layer/Makefile.in ---- mono-1.9.1+dfsg~/mono/io-layer/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/io-layer/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -76,7 +76,7 @@ - @HPPA_TRUE@@PLATFORM_WIN32_FALSE@ $(am__objects_2) - @PLATFORM_WIN32_TRUE@am_libwapi_la_OBJECTS = $(am__objects_3) - libwapi_la_OBJECTS = $(am_libwapi_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -147,6 +147,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -182,6 +183,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -557,8 +559,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -570,8 +572,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -581,13 +583,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/metadata/Makefile.in mono-1.9.1+dfsg/mono/metadata/Makefile.in ---- mono-1.9.1+dfsg~/mono/metadata/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/metadata/Makefile.in 2008-06-17 23:58:26.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -88,7 +88,7 @@ - pedump_DEPENDENCIES = libmonoruntime.la ../io-layer/libwapi.la \ - ../utils/libmonoutils.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -149,6 +149,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -184,6 +185,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -480,8 +482,8 @@ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -606,8 +608,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -619,8 +621,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -630,13 +632,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/mini/Makefile.in mono-1.9.1+dfsg/mono/mini/Makefile.in ---- mono-1.9.1+dfsg~/mono/mini/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/mini/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -203,7 +203,7 @@ - monow_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(monow_LDFLAGS) \ - $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -264,6 +264,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -299,6 +300,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -743,8 +745,8 @@ - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -@@ -752,8 +754,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: -@@ -786,8 +788,8 @@ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -979,8 +981,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -992,8 +994,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -1003,13 +1005,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/monoburg/Makefile.in mono-1.9.1+dfsg/mono/monoburg/Makefile.in ---- mono-1.9.1+dfsg~/mono/monoburg/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/monoburg/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -83,6 +83,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -118,6 +119,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/monograph/Makefile.in mono-1.9.1+dfsg/mono/monograph/Makefile.in ---- mono-1.9.1+dfsg~/mono/monograph/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/monograph/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -50,7 +50,7 @@ - monograph_OBJECTS = monograph.$(OBJEXT) - am__DEPENDENCIES_1 = - monograph_DEPENDENCIES = $(runtime_lib) $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -101,6 +101,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -136,6 +137,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -286,8 +288,8 @@ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -349,8 +351,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -362,8 +364,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -373,13 +375,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/os/Makefile.in mono-1.9.1+dfsg/mono/os/Makefile.in ---- mono-1.9.1+dfsg~/mono/os/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/os/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -78,6 +78,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -113,6 +114,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/profiler/Makefile.in mono-1.9.1+dfsg/mono/profiler/Makefile.in ---- mono-1.9.1+dfsg~/mono/profiler/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/profiler/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -65,7 +65,7 @@ - $(am_libmono_profiler_cov_la_OBJECTS) - @JIT_SUPPORTED_TRUE@am_libmono_profiler_cov_la_rpath = -rpath \ - @JIT_SUPPORTED_TRUE@ $(libdir) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -118,6 +118,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -153,6 +154,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -301,8 +303,8 @@ - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -@@ -310,8 +312,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: -@@ -368,8 +370,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -381,8 +383,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -392,13 +394,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/tests/Makefile.in mono-1.9.1+dfsg/mono/tests/Makefile.in ---- mono-1.9.1+dfsg~/mono/tests/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/tests/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -52,7 +52,7 @@ - libtest_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtest_la_CFLAGS) \ - $(CFLAGS) $(libtest_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -113,6 +113,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -148,6 +149,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -774,8 +776,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -800,8 +802,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -811,13 +813,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/tests/assemblyresolve/Makefile.in mono-1.9.1+dfsg/mono/tests/assemblyresolve/Makefile.in ---- mono-1.9.1+dfsg~/mono/tests/assemblyresolve/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/tests/assemblyresolve/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -78,6 +78,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -113,6 +114,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/Makefile.in ---- mono-1.9.1+dfsg~/mono/tests/cas/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/tests/cas/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -90,6 +90,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -125,6 +126,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -340,8 +342,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -366,8 +368,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -377,13 +379,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/assembly/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/assembly/Makefile.in ---- mono-1.9.1+dfsg~/mono/tests/cas/assembly/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/tests/cas/assembly/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -79,6 +79,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -114,6 +115,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/demand/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/demand/Makefile.in ---- mono-1.9.1+dfsg~/mono/tests/cas/demand/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/tests/cas/demand/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -79,6 +79,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -114,6 +115,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/inheritance/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/inheritance/Makefile.in ---- mono-1.9.1+dfsg~/mono/tests/cas/inheritance/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/tests/cas/inheritance/Makefile.in 2008-06-17 23:58:27.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -79,6 +79,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -114,6 +115,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/linkdemand/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/linkdemand/Makefile.in ---- mono-1.9.1+dfsg~/mono/tests/cas/linkdemand/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/tests/cas/linkdemand/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -79,6 +79,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -114,6 +115,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/threads/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/threads/Makefile.in ---- mono-1.9.1+dfsg~/mono/tests/cas/threads/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/tests/cas/threads/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -79,6 +79,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -114,6 +115,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/mono/utils/Makefile.in mono-1.9.1+dfsg/mono/utils/Makefile.in ---- mono-1.9.1+dfsg~/mono/utils/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/mono/utils/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -61,7 +61,7 @@ - mono-math.lo mono-mmap.lo strtod.lo strenc.lo mono-uri.lo \ - mono-poll.lo mono-path.lo mono-stdlib.lo - libmonoutils_la_OBJECTS = $(am_libmonoutils_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -121,6 +121,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -156,6 +157,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -417,8 +419,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -430,8 +432,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -441,13 +443,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/msvc/Makefile.in mono-1.9.1+dfsg/msvc/Makefile.in ---- mono-1.9.1+dfsg~/msvc/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/msvc/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -79,6 +79,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -114,6 +115,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/runtime/Makefile.in mono-1.9.1+dfsg/runtime/Makefile.in ---- mono-1.9.1+dfsg~/runtime/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/runtime/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -82,6 +82,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -117,6 +118,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/samples/Makefile.in mono-1.9.1+dfsg/samples/Makefile.in ---- mono-1.9.1+dfsg~/samples/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/samples/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -78,6 +78,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -113,6 +114,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/scripts/Makefile.in mono-1.9.1+dfsg/scripts/Makefile.in ---- mono-1.9.1+dfsg~/scripts/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/scripts/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -94,6 +94,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -129,6 +130,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/support/Makefile.in mono-1.9.1+dfsg/support/Makefile.in ---- mono-1.9.1+dfsg~/support/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/support/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -90,7 +90,7 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libMonoSupportW_la_LDFLAGS) $(LDFLAGS) -o $@ - @PLATFORM_WIN32_FALSE@am_libMonoSupportW_la_rpath = -rpath $(libdir) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -143,6 +143,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -178,6 +179,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -414,8 +416,8 @@ - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -@@ -423,8 +425,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: -@@ -521,8 +523,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -534,8 +536,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -545,13 +547,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/tools/Makefile.in mono-1.9.1+dfsg/tools/Makefile.in ---- mono-1.9.1+dfsg~/tools/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/tools/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -90,6 +90,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -125,6 +126,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -@@ -334,8 +336,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -360,8 +362,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -371,13 +373,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -urNad mono-1.9.1+dfsg~/tools/locale-builder/Makefile.in mono-1.9.1+dfsg/tools/locale-builder/Makefile.in ---- mono-1.9.1+dfsg~/tools/locale-builder/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/tools/locale-builder/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -78,6 +78,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -113,6 +114,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ -diff -urNad mono-1.9.1+dfsg~/web/Makefile.in mono-1.9.1+dfsg/web/Makefile.in ---- mono-1.9.1+dfsg~/web/Makefile.in 2008-04-23 21:53:58.000000000 +0200 -+++ mono-1.9.1+dfsg/web/Makefile.in 2008-06-17 23:58:28.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -79,6 +79,7 @@ - DEPDIR = @DEPDIR@ - DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@ - DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -114,6 +115,7 @@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPROFILE_CFLAGS = @OPROFILE_CFLAGS@ Index: patches/method-signature-testing.dpatch =================================================================== --- patches/method-signature-testing.dpatch (revision 3728) +++ patches/method-signature-testing.dpatch (working copy) @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run - -@DPATCH@ - - -Index: mono/mcs/mcs/class.cs -=================================================================== ---- mono/mcs/mcs/class.cs (Revision 94888) -+++ mono/mcs/mcs/class.cs (Revision 94889) -@@ -8312,14 +8312,15 @@ - ReturnType = pi.PropertyType; - else - return false; -- -+ - // - // we use sig.RetType == null to mean `do not check the - // method return value. - // -- if (sig.RetType != null) -- if (ReturnType != sig.RetType) -+ if (sig.RetType != null) { -+ if (!TypeManager.IsEqual (ReturnType, sig.RetType)) - return false; -+ } - - Type [] args; - if (mi != null) - Index: patches/dont_remap_non-runtime_libs.dpatch =================================================================== --- patches/dont_remap_non-runtime_libs.dpatch (revision 3728) +++ patches/dont_remap_non-runtime_libs.dpatch (working copy) @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## dont_remap_non-runtime_libs.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.2.4~/mono/metadata/assembly.c mono-1.2.4/mono/metadata/assembly.c ---- mono-1.2.4~/mono/metadata/assembly.c 2007-04-25 20:48:41.000000000 +0200 -+++ mono-1.2.4/mono/metadata/assembly.c 2007-05-19 15:34:14.000000000 +0200 -@@ -69,21 +69,6 @@ - {"I18N.West", 0}, - {"Microsoft.VisualBasic", 1}, - {"Microsoft.VisualC", 1}, -- {"Mono.Cairo", 0}, -- {"Mono.CompilerServices.SymbolWriter", 0}, -- {"Mono.Data", 0}, -- {"Mono.Data.SqliteClient", 0}, -- {"Mono.Data.SybaseClient", 0}, -- {"Mono.Data.Tds", 0}, -- {"Mono.Data.TdsClient", 0}, -- {"Mono.GetOptions", 0}, -- {"Mono.Http", 0}, -- {"Mono.Posix", 0}, -- {"Mono.Security", 0}, -- {"Mono.Security.Win32", 0}, -- {"Mono.Xml.Ext", 0}, -- {"Novell.Directory.Ldap", 0}, -- {"Npgsql", 0}, - {"PEAPI", 0}, - {"System", 0}, - {"System.Configuration.Install", 0}, Index: patches/fix-mono-nunit.pc.in.dpatch =================================================================== --- patches/fix-mono-nunit.pc.in.dpatch (revision 3728) +++ patches/fix-mono-nunit.pc.in.dpatch (working copy) @@ -1,16 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix-mono-nunit.pc.in.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.9.1+dfsg~/scripts/mono-nunit.pc.in mono-1.9.1+dfsg/scripts/mono-nunit.pc.in ---- mono-1.9.1+dfsg~/scripts/mono-nunit.pc.in 2007-11-08 23:07:03.000000000 +0100 -+++ mono-1.9.1+dfsg/scripts/mono-nunit.pc.in 2008-08-05 22:31:51.000000000 +0200 -@@ -1,4 +1,4 @@ --prefix=${pcfiledir}/../.. -+prefix=@prefix@ - exec_prefix=${prefix} - libdir=${exec_prefix}/lib - Index: patches/fix-mono-cairo.pc.in.dpatch =================================================================== --- patches/fix-mono-cairo.pc.in.dpatch (revision 3728) +++ patches/fix-mono-cairo.pc.in.dpatch (working copy) @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix-mono-cairo.pc.in.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.2.6~/data/mono-cairo.pc.in mono-1.2.6/data/mono-cairo.pc.in ---- mono-1.2.6~/data/mono-cairo.pc.in 2007-11-08 23:07:46.000000000 +0100 -+++ mono-1.2.6/data/mono-cairo.pc.in 2007-12-16 15:51:57.000000000 +0100 -@@ -1,5 +1,5 @@ --prefix=${pcfiledir}/../.. --exec_prefix=${pcfiledir}/../.. -+prefix=@prefix@ -+exec_prefix=${prefix} - libdir=${prefix}/@reloc_libdir@ - includedir=${prefix}/include - Index: patches/fix_BigInteger_overflow_CVE-2007-5197.dpatch =================================================================== --- patches/fix_BigInteger_overflow_CVE-2007-5197.dpatch (revision 3728) +++ patches/fix_BigInteger_overflow_CVE-2007-5197.dpatch (working copy) @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_BigInteger_overflow_CVE-2007-5197.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.2.2.1~/mcs/class/Mono.Security/Mono.Math/BigInteger.cs mono-1.2.2.1/mcs/class/Mono.Security/Mono.Math/BigInteger.cs ---- mono-1.2.2.1~/mcs/class/Mono.Security/Mono.Math/BigInteger.cs 2006-04-14 19:51:24.000000000 +0200 -+++ mono-1.2.2.1/mcs/class/Mono.Security/Mono.Math/BigInteger.cs 2007-10-28 22:42:47.000000000 +0100 -@@ -1574,7 +1574,7 @@ - uint j = 1; - - // Multiply and add -- for (; j < m.length; j++) { -+ for (; j < m.length && j < A.length; j++) { - c += (ulong)u_i * (ulong)*(mP++) + *(aSP++); - *(aDP++) = (uint)c; - c >>= 32; -diff -urNad mono-1.2.2.1~/mcs/class/corlib/Mono.Math/BigInteger.cs mono-1.2.2.1/mcs/class/corlib/Mono.Math/BigInteger.cs ---- mono-1.2.2.1~/mcs/class/corlib/Mono.Math/BigInteger.cs 2006-04-14 19:50:35.000000000 +0200 -+++ mono-1.2.2.1/mcs/class/corlib/Mono.Math/BigInteger.cs 2007-10-28 22:42:15.000000000 +0100 -@@ -1574,7 +1574,7 @@ - uint j = 1; - - // Multiply and add -- for (; j < m.length; j++) { -+ for (; j < m.length && j < A.length; j++) { - c += (ulong)u_i * (ulong)*(mP++) + *(aSP++); - *(aDP++) = (uint)c; - c >>= 32; Index: patches/ppc_disable_delegate_trampoline_optimization.dpatch =================================================================== --- patches/ppc_disable_delegate_trampoline_optimization.dpatch (revision 3728) +++ patches/ppc_disable_delegate_trampoline_optimization.dpatch (working copy) @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## ppc_disable_delegate_trampoline_optimization.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.2.6~/mono/mini/mini-ppc.h mono-1.2.6/mono/mini/mini-ppc.h ---- mono-1.2.6~/mono/mini/mini-ppc.h 2007-11-08 23:07:34.000000000 +0100 -+++ mono-1.2.6/mono/mini/mini-ppc.h 2007-12-26 23:22:59.000000000 +0100 -@@ -109,7 +109,7 @@ - - #define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE - #define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN --#define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE -+/* #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE */ - #define MONO_ARCH_HAVE_IMT 1 - #define MONO_ARCH_IMT_REG ppc_r12 - #define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1 -diff -urNad mono-1.2.6~/mono/mini/tramp-ppc.c mono-1.2.6/mono/mini/tramp-ppc.c ---- mono-1.2.6~/mono/mini/tramp-ppc.c 2007-11-08 23:07:34.000000000 +0100 -+++ mono-1.2.6/mono/mini/tramp-ppc.c 2007-12-26 23:24:31.000000000 +0100 -@@ -261,8 +261,10 @@ - tramp_handler = mono_aot_trampoline; - else if (tramp_type == MONO_TRAMPOLINE_AOT_PLT) - tramp_handler = mono_aot_plt_trampoline; -+#if defined(MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE) - else if (tramp_type == MONO_TRAMPOLINE_DELEGATE) - tramp_handler = mono_delegate_trampoline; -+#endif - else - tramp_handler = mono_magic_trampoline; - ppc_lis (buf, ppc_r0, (guint32) tramp_handler >> 16); Index: patches/fix_TdsConnectionPool_svn.dpatch =================================================================== --- patches/fix_TdsConnectionPool_svn.dpatch (revision 3728) +++ patches/fix_TdsConnectionPool_svn.dpatch (working copy) @@ -1,397 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_TdsConnectionPool_r105424_r106448_107325.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Backport of upstream SVN trunk to fix connection pool leaks/stalls, see: -## DP: https://bugzilla.novell.com/show_bug.cgi?id=360157 -## DP: r105424: -## DP: Remove unnecessary locks and code refactoring -## DP: r105432: -## DP: Update according to the new return type of TdsConnectionPool.GetConnectionPool() -## DP: r105433: -## DP: Member to keep track of pool status -## DP: r105719: -## DP: Do not call tds.Reset () as it is already done in the connection pool. -## DP: r106448: -## DP: Honor timeout and throw appropriate exception when connections are not available -## DP: r107325: -## DP: TdsConnectionPool.cs: When pooled connection cannot be reset, remove -## DP: it from pool and allow slot to be re-used for a newly established -## DP: connection. Fixes part of bug #360157. When pool is full, and no -## DP: connection becomes available before the connect timeout has elapsed, -## DP: then throw an InvalidOperationException instead of a SqlException. - -@DPATCH@ -diff -urNad mono-1.9+dfsg~/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs mono-1.9+dfsg/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs ---- mono-1.9+dfsg~/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs 2008-01-29 23:04:15.000000000 +0100 -+++ mono-1.9+dfsg/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs 2008-07-08 21:15:49.000000000 +0200 -@@ -102,6 +102,8 @@ - bool isResultRead = false; - bool LoadInProgress = false; - -+ internal int poolStatus = 0; -+ - #endregion // Fields - - #region Properties -diff -urNad mono-1.9+dfsg~/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs mono-1.9+dfsg/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs ---- mono-1.9+dfsg~/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs 2007-11-08 23:11:23.000000000 +0100 -+++ mono-1.9+dfsg/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs 2008-07-08 21:15:49.000000000 +0200 -@@ -3,6 +3,7 @@ - // - // Author: - // Lluis Sanchez Gual (lluis@ximian.com) -+// Christian Hergert (christian.hergert at gmail.com) - // - // Copyright (C) 2004 Novell, Inc. - // -@@ -28,16 +29,23 @@ - // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - // - --using Mono.Data.Tds.Protocol; - using System; -+#if NET_2_0 -+using System.Collections.Generic; -+#else - using System.Collections; -+#endif - using System.Threading; - - namespace Mono.Data.Tds.Protocol - { - public class TdsConnectionPoolManager - { -+#if NET_2_0 -+ Dictionary pools = new Dictionary (); -+#else - Hashtable pools = new Hashtable (); -+#endif - TdsVersion version; - - public TdsConnectionPoolManager (TdsVersion version) -@@ -49,7 +57,12 @@ - { - lock (pools) - { -- TdsConnectionPool pool = (TdsConnectionPool) pools [connectionString]; -+ TdsConnectionPool pool = null; -+#if NET_2_0 -+ pools.TryGetValue (connectionString, out pool); -+#else -+ pool = (TdsConnectionPool) pools [connectionString]; -+#endif - if (pool == null) { - pool = new TdsConnectionPool (this, info); - pools [connectionString] = pool; -@@ -58,12 +71,13 @@ - } - } - -- public Hashtable GetConnectionPool () -+#if NET_2_0 -+ public IDictionary GetConnectionPool () -+#else -+ public IDictionary GetConnectionPool () -+#endif - { -- lock (pools) -- { -- return pools; -- } -+ return pools; - } - - public virtual ITds CreateConnection (TdsConnectionInfo info) -@@ -102,20 +116,34 @@ - public int PoolMinSize; - public int PoolMaxSize; - } -- -+ - public class TdsConnectionPool - { -- ArrayList list = new ArrayList (); -+ ITds[] list; - TdsConnectionInfo info; -- bool initialized; - bool pooling = true; -- int activeConnections = 0; - TdsConnectionPoolManager manager; -- -+ ManualResetEvent connAvailable; -+ - public TdsConnectionPool (TdsConnectionPoolManager manager, TdsConnectionInfo info) - { -+ int n = 0; -+ - this.info = info; - this.manager = manager; -+ list = new ITds[info.PoolMaxSize]; -+ -+ // Placeholder for future connections are at the beginning of the array. -+ for (; n < info.PoolMaxSize - info.PoolMinSize; n++) -+ list [n] = null; -+ -+ // Pre-populate with minimum number of connections -+ for (; n < list.Length; n++) { -+ list [n] = CreateConnection (); -+ } -+ -+ // Event that notifies a connection is available in the pool -+ connAvailable = new ManualResetEvent (false); - } - - public bool Pooling { -@@ -128,110 +156,118 @@ - public ITds GetConnection () - { - ITds connection = null; -- lock (list) -- { -- if (!initialized) -- { -- for (int n = 0; n < info.PoolMinSize; n++) -- list.Add (CreateConnection ()); -- initialized = true; -- } -- do { -- if (list.Count > 0) -- { -- // There are available connections -- connection = (ITds) list [list.Count - 1]; -- list.RemoveAt (list.Count - 1); -+ int index; -+ -+ retry: -+ // Reset the connection available event -+ connAvailable.Reset (); -+ -+ index = list.Length - 1; -+ -+ do { -+ connection = list [index]; -+ -+ if (connection == null) { -+ // Attempt take-over of array position -+ connection = CreateConnection (); -+ (connection as Tds).poolStatus = 1; -+#if NET_2_0 -+ if (Interlocked.CompareExchange (ref list [index], connection, null) != null) { -+#else -+ if (Interlocked.CompareExchange (ref (list as object[]) [index], connection, null) != null) { -+#endif -+ // Someone beat us to the punch -+ connection = null; -+ } else { -+ continue; -+ } -+ } else { -+ if (Interlocked.CompareExchange (ref (connection as Tds).poolStatus, 1, 0) != 0) { -+ // Someone else owns this connection -+ connection = null; -+ } else { - if (!connection.Reset ()) { -- try { -- connection.Disconnect (); -- } catch {} -- connection = null; -+ ThreadPool.QueueUserWorkItem (new WaitCallback (DestroyConnection), connection); -+ // remove connection from pool -+ list [index] = connection = null; -+ // allow slot be re-used in same run -+ continue; -+ } else { - continue; - } - } -+ } -+ -+ index--; -+ -+ if (index < 0) { -+ // TODO: Maintain a list of indices of released connection to save some loop over -+ // Honor timeout - if pool is full, and no connections are available within the -+ // timeout period - just throw the exception -+ if (info.Timeout > 0 -+ && !connAvailable.WaitOne (new TimeSpan (0, 0, info.Timeout), true)) -+ throw new InvalidOperationException ( -+ "Timeout expired. The timeout period elapsed before a " + -+ "connection could be obtained. A possible explanation " + -+ "is that all the connections in the pool are in use, " + -+ "and the maximum pool size is reached."); -+ goto retry; -+ } - -- if (connection == null && activeConnections < info.PoolMaxSize) -- { -- // No connections available, but the connection limit -- // has not been reached yet, so a new one can be created -- connection = CreateConnection(); -- } -- -- // No available connections in the pool -- // Wait for somewone to release one. -- if (connection == null) -- { -- Monitor.Wait (list); -- } -- } -- while (connection == null); -- } -+ } while (connection == null); - - return connection; - } - -- public void ReleaseConnection (ITds tds) -+ public void ReleaseConnection (ITds connection) - { -- lock (list) -- { -- list.Add (tds); -- Monitor.Pulse (list); -- } -+ ((Tds) connection).poolStatus = 0; -+ connAvailable.Set (); - } - - #if NET_2_0 -- public void ReleaseConnection (ref ITds tds) -+ public void ReleaseConnection (ref ITds connection) - { -- lock (list) -- { -- if (pooling == false) { -- try { -- tds.Disconnect (); -- } catch {} -- tds = null; -- } else { -- list.Add (tds); -- Monitor.Pulse (list); -- } -+ if (pooling == false) { -+ int index = Array.IndexOf (list, connection); -+ ThreadPool.QueueUserWorkItem (new WaitCallback (DestroyConnection), connection); -+ list [index] = connection = null; -+ } else { -+ ((Tds) connection).poolStatus = 0; - } -+ connAvailable.Set (); - } - - public void ResetConnectionPool () - { -- lock (list) -+ ITds connection = null; -+ int index = list.Length - 1; -+ -+ while (index >= 0) - { -- ITds connection = null; -- while (list.Count > 0) { -- // There are available connections -- connection = (ITds) list [list.Count - 1]; -- list.RemoveAt (list.Count - 1); -+ connection = list [index]; -+ -+ if (Interlocked.CompareExchange (ref ((Tds) connection).poolStatus, 1, 0) == 0) { - if (!connection.Reset ()) { -- try { -- connection.Disconnect (); -- } catch {} -- connection = null; -+ ThreadPool.QueueUserWorkItem (new WaitCallback (DestroyConnection), connection); -+ list [index] = connection = null; -+ connAvailable.Set (); - } - } -+ -+ index--; - } - } - - public void ResetConnectionPool (ITds connection) - { -- lock (list) -- { -- if (list.Count > 0) { -- // There are available connections -- int index = list.IndexOf (connection); -- if (index != -1) { -- list.RemoveAt (index); -- if (!connection.Reset ()) { -- try { -- connection.Disconnect (); -- } catch {} -- connection = null; -- } -- } -+ int index = Array.IndexOf (list, connection); -+ -+ if (index != -1) { -+ if (connection != null && !connection.Reset ()) { -+ ThreadPool.QueueUserWorkItem (new WaitCallback (DestroyConnection), connection); -+ list [index] = connection = null; -+ connAvailable.Set (); - } - } - } -@@ -239,10 +275,21 @@ - - ITds CreateConnection () - { -- activeConnections++; - return manager.CreateConnection (info); - } - -+ void DestroyConnection (object state) -+ { -+ ITds connection = state as ITds; -+ if (connection != null) { -+ try { -+ connection.Disconnect (); -+ } finally { -+ connection = null; -+ } -+ } -+ } -+ - #endregion // Methods - } - } -diff -urNad mono-1.9+dfsg~/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs mono-1.9+dfsg/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs ---- mono-1.9+dfsg~/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs 2007-11-08 23:13:07.000000000 +0100 -+++ mono-1.9+dfsg/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs 2008-07-08 21:16:16.000000000 +0200 -@@ -51,6 +51,9 @@ - using System.Net.Sockets; - using System.Text; - using System.Xml; -+#if NET_2_0 -+using System.Collections.Generic; -+#endif - - namespace System.Data.SqlClient { - [DefaultEvent ("InfoMessage")] -@@ -570,8 +573,6 @@ - pool.ReleaseConnection (tds); - throw; - } -- } else if (connectionReset) { -- tds.Reset (); - } - - disposed = false; // reset this, so using () would call Close (). -@@ -1684,7 +1685,11 @@ - - public static void ClearAllPools () - { -+#if NET_2_0 -+ IDictionary pools = SqlConnection.sqlConnectionPools.GetConnectionPool (); -+#else - Hashtable pools = SqlConnection.sqlConnectionPools.GetConnectionPool (); -+#endif - foreach (TdsConnectionPool pool in pools.Values) { - if (pool != null) { - pool.ResetConnectionPool (); Index: patches/dont_build_System.Web.Extensions.dpatch =================================================================== --- patches/dont_build_System.Web.Extensions.dpatch (revision 3728) +++ patches/dont_build_System.Web.Extensions.dpatch (working copy) @@ -1,28 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## dont_build_System.Web.Extensions.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.9+dfsg~/mcs/class/Makefile mono-1.9+dfsg/mcs/class/Makefile ---- mono-1.9+dfsg~/mcs/class/Makefile 2008-03-20 21:46:36.000000000 +0100 -+++ mono-1.9+dfsg/mcs/class/Makefile 2008-03-20 22:27:45.000000000 +0100 -@@ -102,8 +102,6 @@ - - net_2_0_dirs := \ - System.Core \ -- System.Web.Extensions \ -- System.Web.Extensions.Design \ - Microsoft.Build.Framework \ - Microsoft.Build.Utilities \ - Microsoft.Build.Engine \ -@@ -117,8 +115,6 @@ - - net_3_5_dirs := \ - System.Xml.Linq \ -- System.Web.Extensions \ -- System.Web.Extensions.Design \ - - default_SUBDIRS := $(common_dirs) $(default_dirs) - net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) Index: patches/fix-mono.pc.in.dpatch =================================================================== --- patches/fix-mono.pc.in.dpatch (revision 3728) +++ patches/fix-mono.pc.in.dpatch (working copy) @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix-mono.pc.in.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.2.6~/data/mono.pc.in mono-1.2.6/data/mono.pc.in ---- mono-1.2.6~/data/mono.pc.in 2007-11-08 23:07:46.000000000 +0100 -+++ mono-1.2.6/data/mono.pc.in 2007-12-16 15:50:02.000000000 +0100 -@@ -1,5 +1,5 @@ --prefix=${pcfiledir}/../.. --exec_prefix=${pcfiledir}/../.. -+prefix=@prefix@ -+exec_prefix=${prefix} - libdir=${prefix}/@reloc_libdir@ - includedir=${prefix}/include/mono-@API_VER@ - sysconfdir=@sysconfdir@ Index: patches/fix_bound_checking_r98524_r98527.dpatch =================================================================== --- patches/fix_bound_checking_r98524_r98527.dpatch (revision 3728) +++ patches/fix_bound_checking_r98524_r98527.dpatch (working copy) @@ -1,304 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_bound_checking_r98524_r98527.dpatch by Jo Shields -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Pull in two SVN changesets to fix bound checking, which manifests itself -## DP: as XSP failing to compile on amd64. Changelog entries and init_trampoline -## DP: routine changes snipped to apply cleanly against 1.9.1 - -@DPATCH@ -Index: mono/mono/mini/tramp-ia64.c -=================================================================== ---- mono/mono/mini/tramp-ia64.c (revision 98523) -+++ mono/mono/mini/tramp-ia64.c (revision 98524) -@@ -76,7 +76,7 @@ - } - - void --mono_arch_patch_callsite (guint8 *code, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr) - { - guint8 *callsite_begin; - guint64 *callsite = (guint64*)(gpointer)(code - 16); -Index: mono/mono/mini/tramp-arm.c -=================================================================== ---- mono/mono/mini/tramp-arm.c (revision 98523) -+++ mono/mono/mini/tramp-arm.c (revision 98524) -@@ -75,7 +75,7 @@ - } - - void --mono_arch_patch_callsite (guint8 *code_ptr, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *code_ptr, guint8 *addr) - { - guint32 *code = (guint32*)code_ptr; - -Index: mono/mono/mini/mini.h -=================================================================== ---- mono/mono/mini/mini.h (revision 98523) -+++ mono/mono/mini/mini.h (revision 98524) -@@ -1254,7 +1254,7 @@ - void mono_arch_save_unwind_info (MonoCompile *cfg) MONO_INTERNAL; - void mono_arch_register_lowlevel_calls (void) MONO_INTERNAL; - gpointer mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr) MONO_INTERNAL; --void mono_arch_patch_callsite (guint8 *code, guint8 *addr) MONO_INTERNAL; -+void mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr) MONO_INTERNAL; - void mono_arch_patch_plt_entry (guint8 *code, guint8 *addr) MONO_INTERNAL; - void mono_arch_nullify_class_init_trampoline(guint8 *code, gssize *regs) MONO_INTERNAL; - void mono_arch_nullify_plt_entry (guint8 *code) MONO_INTERNAL; -Index: mono/mono/mini/tramp-alpha.c -=================================================================== ---- mono/mono/mini/tramp-alpha.c (revision 98523) -+++ mono/mono/mini/tramp-alpha.c (revision 98524) -@@ -523,7 +523,7 @@ - } - - void --mono_arch_patch_callsite (guint8 *code, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr) - { - unsigned long *p = (unsigned int *)(code-12); - -Index: mono/mono/mini/tramp-s390.c -=================================================================== ---- mono/mono/mini/tramp-s390.c (revision 98523) -+++ mono/mono/mini/tramp-s390.c (revision 98524) -@@ -128,7 +128,7 @@ - /*------------------------------------------------------------------*/ - - void --mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr) - { - gint32 displace; - unsigned short opcode; -Index: mono/mono/mini/tramp-amd64.c -=================================================================== ---- mono/mono/mini/tramp-amd64.c (revision 98523) -+++ mono/mono/mini/tramp-amd64.c (revision 98524) -@@ -69,7 +69,7 @@ - * points to the pc right after the call. - */ - void --mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr) - { - guint8 *code; - guint8 buf [16]; -Index: mono/mono/mini/tramp-ppc.c -=================================================================== ---- mono/mono/mini/tramp-ppc.c (revision 98523) -+++ mono/mono/mini/tramp-ppc.c (revision 98524) -@@ -85,7 +85,7 @@ - } - - void --mono_arch_patch_callsite (guint8 *code_ptr, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *code_ptr, guint8 *addr) - { - guint32 *code = (guint32*)code_ptr; - /* This is the 'blrl' instruction */ -Index: mono/mono/mini/tramp-hppa.c -=================================================================== ---- mono/mono/mini/tramp-hppa.c (revision 98523) -+++ mono/mono/mini/tramp-hppa.c (revision 98524) -@@ -77,7 +77,7 @@ - } - - void --mono_arch_patch_callsite (guint8 *p, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *p, guint8 *addr) - { - guint32 *code = (void *)p; - /* Search for and patch the calling sequence -Index: mono/mono/mini/mini-trampolines.c -=================================================================== ---- mono/mono/mini/mini-trampolines.c (revision 98523) -+++ mono/mono/mini/mini-trampolines.c (revision 98524) -@@ -251,7 +251,7 @@ - mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (addr)); - - if (mono_method_same_domain (ji, target_ji)) -- mono_arch_patch_callsite (code, addr); -+ mono_arch_patch_callsite (ji->code_start, code, addr); - } - } - -Index: mono/mono/mini/tramp-x86.c -=================================================================== ---- mono/mono/mini/tramp-x86.c (revision 98523) -+++ mono/mono/mini/tramp-x86.c (revision 98524) -@@ -58,7 +58,7 @@ - } - - void --mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr) - { - guint8 *code; - guint8 buf [8]; -Index: mono/mono/mini/tramp-s390x.c -=================================================================== ---- mono/mono/mini/tramp-s390x.c (revision 98523) -+++ mono/mono/mini/tramp-s390x.c (revision 98524) -@@ -128,7 +128,7 @@ - /*------------------------------------------------------------------*/ - - void --mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr) - { - gint32 displace; - unsigned short opcode; -Index: mono/mono/mini/tramp-sparc.c -=================================================================== ---- mono/mono/mini/tramp-sparc.c (revision 98523) -+++ mono/mono/mini/tramp-sparc.c (revision 98524) -@@ -58,7 +58,7 @@ - } - - void --mono_arch_patch_callsite (guint8 *code, guint8 *addr) -+mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr) - { - if (sparc_inst_op (*(guint32*)code) == 0x1) { - sparc_call_simple (code, (guint8*)addr - (guint8*)code); -Index: mono/mono/mini/mini.h -=================================================================== ---- mono/mono/mini/mini.h (revision 98526) -+++ mono/mono/mini/mini.h (revision 98527) -@@ -1318,7 +1318,7 @@ - - extern gssize mono_breakpoint_info_index [MONO_BREAKPOINT_ARRAY_SIZE]; - --gboolean mono_breakpoint_clean_code (guint8 *code, guint8 *buf, int size); -+gboolean mono_breakpoint_clean_code (guint8 *method_start, guint8 *code, int offset, guint8 *buf, int size); - - /* Mono Debugger support */ - void mono_debugger_init (void); -Index: mono/mono/mini/mini-amd64.c -=================================================================== ---- mono/mono/mini/mini-amd64.c (revision 98526) -+++ mono/mono/mini/mini-amd64.c (revision 98527) -@@ -5494,12 +5494,33 @@ - return 3; - } - -+/** -+ * mono_breakpoint_clean_code: -+ * -+ * Copy @size bytes from @code - @offset to the buffer @buf. If the debugger inserted software -+ * breakpoints in the original code, they are removed in the copy. -+ * -+ * Returns TRUE if no sw breakpoint was present. -+ */ - gboolean --mono_breakpoint_clean_code (guint8 *code, guint8 *buf, int size) -+mono_breakpoint_clean_code (guint8 *method_start, guint8 *code, int offset, guint8 *buf, int size) - { - int i; - gboolean can_write = TRUE; -- memcpy (buf, code, size); -+ /* -+ * If method_start is non-NULL we need to perform bound checks, since we access memory -+ * at code - offset we could go before the start of the method and end up in a different -+ * page of memory that is not mapped or read incorrect data anyway. We zero-fill the bytes -+ * instead. -+ */ -+ if (!method_start || code - offset >= method_start) { -+ memcpy (buf, code - offset, size); -+ } else { -+ int diff = code - method_start; -+ memset (buf, 0, size); -+ memcpy (buf + offset - diff, method_start, diff + size - offset); -+ } -+ code -= offset; - for (i = 0; i < MONO_BREAKPOINT_ARRAY_SIZE; ++i) { - int idx = mono_breakpoint_info_index [i]; - guint8 *ptr; -@@ -5524,8 +5545,8 @@ - gint32 disp; - guint8 rex = 0; - -- mono_breakpoint_clean_code (code - 10, buf, sizeof (buf)); -- code = buf + 10; -+ mono_breakpoint_clean_code (NULL, code, 9, buf, sizeof (buf)); -+ code = buf + 9; - - *displacement = 0; - -Index: mono/mono/mini/mini-x86.c -=================================================================== ---- mono/mono/mini/mini-x86.c (revision 98526) -+++ mono/mono/mini/mini-x86.c (revision 98527) -@@ -4570,12 +4570,33 @@ - } - } - -+/** -+ * mono_breakpoint_clean_code: -+ * -+ * Copy @size bytes from @code - @offset to the buffer @buf. If the debugger inserted software -+ * breakpoints in the original code, they are removed in the copy. -+ * -+ * Returns TRUE if no sw breakpoint was present. -+ */ - gboolean --mono_breakpoint_clean_code (guint8 *code, guint8 *buf, int size) -+mono_breakpoint_clean_code (guint8 *method_start, guint8 *code, int offset, guint8 *buf, int size) - { - int i; - gboolean can_write = TRUE; -- memcpy (buf, code, size); -+ /* -+ * If method_start is non-NULL we need to perform bound checks, since we access memory -+ * at code - offset we could go before the start of the method and end up in a different -+ * page of memory that is not mapped or read incorrect data anyway. We zero-fill the bytes -+ * instead. -+ */ -+ if (!method_start || code - offset >= method_start) { -+ memcpy (buf, code - offset, size); -+ } else { -+ int diff = code - method_start; -+ memset (buf, 0, size); -+ memcpy (buf + offset - diff, method_start, diff + size - offset); -+ } -+ code -= offset; - for (i = 0; i < MONO_BREAKPOINT_ARRAY_SIZE; ++i) { - int idx = mono_breakpoint_info_index [i]; - guint8 *ptr; -@@ -4599,7 +4620,7 @@ - guint8 reg = 0; - gint32 disp = 0; - -- mono_breakpoint_clean_code (code - 8, buf, sizeof (buf)); -+ mono_breakpoint_clean_code (NULL, code, 8, buf, sizeof (buf)); - code = buf + 8; - - *displacement = 0; -Index: mono/mono/mini/tramp-amd64.c -=================================================================== ---- mono/mono/mini/tramp-amd64.c (revision 98526) -+++ mono/mono/mini/tramp-amd64.c (revision 98527) -@@ -73,7 +73,7 @@ - { - guint8 *code; - guint8 buf [16]; -- gboolean can_write = mono_breakpoint_clean_code (orig_code - 14, buf, sizeof (buf)); -+ gboolean can_write = mono_breakpoint_clean_code (method_start, orig_code, 14, buf, sizeof (buf)); - - code = buf + 14; - -Index: mono/mono/mini/tramp-x86.c -=================================================================== ---- mono/mono/mini/tramp-x86.c (revision 98526) -+++ mono/mono/mini/tramp-x86.c (revision 98527) -@@ -62,7 +62,7 @@ - { - guint8 *code; - guint8 buf [8]; -- gboolean can_write = mono_breakpoint_clean_code (orig_code - 8, buf, sizeof (buf)); -+ gboolean can_write = mono_breakpoint_clean_code (method_start, orig_code, 8, buf, sizeof (buf)); - - code = buf + 8; - if (mono_running_on_valgrind ()) Index: patches/fix_xen_support_r103474_r103475.dpatch =================================================================== --- patches/fix_xen_support_r103474_r103475.dpatch (revision 3728) +++ patches/fix_xen_support_r103474_r103475.dpatch (working copy) @@ -1,79 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_xen.dpatch by Andrew Deason -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixes Xen-specific build options by actually passing CFLAGS to -## DP: libgc's Makefile - -@DPATCH@ - ---- mono/configure.in 2008-05-19 21:13:13.000000000 -0500 -+++ mono/configure.in 2008-05-19 21:13:21.000000000 -0500 -@@ -36,6 +36,11 @@ - gc_default=boehm - fi - -+# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure -+# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0 -+CPPFLAGS_FOR_LIBGC=$CPPFLAGS -+CFLAGS_FOR_LIBGC=$CFLAGS -+ - # - # These are the flags that need to be stored in the mono.pc file for - # compiling code that will embed Mono -@@ -301,6 +306,8 @@ - #AC_DISABLE_FAST_INSTALL - AM_PROG_LIBTOOL - -+DOLT -+ - # Test whenever ld supports -version-script - AC_PROG_LD - AC_PROG_LD_GNU -@@ -399,6 +406,7 @@ - esac - fi - CFLAGS="$CFLAGS -g $WARN" -+CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g" - - # Where's the 'mcs' source tree? - if test -d $srcdir/mcs; then -@@ -556,6 +564,8 @@ - void main () { } - ], [ - AC_MSG_RESULT(yes) -+ # Pass it to libgc as well -+ CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs" - ], [ - AC_MSG_RESULT(no) - CFLAGS=$ORIG_CFLAGS -@@ -1981,7 +2001,10 @@ - # We should use a separate variable for this to avoid passing useless and - # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64) - # This should be executed late so we pick up the final version of CPPFLAGS -- ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\"" -+ # The problem with this approach, is that during a reconfigure, the main -+ # configure scripts gets invoked with these arguments, so we use separate -+ # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS. -+ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\"" - AC_CONFIG_SUBDIRS(libgc) - ;; - esac - ---- mono/libgc/configure.in 2008-05-19 14:08:04 UTC (rev 103473) -+++ mono/libgc/configure.in 2008-05-19 14:30:46 UTC (rev 103474) -@@ -39,6 +39,15 @@ - - . [$]{srcdir}/configure.host - -+# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono -+# configure, because of autoconf brokeness -+if test "x$CPPFLAGS_FOR_LIBGC" != "x"; then -+ CPPFLAGS=$CPPFLAGS_FOR_LIBGC -+fi -+if test "x$CFLAGS_FOR_LIBGC" != "x"; then -+ CFLAGS=$CFLAGS_FOR_LIBGC -+fi -+ - GC_CFLAGS=${gc_cflags} - AC_SUBST(GC_CFLAGS) Index: patches/fix_implicit_pointer_conversions.dpatch =================================================================== --- patches/fix_implicit_pointer_conversions.dpatch (revision 3728) +++ patches/fix_implicit_pointer_conversions.dpatch (working copy) @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_implicit_pointer_conversions.dpatch by Mirco Bauer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad mono-1.2.6~/mono/metadata/security.c mono-1.2.6/mono/metadata/security.c ---- mono-1.2.6~/mono/metadata/security.c 2007-11-08 23:07:19.000000000 +0100 -+++ mono-1.2.6/mono/metadata/security.c 2007-12-24 15:54:02.000000000 +0100 -@@ -12,6 +12,7 @@ - #endif - - #include -+#include - #include - #include - #include Index: patches/fix_sloppy_attribute_encode_CVE-2008-3422.dpatch =================================================================== --- patches/fix_sloppy_attribute_encode_CVE-2008-3422.dpatch (revision 3728) +++ patches/fix_sloppy_attribute_encode_CVE-2008-3422.dpatch (working copy) @@ -1,72 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_sloppy_attribute_encode_CVE-2008-3422.dpatch by Jo Shields -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: HTML encode attributes to avoid ASP.NET XSS attack - -@DPATCH@ -Index: mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs -=================================================================== ---- mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs (revision 108743) -+++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs (working copy) -@@ -279,7 +279,7 @@ - w.WriteAttribute ("name", Name); - - w.WriteAttribute ("method", Method); -- w.WriteAttribute ("action", action); -+ w.WriteAttribute ("action", action, true); - - /* - * This is a hack that guarantees the ID is set properly for HtmlControl to -Index: mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs -=================================================================== ---- mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs (revision 108743) -+++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs (working copy) -@@ -126,7 +126,7 @@ - if (Page != null) - Page.ClientScript.RegisterForEventValidation (this.UniqueID, Value); - #endif -- writer.WriteAttribute ("value", Value); -+ writer.WriteAttribute ("value", Value, true); - Attributes.Remove ("value"); - base.RenderAttributes (writer); - } -Index: mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs -=================================================================== ---- mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs (revision 108743) -+++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs (working copy) -@@ -693,7 +693,7 @@ - } - } - -- w.WriteAttribute ("value", item.Value); -+ w.WriteAttribute ("value", item.Value, true); - w.Write (HtmlTextWriter.TagRightChar); - - w.Write (item.Text); -Index: mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs -=================================================================== ---- mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs (revision 108743) -+++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs (working copy) -@@ -90,7 +90,7 @@ - catch (Exception) { - throw new HttpException(attribName + " property had malformed url"); - } -- writer.WriteAttribute(attribName, attr); -+ writer.WriteAttribute(attribName, attr, true); - Attributes.Remove(attribName); - } - } -Index: mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs -=================================================================== ---- mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs (revision 108743) -+++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs (working copy) -@@ -302,7 +302,7 @@ - - if (oc != null) { - writer.WriteAttribute ("language", "javascript"); -- writer.WriteAttribute ("onclick", oc); -+ writer.WriteAttribute ("onclick", oc, true); - } - } - #endif Index: patches/00list =================================================================== --- patches/00list (revision 3728) +++ patches/00list (working copy) @@ -1,23 +0,0 @@ -kfreebsd_support -console-no-utf8-bom -firebird-fbclient -fix-mono.pc.in -fix-mono-cairo.pc.in -fix-mono-nunit.pc.in -fix_BigInteger_overflow_CVE-2007-5197 -fix_implicit_pointer_conversions -method-signature-testing -dont_build_System.Web.Extensions -pass_CPPFLAGS_nicely_r98803 -fix_bound_checking_r98524_r98527 -fix_softfloat_r105848 -fix_stack_alignment_r105650_r105651 -fix_xen_support_r103474_r103475 -fix_Dictionary_preventing_GC_r102114 -fix_TdsConnectionPool_svn -fix_sloppy_attribute_encode_CVE-2008-3422 -fix_CRLF_injection_CVE-2008-3906 -fix_IsolatedStorage_regression_r99231_r101171_r101172 -fix_mono-config_man_page_r111681 -fix_Assembly.LoadFrom_deadlock -99_autoreconf Index: patches/firebird-fbclient.dpatch =================================================================== --- patches/firebird-fbclient.dpatch (revision 3728) +++ patches/firebird-fbclient.dpatch (working copy) @@ -1,15 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run - -@DPATCH@ - ---- mono/mcs/class/FirebirdSql.Data.Firebird/Makefile.old 2007-02-26 23:06:40.510241854 +0100 -+++ mono/mcs/class/FirebirdSql.Data.Firebird/Makefile 2007-02-26 23:07:08.607843047 +0100 -@@ -8,7 +8,7 @@ - LIB_DEFINE_FLAGS = - - ifeq ($(PLATFORM), linux) --LIB_DEFINE_FLAGS = /d:LINUX -+LIB_DEFINE_FLAGS = /d:LINUX /d:FBCLIENT - endif - - LIB_MCS_FLAGS = \ Index: patches/console-no-utf8-bom.dpatch =================================================================== --- patches/console-no-utf8-bom.dpatch (revision 3728) +++ patches/console-no-utf8-bom.dpatch (working copy) @@ -1,16 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run - -@DPATCH@ - ---- trunk/mcs/class/corlib/System/Console.cs.old 2006-08-29 18:21:12.473936000 +0200 -+++ trunk/mcs/class/corlib/System/Console.cs 2006-08-29 18:23:46.607568750 +0200 -@@ -97,8 +97,7 @@ - int code_page = 0; - Encoding.InternalCodePage (ref code_page); - -- if (code_page != -1 && ((code_page & 0x0fffffff) == 3 // UTF8Encoding.UTF8_CODE_PAGE -- || ((code_page & 0x10000000) != 0))) -+ if (code_page == UTF8Encoding.UTF8_CODE_PAGE || ((code_page & 0x10000000) != 0)) - inputEncoding = outputEncoding = Encoding.UTF8Unmarked; - else - inputEncoding = outputEncoding = Encoding.Default; Index: patches/fix_mono-config_man_page_r111681.dpatch =================================================================== --- patches/fix_mono-config_man_page_r111681.dpatch (revision 3728) +++ patches/fix_mono-config_man_page_r111681.dpatch (working copy) @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_mono-config_man_page_r111681.dpatch by Jo Shields -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix minor typo in mono-config man page - -@DPATCH@ ---- mono/man/mono-config.5 2007/02/23 14:12:53 73363 -+++ mono/man/mono-config.5 2008/08/27 03:27:55 111681 -@@ -60,7 +60,7 @@ - This is the target library, where the function can be found. - .TP - .I name --This is the name of the fuction as it appears in the metadata: it is the name -+This is the name of the function as it appears in the metadata: it is the name - of the P/Invoke method. - .TP - .I target - Index: mono-gac.install =================================================================== --- mono-gac.install (revision 3728) +++ mono-gac.install (working copy) @@ -1,2 +1,4 @@ debian/tmp/usr/bin/gacutil +debian/tmp/usr/bin/gacutil2 debian/tmp/usr/lib/mono/1.0/gacutil.exe +debian/tmp/usr/lib/mono/2.0/gacutil.exe Index: changelog =================================================================== --- changelog (revision 3728) +++ changelog (working copy) @@ -1,5 +1,11 @@ -mono (1.9.1+dfsg-4) unstable; urgency=high +mono (2.0~ppa0) intrepid; urgency=low + * Unofficial package for new release. Beware. + + -- Eric Butler Tue, 14 Oct 2008 08:42:28 -0700 + +mono (1.9.1+dfsg-4) intrepid; urgency=high + [ Mirco Bauer ] * Added lpia to Architecture fields. (to make Jo Shields more happy) Index: libmono-system2.1-cil.install =================================================================== --- libmono-system2.1-cil.install (revision 3728) +++ libmono-system2.1-cil.install (working copy) @@ -1,6 +1,8 @@ -debian/tmp/usr/lib/mono/gac/System/2.1.0.0__*/ -debian/tmp/usr/lib/mono/gac/System.Core/2.1.0.0__*/ -debian/tmp/usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/ +debian/tmp/usr/lib/mono/gac/System/2.0.5.0__*/ +debian/tmp/usr/lib/mono/gac/System.Core/2.0.5.0__*/ +debian/tmp/usr/lib/mono/gac/System.Net/2.0.5.0__*/ +debian/tmp/usr/lib/mono/gac/System.Xml/2.0.5.0__*/ debian/tmp/usr/lib/mono/2.1/System.dll debian/tmp/usr/lib/mono/2.1/System.Core.dll -debian/tmp/usr/lib/mono/2.1/System.Xml.Core.dll +debian/tmp/usr/lib/mono/2.1/System.Xml.dll +debian/tmp/usr/lib/mono/2.1/System.Net.dll Index: libmono-dev.install =================================================================== --- libmono-dev.install (revision 3728) +++ libmono-dev.install (working copy) @@ -4,4 +4,6 @@ debian/tmp/usr/lib/libMonoSupportW.a debian/tmp/usr/lib/pkgconfig/mono.pc debian/tmp/usr/lib/pkgconfig/dotnet.pc +debian/tmp/usr/lib/pkgconfig/dotnet35.pc +debian/tmp/usr/lib/pkgconfig/smcs.pc debian/tmp/usr/include/ Index: control =================================================================== --- control (revision 3728) +++ control (working copy) @@ -171,10 +171,10 @@ . This package contains the Mono C5 library. -Package: libmono-mozilla0.2-cil +Package: libmono-webbrowser0.5-cil Section: libs Architecture: all -Replaces: libmono-mozilla0.1-cil +Replaces: libmono-webbrowser0.1-cil, libmono-mozilla0.2-cil Depends: ${cli:Depends} Recommends: libgluezilla Description: Mono Mozilla library Index: libmono-db2-1.0-cil.install =================================================================== --- libmono-db2-1.0-cil.install (revision 3728) +++ libmono-db2-1.0-cil.install (working copy) @@ -1,2 +1,3 @@ debian/tmp/usr/lib/mono/gac/IBM.Data.DB2/1.0.*/ debian/tmp/usr/lib/mono/1.0/IBM.Data.DB2.dll +debian/tmp/usr/lib/mono/2.0/IBM.Data.DB2.dll Index: rules =================================================================== --- rules (revision 3728) +++ rules (working copy) @@ -159,10 +159,9 @@ dh_testroot #dh_clean -k -i dh_installdirs -i - cd mcs && \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp && \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_0 - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_1 + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp && \ + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_0 + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_1 # copy missing 2.0 manpages cp $(CURDIR)/debian/tmp/usr/share/man/man1/al.1 \ $(CURDIR)/debian/tmp/usr/share/man/man1/al2.1 @@ -182,9 +181,6 @@ $(CURDIR)/debian/tmp/usr/share/man/man1/ilasm2.1 cp $(CURDIR)/debian/tmp/usr/share/man/man1/resgen.1 \ $(CURDIR)/debian/tmp/usr/share/man/man1/resgen2.1 - # move System.Xml.Linq.dll symlink to the correct directory - mv $(CURDIR)/debian/tmp/usr/lib/mono/3.5/System.Xml.Linq.dll \ - $(CURDIR)/debian/tmp/usr/lib/mono/2.0/ touch install-indep-stamp binary: binary-arch binary-indep @@ -207,8 +203,6 @@ # never ever install cecil.pc! mono ships an internal version for GAC only # args, mono-tools >= 1.9 needs this now :( #rm -f debian/tmp/usr/lib/pkgconfig/cecil.pc - # Mono.Mozilla.dll is linked with CLI 2.0, thus the symlink in 1.0/ doesn't make sense - rm -f debian/tmp/usr/lib/mono/1.0/Mono.Mozilla.dll # that exclude list are programs for arch-dep packages dh_install -i -Xbin/monodis -Xbin/monograph -Xbin/mono-find-provides -Xbin/mono-find-requires -Xbin/pedump -Xbin/jay Index: libmono-system-data2.0-cil.install =================================================================== --- libmono-system-data2.0-cil.install (revision 3728) +++ libmono-system-data2.0-cil.install (working copy) @@ -1,2 +1,7 @@ debian/tmp/usr/lib/mono/gac/System.Data/2.0.*/ debian/tmp/usr/lib/mono/2.0/System.Data.dll +debian/tmp/usr/lib/mono/2.0/System.Data.DataSetExtensions.dll +debian/tmp/usr/lib/mono/2.0/System.Data.Linq.dll +debian/tmp/usr/lib/mono/gac/System.Data/2.0.*/ +debian/tmp/usr/lib/mono/gac/System.Data.Linq/3.5.0.0__*/ +debian/tmp/usr/lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__*/ Index: libmono-mozilla0.2-cil.install =================================================================== --- libmono-mozilla0.2-cil.install (revision 3728) +++ libmono-mozilla0.2-cil.install (working copy) @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/ -debian/tmp/usr/lib/mono/2.0/Mono.Mozilla.dll Index: mono-1.0-devel.install =================================================================== --- mono-1.0-devel.install (revision 3728) +++ mono-1.0-devel.install (working copy) @@ -1,4 +1,5 @@ debian/tmp/usr/bin/al +debian/tmp/usr/bin/al1 debian/tmp/usr/bin/caspol debian/tmp/usr/bin/cert2spc debian/tmp/usr/bin/certmgr @@ -8,19 +9,25 @@ debian/tmp/usr/bin/dtd2xsd debian/tmp/usr/bin/dtd2rng debian/tmp/usr/bin/genxs +debian/tmp/usr/bin/genxs1 debian/tmp/usr/bin/ilasm +debian/tmp/usr/bin/ilasm1 debian/tmp/usr/bin/installvst debian/tmp/usr/bin/macpack debian/tmp/usr/bin/mkbundle +debian/tmp/usr/bin/mkbundle1 debian/tmp/usr/bin/mono-api-diff debian/tmp/usr/bin/mono-api-info +debian/tmp/usr/bin/mono-api-info1 debian/tmp/usr/bin/mono-shlib-cop debian/tmp/usr/bin/mono-xmltool debian/tmp/usr/bin/monop +debian/tmp/usr/bin/monop1 debian/tmp/usr/bin/monolinker debian/tmp/usr/bin/mozroots debian/tmp/usr/bin/permview debian/tmp/usr/bin/resgen +debian/tmp/usr/bin/resgen1 debian/tmp/usr/bin/secutil debian/tmp/usr/bin/setreg debian/tmp/usr/bin/signcode @@ -28,6 +35,7 @@ debian/tmp/usr/bin/soapsuds debian/tmp/usr/bin/sqlsharp debian/tmp/usr/bin/wsdl +debian/tmp/usr/bin/wsdl1 debian/tmp/usr/bin/xsd debian/tmp/usr/lib/mono/1.0/CorCompare.exe debian/tmp/usr/lib/mono/1.0/al.exe Index: mono-2.0-devel.install =================================================================== --- mono-2.0-devel.install (revision 3728) +++ mono-2.0-devel.install (working copy) @@ -9,6 +9,7 @@ debian/tmp/usr/bin/resgen2 debian/tmp/usr/bin/sgen debian/tmp/usr/bin/wsdl2 +debian/tmp/usr/bin/xsd2 debian/tmp/usr/lib/mono/2.0/al.exe debian/tmp/usr/lib/mono/2.0/httpcfg.exe debian/tmp/usr/lib/mono/2.0/ilasm.exe @@ -19,3 +20,5 @@ debian/tmp/usr/lib/mono/2.0/resgen.exe debian/tmp/usr/lib/mono/2.0/sgen.exe debian/tmp/usr/lib/mono/2.0/wsdl.exe +debian/tmp/usr/lib/mono/2.0/xsd.exe +debian/tmp/usr/bin/genxs2 Index: libmono-system2.0-cil.install =================================================================== --- libmono-system2.0-cil.install (revision 3728) +++ libmono-system2.0-cil.install (working copy) @@ -11,6 +11,10 @@ debian/tmp/usr/lib/mono/2.0/System.Xml.dll debian/tmp/usr/lib/mono/2.0/System.Xml.Linq.dll debian/tmp/usr/lib/mono/2.0/System.dll +debian/tmp/usr/lib/mono/2.0/System.Web.Extensions.dll +debian/tmp/usr/lib/mono/2.0/System.Web.Extensions.Design.dll +debian/tmp/usr/lib/mono/3.5/System.Web.Extensions.dll +debian/tmp/usr/lib/mono/3.5/System.Web.Extensions.Design.dll debian/tmp/usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/ debian/tmp/usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/ debian/tmp/usr/lib/mono/gac/System.Configuration/2.0.0.0__*/ @@ -24,3 +28,7 @@ debian/tmp/usr/lib/mono/gac/System.Xml/2.0.0.0__*/ debian/tmp/usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/ debian/tmp/usr/lib/mono/gac/System/2.0.0.0__*/ +debian/tmp/usr/lib/mono/gac/System.Web.Extensions.Design/1.0.*/ +debian/tmp/usr/lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__*/ +debian/tmp/usr/lib/mono/gac/System.Web.Extensions/3.5.0.0__*/ +debian/tmp/usr/lib/mono/gac/System.Web.Extensions/1.0.*/