Add watch and dbw

48 files changed, 2872 insertions, 1964 deletions

diff --git a/Makefile.am b/Makefile.am
index 2221a2d..4364482 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,13 @@ SUBDIRS = libffi-3.0.5
 
 lib_LTLIBRARIES = libnul.la
 
-libnul_la_CFLAGS=-Ilibffi-3.0.5/include
+AM_CFLAGS=-Ilibffi-3.0.5/include @DEP_CFLAGS@
 
-libnul_la_SOURCES = \
-         invoke.c \
-         libnul.h
+libnul_la_SOURCES =	\
+	invoke.c	\
+	watch.c		\
+	dbw.c		\
+	libnul.h
 
 libnul_la_LIBADD = @DEP_LIBS@ libffi-3.0.5/libffi.la
 
diff --git a/configure.ac b/configure.ac
index 1b75897..c08ce43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_PROG_LIBTOOL
 AC_C_CHAR_UNSIGNED
 
 # Check for dependencies
-PKG_CHECK_MODULES(DEP, glib-2.0)
+PKG_CHECK_MODULES(DEP, glib-2.0 dbus-1)
 
 AC_SUBST(DEP_CFLAGS)
 AC_SUBST(DEP_LIBS)
diff --git a/dbw.c b/dbw.c
new file mode 100644
index 0000000..62bfafa
--- /dev/null
+++ b/dbw.c
@@ -0,0 +1,999 @@
+#include <stdarg.h>
+#include <dbus/dbus.h>
+#include <string.h>
+#include <glib.h>
+#include "libnul.h"
+
+#define INTROSPECT_INTERFACE "org.freedesktop.DBus.Introspectable"
+#define INTROSPECT_METHOD "Introspect"
+
+struct DbwService
+{
+    char *name;
+    GPtrArray *objects;
+    DBusConnection *connection;
+    gboolean running;
+};
+
+struct DbwObject
+{
+    char *name;
+    gpointer data;
+    GPtrArray *interfaces;
+};
+
+struct DbwInterface
+{
+    char *name;
+    GPtrArray *members;
+};
+
+struct DbwMember
+{
+    /* For now only methods are supported, although
+     * later we may also have properties and signals
+     */
+    DbwInterface *	interface;
+
+    DbwFunction		function;
+    
+    char *		name;
+    GPtrArray *		parameters;
+
+    FunDef *		fun_def;
+};
+
+struct DbwParameter
+{
+    char *		name;
+    DbwType *		type;
+    gboolean		out;
+};
+
+typedef enum
+{
+    INT32,
+    UINT32,
+    STRING
+} Primitive;
+
+struct DbwType
+{
+    Primitive type;
+};
+
+static void
+process_watch (DBusWatch *watch, int flags)
+{
+    DBusConnection *connection;
+    DBusMessage *msg;
+    
+    dbus_watch_handle (watch, flags);
+
+    connection = dbus_watch_get_data (watch);
+
+    while ((msg = dbus_connection_borrow_message (connection)))
+    {
+	dbus_connection_return_message (connection, msg);
+	
+	dbus_connection_dispatch (connection);
+    }
+}
+
+static void
+on_hangup (gpointer data)
+{
+    DBusWatch *watch = data;
+
+    process_watch (watch, DBUS_WATCH_HANGUP);
+}
+
+static void
+on_error (gpointer data)
+{
+    DBusWatch *watch = data;
+
+    process_watch (watch, DBUS_WATCH_ERROR);
+}
+
+static void
+on_read (gpointer data)
+{
+    GList *list = data;
+
+    for (list = data; list != NULL; list = list->next)
+    {
+	DBusWatch *watch = list->data;
+
+	if (dbus_watch_get_enabled (watch) &&
+	    (dbus_watch_get_flags (watch) & DBUS_WATCH_READABLE))
+	{
+	    process_watch (watch, DBUS_WATCH_READABLE);
+	}
+    }
+}
+
+static void
+on_write (gpointer data)
+{
+    GList *list = data;
+
+    for (list = data; list != NULL; list = list->next)
+    {
+	DBusWatch *watch = list->data;
+
+	if (dbus_watch_get_enabled (watch) &&
+	    (dbus_watch_get_flags (watch) & DBUS_WATCH_WRITABLE))
+	{
+	    process_watch (watch, DBUS_WATCH_WRITABLE);
+	}
+    }
+}
+
+static void
+update_fd (int fd)
+{
+    int enabled, flags;
+    GList *watches, *list;
+
+    watches = fd_get_data (fd);
+
+    enabled = FALSE;
+    flags = 0;
+    
+    for (list = watches; list != NULL; list = list->next)
+    {
+	DBusWatch *watch = list->data;
+
+	if (dbus_watch_get_enabled (watch))
+	{
+	    enabled = TRUE;
+	    flags |= dbus_watch_get_flags (watch);
+	}
+    }
+
+    if (enabled)
+    {
+	fd_set_error_callback (fd, on_hangup);
+	fd_set_hangup_callback (fd, on_error);
+
+	if (flags & DBUS_WATCH_READABLE)
+	    fd_set_read_callback (fd, on_read);
+	else
+	    fd_set_read_callback (fd, NULL);
+
+	if (flags & DBUS_WATCH_WRITABLE)
+	    fd_set_write_callback (fd, on_write);
+	else
+	    fd_set_write_callback (fd, NULL);
+    }
+    else
+    {
+	fd_set_error_callback (fd, NULL);
+	fd_set_hangup_callback (fd, NULL);
+	fd_set_read_callback (fd, NULL);
+	fd_set_write_callback (fd, NULL);
+    }
+}
+
+static dbus_bool_t
+add_watch (DBusWatch *watch, void *data)
+{
+    DBusConnection *connection = data;
+    int fd = dbus_watch_get_unix_fd (watch);
+
+    dbus_watch_set_data (watch, connection, NULL);
+    
+    /* DBus apparently will create multiple watches for
+     * the same fd.
+     */
+    if (fd_is_watched (fd))
+    {
+	GList *watches = fd_get_data (fd);
+
+	watches = g_list_prepend (watches, watch);
+
+	fd_set_data (fd, watches);
+    }
+    else
+    {
+	fd_add_watch (fd, g_list_prepend (NULL, watch));
+    }
+
+    update_fd (fd);
+
+    return TRUE;
+}
+
+static void
+remove_watch (DBusWatch *watch, void *data)
+{
+    int fd = dbus_watch_get_unix_fd (watch);
+    GList *watches = fd_get_data (fd);
+
+    watches = g_list_remove (watches, watch);
+
+    if (!watches)
+    {
+	fd_remove_watch (fd);
+    }
+    else
+    {
+	fd_set_data (fd, watches);
+	update_fd (fd);
+    }
+}
+
+static void
+toggle_watch (DBusWatch *watch, void *data)
+{
+    update_fd (dbus_watch_get_unix_fd (watch));
+}
+
+static gboolean
+on_timeout (gpointer data)
+{
+    DBusTimeout *timeout = data;
+
+    dbus_timeout_handle (timeout);
+    
+    return TRUE;
+}
+
+static dbus_bool_t
+add_timeout (DBusTimeout *timeout, void *data)
+{
+    dbus_timeout_set_data (timeout, GINT_TO_POINTER (0), NULL);
+
+    if (dbus_timeout_get_enabled (timeout))
+    {
+	int id;
+	
+	id = g_timeout_add (dbus_timeout_get_interval (timeout),
+			    on_timeout, timeout);
+
+	dbus_timeout_set_data (timeout, GINT_TO_POINTER (id), NULL);
+    }
+    
+    return TRUE;
+}
+
+static void
+remove_timeout (DBusTimeout *timeout, void *data)
+{
+    int id = GPOINTER_TO_INT (dbus_timeout_get_data (timeout));
+
+    if (id)
+    {
+	g_source_remove (id);
+
+	dbus_timeout_set_data (timeout, GINT_TO_POINTER (0), NULL);
+    }
+}
+
+static void
+toggle_timeout (DBusTimeout *timeout, void *data)
+{
+    remove_timeout (timeout, NULL);
+
+    add_timeout (timeout, NULL);
+}
+
+static void
+unregister_connection (DBusConnection *connection,
+		       gpointer        data)
+{
+    /* nothing */
+}
+
+static GPtrArray *free_us;
+static int idle_handler;
+
+static gboolean
+do_free (gpointer data)
+{
+    int i;
+
+    for (i = 0; i < free_us->len; ++i)
+	g_free (free_us->pdata[i]);
+
+    g_ptr_array_free (free_us, TRUE);
+    free_us = g_ptr_array_new ();
+
+    idle_handler = 0;
+    
+    return FALSE;
+}
+
+static gpointer
+idle_free (gpointer p)
+{
+    if (!free_us)
+	free_us = g_ptr_array_new ();
+
+    g_ptr_array_add (free_us, p);
+
+    if (!idle_handler)
+	idle_handler = g_idle_add (do_free, NULL);
+
+    return p;
+}
+
+static const char *
+make_signature (DbwType *type)
+{
+    switch (type->type)
+    {
+    case UINT32:
+	return "u";
+    case INT32:
+	return "i";
+    case STRING:
+	return "s";
+    }
+    return "";
+}
+
+static const char *
+introspect (DbwObject *object)
+{
+    GString *xml = g_string_new (NULL);
+    int i;
+    
+    g_string_append_printf (xml, "<node>\n");
+    
+    for (i = 0; i < object->interfaces->len; ++i)
+    {
+	DbwInterface *interface = object->interfaces->pdata[i];
+	int j;
+	
+	g_string_append_printf (
+	    xml, "  <interface name=\"%s\">\n", interface->name);
+	
+	for (j = 0; j < interface->members->len; ++j)
+	{
+	    DbwMember *member = interface->members->pdata[j];
+	    int k;
+
+	    g_string_append_printf (
+		xml, "    <method name=\"%s\">\n", member->name);
+
+	    for (k = 0; k < member->parameters->len; ++k)
+	    {
+		DbwParameter *parameter = member->parameters->pdata[k];
+
+		g_string_append_printf (
+		    xml,
+		    "      <arg name=\"%s\" direction=\"%s\" type=\"%s\"/>\n",
+		    parameter->name,
+		    parameter->out? "out" : "in",
+		    make_signature (parameter->type));
+	    }
+
+	    g_string_append_printf (
+		xml, "    </method>\n");
+	}
+	
+	g_string_append_printf (xml, "  </interface>\n");
+    }
+
+    g_string_append_printf (xml, "</node>\n");
+	
+    return idle_free (g_string_free (xml, FALSE));
+}
+
+static DBusHandlerResult
+invoke (DBusConnection *connection,
+	DbwObject      *object,
+	DbwMember      *member,
+	DBusMessage    *message)
+{
+    Arg *args = idle_free (g_new0 (Arg, member->parameters->len + 1));
+    DBusMessage *error_reply;
+    DBusMessageIter iter;
+    Arg result;
+    dbus_bool_t has_args;
+    int i;
+    const char *error;
+ 
+    /* Add the data pointer */
+    args[0].v_pointer = object->data;
+
+    args++; /* skip object data */
+
+    has_args = dbus_message_iter_init (message, &iter);
+    
+    for (i = 0; i < member->parameters->len; ++i)
+    {
+	DbwParameter *parameter = member->parameters->pdata[i];
+
+	if (parameter->out)
+	{
+	    switch (parameter->type->type)
+	    {
+	    case UINT32:
+		args[i].v_pointer = &(args[i].v_uint32);
+		break;
+		
+	    case INT32:
+		args[i].v_pointer = &(args[i].v_int32);
+		break;
+		
+	    case STRING:
+		args[i].v_pointer = &(args[i].v_pointer);
+		break;
+	    }
+	}
+	else
+	{
+	    int dbus_type;
+	    
+	    if (!has_args)
+	    {
+		error = "Received too few arguments method\n";
+		goto fail;
+	    }
+
+	    dbus_type = dbus_message_iter_get_arg_type (&iter);
+
+	    switch (parameter->type->type)
+	    {
+	    case UINT32:
+		if (dbus_type != DBUS_TYPE_UINT32)
+		{
+		    error = "Received wrong type, should be UINT32";
+		    goto fail;
+		}
+		dbus_message_iter_get_basic (&iter, &(args[i].v_uint32));
+		break;
+
+	    case INT32:
+		if (dbus_type != DBUS_TYPE_INT32)
+		{
+		    error = "Received wrong type, should be INT32";
+		    goto fail;
+		}
+		dbus_message_iter_get_basic (&iter, &(args[i].v_int32));
+		break;
+
+	    case STRING:
+		if (dbus_type != DBUS_TYPE_STRING)
+		{
+		    error = "Received wrong type, should be STRING";
+		    goto fail;
+		}
+		dbus_message_iter_get_basic (&iter, &(args[i].v_pointer));
+		break;
+	    }
+
+	    if (dbus_type == DBUS_TYPE_INVALID)
+		has_args = FALSE;
+
+	    dbus_message_iter_next (&iter);
+	}
+    }
+
+    args--; /* Include object data */
+    result = fun_def_invoke (member->fun_def, args);
+    
+    if (result.v_int32)
+    {
+	DBusMessage *reply = dbus_message_new_method_return (message);
+	DBusMessageIter iter;
+	int i;
+	args++; /* Skip object data */
+
+	dbus_message_iter_init_append (reply, &iter);
+
+	for (i = 0; i < member->parameters->len; ++i)
+	{
+	    DbwParameter *parameter = member->parameters->pdata[i];
+
+	    if (parameter->out)
+	    {
+		switch (parameter->type->type)
+		{
+		case UINT32:
+		    dbus_message_iter_append_basic (
+			&iter, DBUS_TYPE_UINT32, &(args[i].v_uint32));
+		    break;
+		    
+		case INT32:
+		    dbus_message_iter_append_basic (
+			&iter, DBUS_TYPE_INT32, &(args[i].v_int32));
+		    break;
+		    
+		case STRING:
+		    dbus_message_iter_append_basic (
+			&iter, DBUS_TYPE_STRING, &(args[i].v_pointer));
+
+		    /* FIXME: it feels wrong that we are freeing data
+		     * passed by the user. Maybe we should just make the
+		     * user idle_free it.
+		     */
+		    g_free (args[i].v_pointer);
+		    break;
+		}
+	    }
+	}
+	
+	dbus_connection_send (connection, reply, NULL);
+	dbus_message_unref (reply);
+	return DBUS_HANDLER_RESULT_HANDLED;
+    }
+    else
+    {
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+fail:
+    error_reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, error);
+
+    dbus_connection_send (connection, error_reply, NULL);
+    
+    return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static DBusHandlerResult
+message_function (DBusConnection *connection,
+		  DBusMessage *message,
+		  gpointer data)
+{
+    const char *msg_path = dbus_message_get_path (message);
+    const char *msg_interface = dbus_message_get_interface (message);
+    const char *msg_member = dbus_message_get_member (message);
+    DbwObject *object = data;
+    int i;
+    
+    g_assert (strcmp (object->name, msg_path) == 0);
+
+    /* Introspection */
+    if (strcmp (msg_interface, INTROSPECT_INTERFACE) == 0 &&
+	strcmp (msg_member, INTROSPECT_METHOD) == 0)
+    {
+	DBusMessage *reply = dbus_message_new_method_return (message);
+	const char *xml = introspect (object);
+	
+	dbus_message_append_args (reply,
+				  DBUS_TYPE_STRING, &xml,
+				  DBUS_TYPE_INVALID);
+
+	dbus_connection_send (connection, reply, NULL);
+	
+	return DBUS_HANDLER_RESULT_HANDLED;
+    }
+
+    /* Normal method */
+    for (i = 0; i < object->interfaces->len; ++i)
+    {
+	DbwInterface *interface = object->interfaces->pdata[i];
+
+	if (strcmp (msg_interface, interface->name) == 0)
+	{
+	    int j;
+
+	    for (j = 0; j < interface->members->len; ++j)
+	    {
+		DbwMember *member = interface->members->pdata[j];
+
+		if (strcmp (member->name, msg_member) == 0)
+		    return invoke (connection, object, member, message);
+	    }
+	}
+    }
+
+    g_print ("got unknown message\n");
+    
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static const DBusObjectPathVTable vtable =
+{
+    unregister_connection,
+    message_function,
+};
+
+static GPtrArray *
+make_ptr_array (gpointer first, va_list parameters)
+{
+    GPtrArray *array = g_ptr_array_new ();
+    gpointer v;
+
+    if (first)
+    {
+	g_ptr_array_add (array, first);
+	
+	v = va_arg (parameters, gpointer);
+	while (v)
+	{
+	    g_ptr_array_add (array, v);
+	    
+	    v = va_arg (parameters, gpointer);
+	}
+    }
+	
+    return array;
+}
+
+static DBusConnection *
+ensure_connection (DBusConnection **connection,
+		   DBusBusType type,
+		   DBusError *err)
+{
+    if (!*connection)
+    {
+	*connection = dbus_bus_get (type, err);
+	
+	if (*connection)
+	{
+	    dbus_connection_set_watch_functions (
+		*connection,
+		add_watch, remove_watch, toggle_watch,
+		*connection, NULL);
+	    
+	    dbus_connection_set_timeout_functions (
+		*connection,
+		add_timeout, remove_timeout, toggle_timeout,
+		*connection, NULL);
+	}
+    }
+	
+    return *connection;
+}
+
+static DBusConnection *
+get_connection (DBusBusType type, DBusError *err)
+{
+    static DBusConnection *session_bus;
+    static DBusConnection *system_bus;
+    
+    if (type == DBUS_BUS_SESSION)
+	return ensure_connection (&session_bus, DBUS_BUS_SESSION, err);
+    else if (type == DBUS_BUS_SYSTEM)
+	return ensure_connection (&system_bus, DBUS_BUS_SYSTEM, err);
+    else
+	return NULL;
+}
+
+DbwService *
+dbw_session_service (const char *name,
+		     DbwObject *object1,
+		     ...)
+{
+    DbwService *service = g_new0 (DbwService, 1);
+    va_list parameters;
+    DBusError err = DBUS_ERROR_INIT;
+
+    service->name = g_strdup (name);
+
+    va_start (parameters, object1);
+    service->objects = make_ptr_array (object1, parameters);
+    va_end (parameters);
+
+    service->connection = get_connection (DBUS_BUS_SESSION, &err);
+    if (!service->connection)
+    {
+	/* FIXME */
+	return NULL;
+    }
+    
+    return service;
+}
+
+gboolean
+dbw_service_start (DbwService *service)
+{
+    DBusError err = DBUS_ERROR_INIT;
+    int i;
+    int result;
+
+    if (service->running)
+	return FALSE;
+    
+    /* Possible flags:
+     *
+     * DBUS_NAME_FLAG_ALLOW_REPLACEMENT
+     * DBUS_NAME_FLAG_REPLACE_EXISTING
+     * DBUS_FLAG_DO_NOT_QUEUE
+     */
+    result = dbus_bus_request_name (service->connection,
+				    service->name,
+				    DBUS_NAME_FLAG_DO_NOT_QUEUE,
+				    &err);
+
+    if (result == -1)
+    {
+	/* FIXME: handle error */
+	return FALSE;
+    }
+    
+    switch (result)
+    {
+    case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
+	g_assert_not_reached();
+	break;
+
+    case DBUS_REQUEST_NAME_REPLY_EXISTS:
+	g_print ("Couldn't get name\n");
+	return FALSE;
+	break;
+
+    case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
+	g_print ("We own this already (?)\n");
+	return FALSE;
+	break;
+
+    case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
+	break;
+    }
+    
+    /* Register objects */
+    for (i = 0; i < service->objects->len; ++i)
+    {
+	DbwObject *object = service->objects->pdata[i];
+
+	dbus_connection_register_object_path (
+	    service->connection, object->name, &vtable, object);
+    }
+
+    service->running = TRUE;
+
+    return TRUE;
+}
+
+void
+dbw_service_stop (DbwService *service)
+{
+    int i;
+
+    if (!service->running)
+	return;
+    
+    for (i = 0; i < service->objects->len; ++i)
+    {
+	DbwObject *object = service->objects->pdata[i];
+
+	dbus_connection_unregister_object_path (
+	    service->connection, object->name);
+    }
+
+    dbus_bus_release_name (service->connection, service->name, NULL);
+
+    service->running = FALSE;
+}
+
+DbwObject *
+dbw_object (const char *name,
+	    gpointer data,
+	    DbwInterface *interface1,
+	    ...)
+{
+    DbwObject *object = g_new0 (DbwObject, 1);
+    va_list parameters;
+
+    object->name = g_strdup (name);
+    object->data = data;
+    
+    va_start (parameters, interface1);
+    object->interfaces = make_ptr_array (interface1, parameters);
+    va_end (parameters);
+
+    /* Add introspection interface */
+    
+    /* Note: the actual introspection is special cased in invoke(), but we
+     * still add it here so that introspection can treat the introspection
+     * interface as any other interface
+     */
+    g_ptr_array_add (object->interfaces, dbw_interface (
+			 "org.freedesktop.DBus.Introspectable",
+			 dbw_method (
+			     "Introspect",
+			     (DbwFunction)NULL,
+			     dbw_parameter_out (
+				 "data",
+				 dbw_type_string()),
+			     NULL),
+			 NULL));
+    
+    return object;
+}
+
+DbwInterface *
+dbw_interface (const char *name,
+	       DbwMember *member1,
+	       ...)
+{
+    DbwInterface *interface = g_new0 (DbwInterface, 1);
+    va_list parameters;
+    int i;
+
+    interface->name = g_strdup (name);
+    
+    va_start (parameters, member1);
+    interface->members = make_ptr_array (member1, parameters);
+    va_end (parameters);
+
+    for (i = 0; i < interface->members->len; ++i)
+    {
+	DbwMember *member = interface->members->pdata[i];
+
+	member->interface = interface;
+    }
+    
+    return interface;
+}
+
+static DbwType *
+type_copy (const DbwType *type)
+{
+    DbwType *copy = g_new0 (DbwType, 1);
+
+    copy->type = type->type;
+    
+    return copy;
+}
+
+
+DbwMember *
+dbw_method (const char *name,
+	    DbwFunction function,
+	    DbwParameter *parameter1,
+	    ...)
+{
+    DbwMember *member = g_new0 (DbwMember, 1);
+    va_list parameters;
+    Type *types;
+    int i;
+
+    member->name = g_strdup (name);
+    member->function = function;
+    
+    va_start (parameters, parameter1);
+    member->parameters = make_ptr_array ((DbwType *)parameter1, parameters);
+    va_end (parameters);
+
+    types = g_new0 (Type, member->parameters->len + 1);
+    types[0] = TYPE_POINTER; /* For object->data */
+    
+    for (i = 1; i < member->parameters->len; ++i)
+    {
+	DbwParameter *par = member->parameters->pdata[i - 1];
+	
+	if (par->out)
+	{
+	    types[i] = TYPE_POINTER;
+	}
+	else
+	{
+	    switch (par->type->type)
+	    {
+	    case INT32:
+		types[i] = TYPE_INT32;
+		break;
+	    case UINT32:
+		types[i] = TYPE_UINT32;
+		break;
+	    case STRING:
+		types[i] = TYPE_POINTER;
+		break;
+	    }
+	}
+    }
+
+    member->fun_def = fun_def_new ((Function)member->function,
+				   TYPE_INT,
+				   member->parameters->len + 1,
+				   types);
+    
+    return member;
+}
+
+static DbwParameter *
+make_parameter (const char *name,
+		const DbwType *type,
+		gboolean out)
+{
+    DbwParameter *parameter = g_new0 (DbwParameter, 1);
+
+    parameter->name = g_strdup (name);
+    parameter->type = type_copy (type);
+    parameter->out = out;
+    
+    return parameter;
+}    
+
+DbwParameter *
+dbw_parameter_in (const char *name,
+		  const DbwType *type)
+{
+    return make_parameter (name, type, FALSE);
+}
+
+DbwParameter *
+dbw_parameter_out (const char *name,
+		   const DbwType *type)
+{
+    return make_parameter (name, type, TRUE);
+}
+
+static DbwType *
+make_type (Type t)
+{
+    DbwType *type = idle_free (g_new0 (DbwType, 1));
+
+    type->type = t;
+    
+    return type;
+}
+
+const DbwType *
+dbw_type_int32 (void)
+{
+    return make_type (INT32);
+}
+
+const DbwType *
+dbw_type_uint32 (void)
+{
+    return make_type (UINT32);
+}
+
+const DbwType *
+dbw_type_string (void)
+{
+    return make_type (STRING);
+}
+
+/* Decomposes strings like this:
+ *
+ * /org.gnome.ScreenSaver.Throttle
+ *
+ */
+static gboolean
+decompose_method (const char *method_desc,
+		  char **object_path,
+		  char **interface,
+		  char **method)
+{
+    char *m;
+    
+    g_return_val_if_fail (method_desc != NULL, FALSE);
+    g_return_val_if_fail (strchr (method_desc, '/') != NULL, FALSE);
+    g_return_val_if_fail (strchr (method_desc, '.') != NULL, FALSE);
+
+    m = strrchr (method_desc, '/');
+    *object_path = g_strndup (method_desc, m - method_desc);
+    method_desc = m + 1;
+    
+    m = strrchr (method_desc, '.');
+    *interface = g_strndup (method_desc, m - method_desc);
+    method_desc = m;
+
+    *method = g_strdup (m + 1);
+    return TRUE;
+}
+
+void
+dbw_invoke (DbwService *service,
+	    const char *method_desc,
+	    DbwFunction callback,
+	    gpointer data,
+	    ...)
+{
+    char *object, *interface, *method;
+
+    decompose_method (method_desc, &object, &interface, &method);
+
+    g_print ("Path: %s\n", object);
+    g_print ("Interface: %s\n", interface);
+    g_print ("Method: %s\n", method);
+}
+
+#if 0
+void
+dbw_proxy_invoke (DbwProxy *proxy)
+{
+    
+}
+#endif
+
diff --git a/example.c b/example.c
index d8aa9bf..0a30d19 100644
--- a/example.c
+++ b/example.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "libnul.h"
+#include "invoke.h"
 
 int
 main ()
@@ -11,9 +11,9 @@ main ()
     };
     Arg ret;
     
-    FunDef *def = fun_def_new (TYPE_INT, 2, arg_types);
+    FunDef *def = fun_def_new ((Function)printf, TYPE_INT, 2, arg_types);
 
-    ret = fun_def_invoke (def, (Function)printf, args);
+    ret = fun_def_invoke (def, args);
 
     printf ("returned: %d\n", ret.v_int);
     
diff --git a/invoke.c b/invoke.c
index 565f564..e2bff05 100644
--- a/invoke.c
+++ b/invoke.c
@@ -2,11 +2,12 @@
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-#include "libnul.h"
 #include "ffi.h"
+#include "invoke.h"
 
 struct FunDef
 {
+    Function	fn;
     int		n_args;
     ffi_type   *ffi_ret_type;
     ffi_type  **ffi_arg_types;
@@ -50,9 +51,10 @@ ffi_type_from_type (Type type)
 }
 
 FunDef *
-fun_def_new (Type        ret_type,
-	     int         n_args,
-	     const Type *arg_types)
+fun_def_new (Function  f,
+	     Type      ret_type,
+	     int       n_args,
+	     Type     *arg_types)
 {
     FunDef *def = malloc (sizeof (FunDef));
     int i;
@@ -77,6 +79,7 @@ fun_def_new (Type        ret_type,
 
     def->ffi_ret_type = ffi_type_from_type (ret_type);
     
+    def->fn = f;
     def->n_args = n_args;
 
     ffi_prep_cif (&def->ffi_cif, FFI_DEFAULT_ABI, n_args, def->ffi_ret_type, def->ffi_arg_types);
@@ -85,9 +88,8 @@ fun_def_new (Type        ret_type,
 }
 
 Arg
-fun_def_invoke (FunDef    *fun,
-		Function   f,
-		Arg       *args)
+fun_def_invoke (FunDef   *fun,
+		Arg      *args)
 {
     void *stack_args[8];
     void **ffi_args;
@@ -102,7 +104,7 @@ fun_def_invoke (FunDef    *fun,
     for (i = 0; i < fun->n_args; ++i)
 	ffi_args[i] = &(args[i]);
 
-    ffi_call (&(fun->ffi_cif), f, &ret, ffi_args);
+    ffi_call (&(fun->ffi_cif), fun->fn, &ret, ffi_args);
 
     if (ffi_args != stack_args)
 	free (ffi_args);
diff --git a/libffi-3.0.5/.libs/libffi.a b/libffi-3.0.5/.libs/libffi.a
index 7f498b2..71a4848 100644
--- a/libffi-3.0.5/.libs/libffi.a
+++ b/libffi-3.0.5/.libs/libffi.a
diff --git a/libffi-3.0.5/.libs/libffi_convenience.a b/libffi-3.0.5/.libs/libffi_convenience.a
index ec13c5a..09a4578 100644
--- a/libffi-3.0.5/.libs/libffi_convenience.a
+++ b/libffi-3.0.5/.libs/libffi_convenience.a
diff --git a/libffi-3.0.5/Makefile b/libffi-3.0.5/Makefile
index 55726b8..87f9067 100644
--- a/libffi-3.0.5/Makefile
+++ b/libffi-3.0.5/Makefile
@@ -186,14 +186,14 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run aclocal-1.10
 ALLOCA = 
-AMTAR = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run tar
+AMTAR = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run tar
 AM_RUNTESTFLAGS = 
 AR = ar
-AUTOCONF = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run automake-1.10
+AUTOCONF = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run automake-1.10
 AWK = gawk
 CC = gcc
 CCAS = gcc
@@ -210,15 +210,14 @@ CXXFLAGS = -g -O2
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DSYMUTIL = 
 ECHO = echo
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
 EXEEXT = 
-F77 = 
-FFLAGS = 
+F77 = gfortran
+FFLAGS = -g -O2
 GREP = /bin/grep
 HAVE_LONG_DOUBLE = 1
 INSTALL = /usr/bin/install -c
@@ -233,9 +232,8 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
 LTLIBOBJS = 
 MAINT = 
-MAKEINFO = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NMEDIT = 
 OBJEXT = o
 PACKAGE = libffi
 PACKAGE_BUGREPORT = http://gcc.gnu.org/bugs.html
@@ -252,13 +250,13 @@ STRIP = strip
 TARGET = X86
 TARGETDIR = x86
 VERSION = 3.0.5
-abs_builddir = /home/ssp/vertigo/libnul/libffi-3.0.5
-abs_srcdir = /home/ssp/vertigo/libnul/libffi-3.0.5
-abs_top_builddir = /home/ssp/vertigo/libnul/libffi-3.0.5
-abs_top_srcdir = /home/ssp/vertigo/libnul/libffi-3.0.5
+abs_builddir = /home/ssp/libnul/libffi-3.0.5
+abs_srcdir = /home/ssp/libnul/libffi-3.0.5
+abs_top_builddir = /home/ssp/libnul/libffi-3.0.5
+abs_top_srcdir = /home/ssp/libnul/libffi-3.0.5
 ac_ct_CC = gcc
 ac_ct_CXX = g++
-ac_ct_F77 = 
+ac_ct_F77 = gfortran
 am__include = include
 am__leading_dot = .
 am__quote = 
@@ -284,7 +282,7 @@ host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/ssp/vertigo/libnul/libffi-3.0.5/install-sh
+install_sh = $(SHELL) /home/ssp/libnul/libffi-3.0.5/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/libffi-3.0.5/Makefile.in b/libffi-3.0.5/Makefile.in
index 3184ffe..4e5b72c 100644
--- a/libffi-3.0.5/Makefile.in
+++ b/libffi-3.0.5/Makefile.in
@@ -210,7 +210,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -235,7 +234,6 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/libffi-3.0.5/aclocal.m4 b/libffi-3.0.5/aclocal.m4
index 71eb60b..b503163 100644
--- a/libffi-3.0.5/aclocal.m4
+++ b/libffi-3.0.5/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 52 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -109,6 +109,7 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 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
@@ -210,8 +211,6 @@ file_magic*)
   ;;
 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)
@@ -291,80 +290,9 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm 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
 # ----------------------
@@ -690,11 +618,7 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
+      *)    LD="${LD-ld} -64" ;;
       esac
       ;;
     esac
@@ -787,7 +711,7 @@ AC_CACHE_CHECK([$1], [$2],
        $2=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -1058,7 +982,7 @@ else
     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="-ldld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -1066,7 +990,7 @@ else
 	    [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="-ldld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
 	      ])
 	    ])
 	  ])
@@ -1383,7 +1307,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[[4-9]]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1906,13 +1830,6 @@ esac
 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"
@@ -2412,7 +2329,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix[[4-9]]*)
+aix4* | aix5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2848,7 +2765,7 @@ aix3*)
   fi
   ;;
 
-aix[[4-9]]*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -2905,7 +2822,6 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
 _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
@@ -3015,7 +2931,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  aix[[4-9]]*)
+  aix4* | aix5*)
     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.
@@ -3028,7 +2944,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -3174,23 +3090,51 @@ case $host_os in
     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
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
+
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
       output_verbose_link_cmd='echo'
-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-      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}"
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
       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*)
@@ -3441,7 +3385,7 @@ case $host_os in
 	_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* | pgcpp*)
+      pgCC*)
         # 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'
@@ -3876,8 +3820,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 # 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_REQUIRE([LT_AC_PROG_SED])dnl
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
 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
@@ -4002,11 +3945,6 @@ fi
 
 $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
@@ -4063,6 +4001,7 @@ solaris*)
   ;;
 esac
 ])
+
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -4147,7 +4086,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix[[4-9]]*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -4324,7 +4263,6 @@ if test -f "$ltmain"; then
     _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) \
@@ -4387,7 +4325,7 @@ ifelse([$1], [],
 # 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, 2008
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4624,10 +4562,6 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 # 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)
@@ -4977,7 +4911,7 @@ EOF
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
-  rm -rf conftest* conftst*
+  rm -f conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -5034,8 +4968,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -5072,7 +5005,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     esac
   else
     case $host_os in
-      aix[[4-9]]*)
+      aix4* | aix5*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -5168,7 +5101,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  pgCC* | pgcpp*)
+	  pgCC*)
 	    # Portland Group C++ compiler.
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5319,8 +5252,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
 
     darwin* | rhapsody*)
@@ -5390,8 +5322,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -5528,7 +5459,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
 #
 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+    _LT_AC_TAGVAR(lt_prog_compiler_pic_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
      "" | " "*) ;;
@@ -5552,7 +5483,7 @@ esac
 #
 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5568,7 +5499,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix[[4-9]]*)
+  aix4* | aix5*)
     # 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
@@ -5587,7 +5518,6 @@ ifelse([$1],[CXX],[
     _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)=
@@ -5618,14 +5548,12 @@ ifelse([$1],[CXX],[
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
   # 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])
@@ -5675,7 +5603,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix[[3-9]]*)
+    aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5894,7 +5822,7 @@ _LT_EOF
       fi
       ;;
 
-    aix[[4-9]]*)
+    aix4* | aix5*)
       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.
@@ -5914,7 +5842,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -6074,10 +6002,11 @@ _LT_EOF
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+        _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}'
     else
       case $cc_basename in
         xlc*)
diff --git a/libffi-3.0.5/autom4te.cache/output.1 b/libffi-3.0.5/autom4te.cache/output.1
index a355416..5a7f125 100644
--- a/libffi-3.0.5/autom4te.cache/output.1
+++ b/libffi-3.0.5/autom4te.cache/output.1
@@ -867,8 +867,6 @@ LN_S
 ECHO
 AR
 RANLIB
-DSYMUTIL
-NMEDIT
 CPP
 CXX
 CXXFLAGS
@@ -4476,7 +4474,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix[4-9]*)
+aix4* | aix5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4865,11 +4863,7 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
+      *)    LD="${LD-ld} -64" ;;
       esac
       ;;
     esac
@@ -6471,6 +6465,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # 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; }
@@ -6785,7 +6780,7 @@ EOF
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
-  rm -rf conftest* conftst*
+  rm -f conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -7345,318 +7340,6 @@ fi
   ;;
 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
 
@@ -7722,7 +7405,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 
@@ -8024,10 +7707,10 @@ if test -n "$lt_prog_compiler_pic"; then
   
 { 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_cv_prog_compiler_pic_works+set}" = set; then
+if test "${lt_prog_compiler_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_pic_works=no
+  lt_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"
@@ -8051,16 +7734,16 @@ else
      $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_cv_prog_compiler_pic_works=yes
+       lt_prog_compiler_pic_works=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test x"$lt_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8087,10 +7770,10 @@ esac
 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_cv_prog_compiler_static_works+set}" = set; then
+if test "${lt_prog_compiler_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_static_works=no
+  lt_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -8103,20 +7786,20 @@ else
        $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_cv_prog_compiler_static_works=yes
+         lt_prog_compiler_static_works=yes
        fi
      else
-       lt_cv_prog_compiler_static_works=yes
+       lt_prog_compiler_static_works=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test x"$lt_prog_compiler_static_works" = xyes; then
     :
 else
     lt_prog_compiler_static=
@@ -8228,13 +7911,12 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # 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_|_GLOBAL__F[ID]_.*'
+  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
   # 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
@@ -8293,7 +7975,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix[3-9]*)
+    aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
@@ -8512,7 +8194,7 @@ _LT_EOF
       fi
       ;;
 
-    aix[4-9]*)
+    aix4* | aix5*)
       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.
@@ -8532,7 +8214,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -8804,10 +8486,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       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 $_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}"
+        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}'
     else
       case $cc_basename in
         xlc*)
@@ -9327,7 +9010,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9851,21 +9534,6 @@ esac
 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"
@@ -10185,7 +9853,7 @@ fi
 { 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="-ldld"
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
   { echo "$as_me:$LINENO: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -10461,7 +10129,7 @@ fi
 { 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="-ldld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
 
 	      
@@ -10737,7 +10405,7 @@ aix3*)
   fi
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -10793,7 +10461,6 @@ if test -f "$ltmain"; then
     predeps \
     postdeps \
     compiler_lib_search_path \
-    compiler_lib_search_dirs \
     archive_cmds \
     archive_expsym_cmds \
     postinstall_cmds \
@@ -10854,7 +10521,7 @@ echo "$as_me: creating $ofile" >&6;}
 # 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, 2008
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -11090,10 +10757,6 @@ predeps=$lt_predeps
 # shared library.
 postdeps=$lt_postdeps
 
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -11342,7 +11005,6 @@ postdep_objects_CXX=
 predeps_CXX=
 postdeps_CXX=
 compiler_lib_search_path_CXX=
-compiler_lib_search_dirs_CXX=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -11380,7 +11042,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -11587,7 +11249,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  aix[4-9]*)
+  aix4* | aix5*)
     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.
@@ -11600,7 +11262,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -11858,23 +11520,51 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     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
-      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
+
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
       output_verbose_link_cmd='echo'
-      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}"
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
       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*)
@@ -12125,7 +11815,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC* | pgcpp*)
+      pgCC*)
         # 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'
@@ -12532,6 +12222,7 @@ test "$ld_shlibs_CXX" = no && can_build_shared=no
 GCC_CXX="$GXX"
 LD_CXX="$LD"
 
+
 cat > conftest.$ac_ext <<EOF
 class Foo
 {
@@ -12633,11 +12324,6 @@ fi
 
 $rm -f confest.$objext
 
-compiler_lib_search_dirs_CXX=
-if test -n "$compiler_lib_search_path_CXX"; then
-  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
 # PORTME: override above test on systems where it is broken
 case $host_os in
 interix[3-9]*)
@@ -12693,6 +12379,7 @@ solaris*)
   ;;
 esac
 
+
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -12768,7 +12455,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   else
     case $host_os in
-      aix[4-9]*)
+      aix4* | aix5*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -12864,7 +12551,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  pgCC* | pgcpp*)
+	  pgCC*)
 	    # Portland Group C++ compiler.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-fpic'
@@ -12995,10 +12682,10 @@ if test -n "$lt_prog_compiler_pic_CXX"; then
   
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_pic_works_CXX=no
+  lt_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"
@@ -13022,16 +12709,16 @@ else
      $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_cv_prog_compiler_pic_works_CXX=yes
+       lt_prog_compiler_pic_works_CXX=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -13058,10 +12745,10 @@ esac
 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_cv_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_static_works_CXX=no
+  lt_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -13074,20 +12761,20 @@ else
        $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_cv_prog_compiler_static_works_CXX=yes
+         lt_prog_compiler_static_works_CXX=yes
        fi
      else
-       lt_cv_prog_compiler_static_works_CXX=yes
+       lt_prog_compiler_static_works_CXX=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
     :
 else
     lt_prog_compiler_static_CXX=
@@ -13172,7 +12859,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix[4-9]*)
+  aix4* | aix5*)
     # 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
@@ -13191,7 +12878,6 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     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; }
@@ -13293,7 +12979,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13816,21 +13502,6 @@ esac
 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"
@@ -13914,7 +13585,6 @@ if test -f "$ltmain"; then
     predeps_CXX \
     postdeps_CXX \
     compiler_lib_search_path_CXX \
-    compiler_lib_search_dirs_CXX \
     archive_cmds_CXX \
     archive_expsym_cmds_CXX \
     postinstall_cmds_CXX \
@@ -14163,10 +13833,6 @@ predeps=$lt_predeps_CXX
 # 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
@@ -14381,7 +14047,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -14419,7 +14085,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix[4-9]*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -14684,10 +14350,10 @@ if test -n "$lt_prog_compiler_pic_F77"; then
   
 { 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_cv_prog_compiler_pic_works_F77+set}" = set; then
+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_pic_works_F77=no
+  lt_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"
@@ -14711,16 +14377,16 @@ else
      $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_cv_prog_compiler_pic_works_F77=yes
+       lt_prog_compiler_pic_works_F77=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -14747,10 +14413,10 @@ esac
 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_cv_prog_compiler_static_works_F77+set}" = set; then
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_static_works_F77=no
+  lt_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -14763,20 +14429,20 @@ else
        $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_cv_prog_compiler_static_works_F77=yes
+         lt_prog_compiler_static_works_F77=yes
        fi
      else
-       lt_cv_prog_compiler_static_works_F77=yes
+       lt_prog_compiler_static_works_F77=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
     :
 else
     lt_prog_compiler_static_F77=
@@ -14888,13 +14554,12 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # 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_|_GLOBAL__F[ID]_.*'
+  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
   # 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
@@ -14953,7 +14618,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix[3-9]*)
+    aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_F77=no
@@ -15172,7 +14837,7 @@ _LT_EOF
       fi
       ;;
 
-    aix[4-9]*)
+    aix4* | aix5*)
       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.
@@ -15192,7 +14857,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -15444,10 +15109,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       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 $_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}"
+        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}'
     else
       case $cc_basename in
         xlc*)
@@ -15916,7 +15582,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16439,21 +16105,6 @@ esac
 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"
@@ -16537,7 +16188,6 @@ if test -f "$ltmain"; then
     predeps_F77 \
     postdeps_F77 \
     compiler_lib_search_path_F77 \
-    compiler_lib_search_dirs_F77 \
     archive_cmds_F77 \
     archive_expsym_cmds_F77 \
     postinstall_cmds_F77 \
@@ -16786,10 +16436,6 @@ predeps=$lt_predeps_F77
 # 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
@@ -16964,7 +16610,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -17077,7 +16723,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # 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*)
@@ -17147,7 +16793,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     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*)
@@ -17287,10 +16933,10 @@ if test -n "$lt_prog_compiler_pic_GCJ"; then
   
 { 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_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_pic_works_GCJ=no
+  lt_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"
@@ -17314,16 +16960,16 @@ else
      $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_cv_prog_compiler_pic_works_GCJ=yes
+       lt_prog_compiler_pic_works_GCJ=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -17350,10 +16996,10 @@ esac
 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_cv_prog_compiler_static_works_GCJ+set}" = set; then
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_static_works_GCJ=no
+  lt_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -17366,20 +17012,20 @@ else
        $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_cv_prog_compiler_static_works_GCJ=yes
+         lt_prog_compiler_static_works_GCJ=yes
        fi
      else
-       lt_cv_prog_compiler_static_works_GCJ=yes
+       lt_prog_compiler_static_works_GCJ=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
     :
 else
     lt_prog_compiler_static_GCJ=
@@ -17491,13 +17137,12 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # 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_|_GLOBAL__F[ID]_.*'
+  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
   # 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
@@ -17556,7 +17201,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix[3-9]*)
+    aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_GCJ=no
@@ -17775,7 +17420,7 @@ _LT_EOF
       fi
       ;;
 
-    aix[4-9]*)
+    aix4* | aix5*)
       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.
@@ -17795,7 +17440,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -18067,10 +17712,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       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 $_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}"
+        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}'
     else
       case $cc_basename in
         xlc*)
@@ -18539,7 +18185,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -19062,21 +18708,6 @@ esac
 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"
@@ -19160,7 +18791,6 @@ if test -f "$ltmain"; then
     predeps_GCJ \
     postdeps_GCJ \
     compiler_lib_search_path_GCJ \
-    compiler_lib_search_dirs_GCJ \
     archive_cmds_GCJ \
     archive_expsym_cmds_GCJ \
     postinstall_cmds_GCJ \
@@ -19409,10 +19039,6 @@ predeps=$lt_predeps_GCJ
 # 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
@@ -19586,7 +19212,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -19646,7 +19272,6 @@ if test -f "$ltmain"; then
     predeps_RC \
     postdeps_RC \
     compiler_lib_search_path_RC \
-    compiler_lib_search_dirs_RC \
     archive_cmds_RC \
     archive_expsym_cmds_RC \
     postinstall_cmds_RC \
@@ -19895,10 +19520,6 @@ predeps=$lt_predeps_RC
 # 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
@@ -24086,8 +23707,6 @@ for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
 AR!$AR$ac_delim
 RANLIB!$RANLIB$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
 CPP!$CPP$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
@@ -24164,7 +23783,7 @@ LIB@&t@OBJS!$LIB@&t@OBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/libffi-3.0.5/autom4te.cache/requests b/libffi-3.0.5/autom4te.cache/requests
index f5b03f2..ae9d808 100644
--- a/libffi-3.0.5/autom4te.cache/requests
+++ b/libffi-3.0.5/autom4te.cache/requests
@@ -37,20 +37,20 @@
                       ],
                       {
                         '_LT_AC_TAGCONFIG' => 1,
-                        'm4_pattern_forbid' => 1,
                         'AM_ENABLE_STATIC' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'm4_pattern_forbid' => 1,
                         'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
                         '_LT_AC_SHELL_INIT' => 1,
                         'AC_DISABLE_SHARED' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
                         'AC_DEFUN' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
                         'AC_PROG_LIBTOOL' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
                         'AM_PROG_MKDIR_P' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         'AM_MISSING_HAS_RUN' => 1,
                         'AM_MISSING_PROG' => 1,
@@ -61,8 +61,8 @@
                         'AM_PROG_INSTALL_STRIP' => 1,
                         '_m4_warn' => 1,
                         'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
                         'AM_SANITY_CHECK' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
                         'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
                         '_LT_AC_CHECK_DLFCN' => 1,
@@ -70,27 +70,27 @@
                         'AC_LIBTOOL_CXX' => 1,
                         'LT_AC_PROG_RC' => 1,
                         '_AM_PROG_TAR' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
                         'AC_LIBTOOL_GCJ' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
                         'AM_DEP_TRACK' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AM_DISABLE_STATIC' => 1,
                         '_AC_PROG_LIBTOOL' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
                         '_LT_AC_LANG_F77' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
                         '_AM_IF_OPTION' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'm4_pattern_allow' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
                         'AC_LIBTOOL_F77' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'm4_pattern_allow' => 1,
                         'AM_DISABLE_SHARED' => 1,
                         'AM_SET_LEADING_DOT' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
                         '_LT_AC_LANG_CXX' => 1,
-                        'AM_PROG_LD' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
                         '_AM_DEPENDENCIES' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AM_PROG_LD' => 1,
                         'AC_LIBTOOL_LANG_C_CONFIG' => 1,
                         '_LT_AC_SYS_COMPILER' => 1,
                         'AM_PROG_NM' => 1,
@@ -102,14 +102,14 @@
                         'AC_PROG_LD_GNU' => 1,
                         'AC_ENABLE_FAST_INSTALL' => 1,
                         'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'jm_MAINTAINER_MODE' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
                         'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'jm_MAINTAINER_MODE' => 1,
                         'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
                         '_AM_SET_OPTION' => 1,
                         '_LT_LINKER_BOILERPLATE' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
                         'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AC_DISABLE_STATIC' => 1,
                         'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
@@ -119,43 +119,43 @@
                         '_LT_AC_LANG_RC_CONFIG' => 1,
                         '_LT_AC_LANG_GCJ' => 1,
                         'AC_LIBTOOL_RC' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
                         '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
                         'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'include' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
                         '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'include' => 1,
                         'LT_AC_PROG_SED' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AM_PROG_AS' => 1,
                         'AC_FUNC_MMAP_BLACKLIST' => 1,
+                        'AM_PROG_AS' => 1,
+                        'AM_ENABLE_SHARED' => 1,
                         'AM_AUX_DIR_EXPAND' => 1,
                         '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
                         'AC_ENABLE_SHARED' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
                         '_AM_SET_OPTIONS' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'AM_RUN_LOG' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'AC_LIBTOOL_PICMODE' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'AC_ENABLE_STATIC' => 1,
                         '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        '_LT_AC_TAGVAR' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_CHECK_LIBM' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
                         '_AM_MANGLE_OPTION' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
                         'AM_CONDITIONAL' => 1,
                         'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
                         'AM_SET_DEPDIR' => 1,
-                        'm4_include' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
                         '_LT_CC_BASENAME' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'm4_include' => 1,
                         'AC_PROG_EGREP' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AC_PATH_MAGIC' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AM_MAKE_INCLUDE' => 1
                       }
                     ], 'Autom4te::Request' ),
@@ -171,15 +171,15 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_PROG_F77_C_O' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
-                        'AC_INIT' => 1,
+                        'AM_PROG_F77_C_O' => 1,
                         'm4_pattern_forbid' => 1,
+                        'AC_INIT' => 1,
                         'AC_CANONICAL_TARGET' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_SUBST' => 1,
-                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_FC_SRCEXT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
@@ -187,8 +187,8 @@
                         'LT_CONFIG_LTDL_DIR' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_CONFIG_LINKS' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
                         'm4_sinclude' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
                         '_m4_warn' => 1,
@@ -205,11 +205,11 @@
                         'AH_OUTPUT' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'm4_pattern_allow' => 1,
                         'sinclude' => 1,
-                        'AM_CONDITIONAL' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_PROG_CC_C_O' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'm4_include' => 1,
diff --git a/libffi-3.0.5/autom4te.cache/traces.1 b/libffi-3.0.5/autom4te.cache/traces.1
index 610471f..ec3d277 100644
--- a/libffi-3.0.5/autom4te.cache/traces.1
+++ b/libffi-3.0.5/autom4te.cache/traces.1
@@ -1,4 +1,4 @@
-m4trace:aclocal.m4:7593: -1- m4_include([acinclude.m4])
+m4trace:aclocal.m4:7522: -1- m4_include([acinclude.m4])
 m4trace:configure.ac:5: -1- AC_INIT([libffi], [3.0.5], [http://gcc.gnu.org/bugs.html])
 m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:5: -1- m4_pattern_forbid([_AC_])
@@ -208,8 +208,8 @@ m4trace:configure.ac:13: -1- AC_SUBST_TRACE([CYGPATH_W])
 m4trace:configure.ac:13: -1- m4_pattern_allow([^CYGPATH_W$])
 m4trace:configure.ac:13: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from...
-aclocal.m4:7396: _AM_SET_OPTIONS is expanded from...
-aclocal.m4:7059: AM_INIT_AUTOMAKE is expanded from...
+aclocal.m4:7325: _AM_SET_OPTIONS is expanded from...
+aclocal.m4:6988: AM_INIT_AUTOMAKE is expanded from...
 configure.ac:13: the top level])
 m4trace:configure.ac:13: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
 m4trace:configure.ac:13: -1- AC_SUBST_TRACE([PACKAGE])
@@ -377,7 +377,7 @@ m4trace:configure.ac:29: -1- AC_PROG_LIBTOOL
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 ../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from...
-aclocal.m4:2048: AC_ENABLE_SHARED is expanded from...
+aclocal.m4:1965: AC_ENABLE_SHARED is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
@@ -385,7 +385,7 @@ configure.ac:29: the top level])
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 ../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from...
-aclocal.m4:2087: AC_ENABLE_STATIC is expanded from...
+aclocal.m4:2004: AC_ENABLE_STATIC is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
@@ -393,7 +393,7 @@ configure.ac:29: the top level])
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 ../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from...
-aclocal.m4:2126: AC_ENABLE_FAST_INSTALL is expanded from...
+aclocal.m4:2043: AC_ENABLE_FAST_INSTALL is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
@@ -401,7 +401,7 @@ configure.ac:29: the top level])
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 ../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from...
-aclocal.m4:2267: AC_PROG_LD is expanded from...
+aclocal.m4:2184: AC_PROG_LD is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
@@ -436,12 +436,6 @@ m4trace:configure.ac:29: -1- m4_pattern_allow([^RANLIB$])
 m4trace:configure.ac:29: -1- AC_SUBST([STRIP])
 m4trace:configure.ac:29: -1- AC_SUBST_TRACE([STRIP])
 m4trace:configure.ac:29: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:29: -1- AC_SUBST([DSYMUTIL])
-m4trace:configure.ac:29: -1- AC_SUBST_TRACE([DSYMUTIL])
-m4trace:configure.ac:29: -1- m4_pattern_allow([^DSYMUTIL$])
-m4trace:configure.ac:29: -1- AC_SUBST([NMEDIT])
-m4trace:configure.ac:29: -1- AC_SUBST_TRACE([NMEDIT])
-m4trace:configure.ac:29: -1- m4_pattern_allow([^NMEDIT$])
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 ../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from...
@@ -461,10 +455,10 @@ You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is
 ../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from...
-aclocal.m4:565: _LT_AC_LOCK is expanded from...
-aclocal.m4:1186: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
-aclocal.m4:2800: _LT_AC_LANG_C_CONFIG is expanded from...
-aclocal.m4:2799: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
+aclocal.m4:493: _LT_AC_LOCK is expanded from...
+aclocal.m4:1110: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
+aclocal.m4:2717: _LT_AC_LANG_C_CONFIG is expanded from...
+aclocal.m4:2716: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
@@ -506,17 +500,17 @@ m4trace:configure.ac:29: -1- _LT_AC_TAGCONFIG
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
 ../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from...
-aclocal.m4:1925: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1842: _LT_AC_TAGCONFIG is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
 configure.ac:29: the top level])
-m4trace:configure.ac:29: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:1925: _LT_AC_TAGCONFIG is expanded from...
+m4trace:configure.ac:29: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:1842: _LT_AC_TAGCONFIG is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
 configure.ac:29: the top level])
-m4trace:configure.ac:29: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:1925: _LT_AC_TAGCONFIG is expanded from...
+m4trace:configure.ac:29: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:1842: _LT_AC_TAGCONFIG is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
@@ -585,36 +579,36 @@ m4trace:configure.ac:29: -1- AC_SUBST_TRACE([ac_ct_F77])
 m4trace:configure.ac:29: -1- m4_pattern_allow([^ac_ct_F77$])
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from...
-aclocal.m4:4186: _LT_AC_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:4185: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:1925: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:4125: _LT_AC_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:4124: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:1842: _LT_AC_TAGCONFIG is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
 configure.ac:29: the top level])
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from...
-aclocal.m4:4186: _LT_AC_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:4185: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:1925: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:4125: _LT_AC_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:4124: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:1842: _LT_AC_TAGCONFIG is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
 configure.ac:29: the top level])
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from...
-aclocal.m4:4242: _LT_AC_LANG_RC_CONFIG is expanded from...
-aclocal.m4:4241: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
-aclocal.m4:1925: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:4181: _LT_AC_LANG_RC_CONFIG is expanded from...
+aclocal.m4:4180: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
+aclocal.m4:1842: _LT_AC_TAGCONFIG is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
 configure.ac:29: the top level])
 m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from...
-aclocal.m4:4242: _LT_AC_LANG_RC_CONFIG is expanded from...
-aclocal.m4:4241: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
-aclocal.m4:1925: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:4181: _LT_AC_LANG_RC_CONFIG is expanded from...
+aclocal.m4:4180: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
+aclocal.m4:1842: _LT_AC_TAGCONFIG is expanded from...
 aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
 aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
 aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
diff --git a/libffi-3.0.5/config.log b/libffi-3.0.5/config.log
index ee8c8a8..6b4712d 100644
--- a/libffi-3.0.5/config.log
+++ b/libffi-3.0.5/config.log
@@ -10,11 +10,11 @@ generated by GNU Autoconf 2.61.  Invocation command line was
 ## Platform. ##
 ## --------- ##
 
-hostname = dhcp-100-3-183.bos.redhat.com
+hostname = localhost.localdomain
 uname -m = i686
-uname -r = 2.6.27-0.244.rc2.git1.fc10.i686
+uname -r = 2.6.27-rc2
 uname -s = Linux
-uname -v = #1 SMP Fri Aug 8 13:26:20 EDT 2008
+uname -v = #46 SMP Wed Aug 6 20:38:44 EDT 2008
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -35,143 +35,132 @@ PATH: .
 PATH: /home/ssp/bin
 PATH: /usr/j2sdk/j2sdk1.4.2/bin/
 PATH: /home/ssp/usr/bin/
-PATH: .
-PATH: /home/ssp/bin
-PATH: /usr/j2sdk/j2sdk1.4.2/bin/
-PATH: /home/ssp/usr/bin/
 PATH: /usr/kerberos/bin
-PATH: .
-PATH: /home/ssp/bin
-PATH: /usr/j2sdk/j2sdk1.4.2/bin/
-PATH: /home/ssp/usr/bin/
+PATH: /usr/lib/ccache
 PATH: /usr/local/bin
-PATH: /usr/bin
 PATH: /bin
+PATH: /usr/bin
 PATH: /usr/X11R6/bin
 PATH: /sbin
 PATH: /usr/sbin
 PATH: /sbin
 PATH: /usr/sbin
-PATH: /sbin
-PATH: /usr/sbin
-PATH: /sbin
-PATH: /usr/sbin
 
 
 ## ----------- ##
 ## Core tests. ##
 ## ----------- ##
 
-configure:2052: checking build system type
-configure:2070: result: i686-pc-linux-gnu
-configure:2092: checking host system type
-configure:2107: result: i686-pc-linux-gnu
-configure:2129: checking target system type
-configure:2144: result: i686-pc-linux-gnu
-configure:2191: checking for a BSD-compatible install
-configure:2247: result: /usr/bin/install -c
-configure:2258: checking whether build environment is sane
-configure:2301: result: yes
-configure:2329: checking for a thread-safe mkdir -p
-configure:2368: result: /bin/mkdir -p
-configure:2381: checking for gawk
-configure:2397: found /usr/bin/gawk
-configure:2408: result: gawk
-configure:2419: checking whether make sets $(MAKE)
-configure:2440: result: yes
-configure:2684: checking for gcc
-configure:2700: found /usr/bin/gcc
-configure:2711: result: gcc
-configure:2949: checking for C compiler version
-configure:2956: gcc --version >&5
-gcc (GCC) 4.3.1 20080801 (Red Hat 4.3.1-6)
+configure:2050: checking build system type
+configure:2068: result: i686-pc-linux-gnu
+configure:2090: checking host system type
+configure:2105: result: i686-pc-linux-gnu
+configure:2127: checking target system type
+configure:2142: result: i686-pc-linux-gnu
+configure:2189: checking for a BSD-compatible install
+configure:2245: result: /usr/bin/install -c
+configure:2256: checking whether build environment is sane
+configure:2299: result: yes
+configure:2327: checking for a thread-safe mkdir -p
+configure:2366: result: /bin/mkdir -p
+configure:2379: checking for gawk
+configure:2395: found /bin/gawk
+configure:2406: result: gawk
+configure:2417: checking whether make sets $(MAKE)
+configure:2438: result: yes
+configure:2682: checking for gcc
+configure:2698: found /usr/lib/ccache/gcc
+configure:2709: result: gcc
+configure:2947: checking for C compiler version
+configure:2954: gcc --version >&5
+gcc (GCC) 4.3.0 20080428 (Red Hat 4.3.0-8)
 Copyright (C) 2008 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:2959: $? = 0
-configure:2966: gcc -v >&5
+configure:2957: $? = 0
+configure:2964: gcc -v >&5
 Using built-in specs.
 Target: i386-redhat-linux
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-cpu=generic --build=i386-redhat-linux
 Thread model: posix
-gcc version 4.3.1 20080801 (Red Hat 4.3.1-6) (GCC) 
-configure:2969: $? = 0
-configure:2976: gcc -V >&5
+gcc version 4.3.0 20080428 (Red Hat 4.3.0-8) (GCC) 
+configure:2967: $? = 0
+configure:2974: gcc -V >&5
 gcc: '-V' option must have argument
-configure:2979: $? = 1
-configure:3002: checking for C compiler default output file name
-configure:3029: gcc    conftest.c  >&5
-configure:3032: $? = 0
-configure:3070: result: a.out
-configure:3087: checking whether the C compiler works
-configure:3097: ./a.out
-configure:3100: $? = 0
-configure:3117: result: yes
-configure:3124: checking whether we are cross compiling
-configure:3126: result: no
-configure:3129: checking for suffix of executables
-configure:3136: gcc -o conftest    conftest.c  >&5
-configure:3139: $? = 0
-configure:3163: result: 
-configure:3169: checking for suffix of object files
-configure:3195: gcc -c   conftest.c >&5
-configure:3198: $? = 0
-configure:3221: result: o
-configure:3225: checking whether we are using the GNU C compiler
-configure:3254: gcc -c   conftest.c >&5
-configure:3260: $? = 0
-configure:3277: result: yes
-configure:3282: checking whether gcc accepts -g
-configure:3312: gcc -c -g  conftest.c >&5
-configure:3318: $? = 0
-configure:3417: result: yes
-configure:3434: checking for gcc option to accept ISO C89
-configure:3508: gcc  -c -g -O2  conftest.c >&5
-configure:3514: $? = 0
-configure:3537: result: none needed
-configure:3566: checking for style of include used by make
-configure:3594: result: GNU
-configure:3619: checking dependency style of gcc
-configure:3710: result: gcc3
-configure:3738: checking dependency style of gcc
-configure:3829: result: gcc3
-configure:3845: checking whether gcc and cc understand -c and -o together
-configure:3880: gcc -c conftest.c -o conftest2.o >&5
-configure:3883: $? = 0
-configure:3889: gcc -c conftest.c -o conftest2.o >&5
-configure:3892: $? = 0
-configure:3903: cc -c conftest.c >&5
-configure:3906: $? = 0
-configure:3914: cc -c conftest.c -o conftest2.o >&5
-configure:3917: $? = 0
-configure:3923: cc -c conftest.c -o conftest2.o >&5
-configure:3926: $? = 0
-configure:3944: result: yes
-configure:4042: checking for a sed that does not truncate output
-configure:4098: result: /bin/sed
-configure:4101: checking for grep that handles long lines and -e
-configure:4175: result: /bin/grep
-configure:4180: checking for egrep
-configure:4258: result: /bin/grep -E
-configure:4274: checking for ld used by gcc
-configure:4341: result: /usr/bin/ld
-configure:4350: checking if the linker (/usr/bin/ld) is GNU ld
-configure:4365: result: yes
-configure:4370: checking for /usr/bin/ld option to reload object files
-configure:4377: result: -r
-configure:4395: checking for BSD-compatible nm
-configure:4444: result: /usr/bin/nm -B
-configure:4448: checking whether ln -s works
-configure:4452: result: yes
-configure:4459: checking how to recognize dependent libraries
-configure:4645: result: pass_all
-configure:4891: checking how to run the C preprocessor
-configure:4931: gcc -E  conftest.c
-configure:4937: $? = 0
-configure:4968: gcc -E  conftest.c
+configure:2977: $? = 1
+configure:3000: checking for C compiler default output file name
+configure:3027: gcc    conftest.c  >&5
+configure:3030: $? = 0
+configure:3068: result: a.out
+configure:3085: checking whether the C compiler works
+configure:3095: ./a.out
+configure:3098: $? = 0
+configure:3115: result: yes
+configure:3122: checking whether we are cross compiling
+configure:3124: result: no
+configure:3127: checking for suffix of executables
+configure:3134: gcc -o conftest    conftest.c  >&5
+configure:3137: $? = 0
+configure:3161: result: 
+configure:3167: checking for suffix of object files
+configure:3193: gcc -c   conftest.c >&5
+configure:3196: $? = 0
+configure:3219: result: o
+configure:3223: checking whether we are using the GNU C compiler
+configure:3252: gcc -c   conftest.c >&5
+configure:3258: $? = 0
+configure:3275: result: yes
+configure:3280: checking whether gcc accepts -g
+configure:3310: gcc -c -g  conftest.c >&5
+configure:3316: $? = 0
+configure:3415: result: yes
+configure:3432: checking for gcc option to accept ISO C89
+configure:3506: gcc  -c -g -O2  conftest.c >&5
+configure:3512: $? = 0
+configure:3535: result: none needed
+configure:3564: checking for style of include used by make
+configure:3592: result: GNU
+configure:3617: checking dependency style of gcc
+configure:3708: result: gcc3
+configure:3736: checking dependency style of gcc
+configure:3827: result: gcc3
+configure:3843: checking whether gcc and cc understand -c and -o together
+configure:3878: gcc -c conftest.c -o conftest2.o >&5
+configure:3881: $? = 0
+configure:3887: gcc -c conftest.c -o conftest2.o >&5
+configure:3890: $? = 0
+configure:3901: cc -c conftest.c >&5
+configure:3904: $? = 0
+configure:3912: cc -c conftest.c -o conftest2.o >&5
+configure:3915: $? = 0
+configure:3921: cc -c conftest.c -o conftest2.o >&5
+configure:3924: $? = 0
+configure:3942: result: yes
+configure:4040: checking for a sed that does not truncate output
+configure:4096: result: /bin/sed
+configure:4099: checking for grep that handles long lines and -e
+configure:4173: result: /bin/grep
+configure:4178: checking for egrep
+configure:4256: result: /bin/grep -E
+configure:4272: checking for ld used by gcc
+configure:4339: result: /usr/bin/ld
+configure:4348: checking if the linker (/usr/bin/ld) is GNU ld
+configure:4363: result: yes
+configure:4368: checking for /usr/bin/ld option to reload object files
+configure:4375: result: -r
+configure:4393: checking for BSD-compatible nm
+configure:4442: result: /usr/bin/nm -B
+configure:4446: checking whether ln -s works
+configure:4450: result: yes
+configure:4457: checking how to recognize dependent libraries
+configure:4643: result: pass_all
+configure:4885: checking how to run the C preprocessor
+configure:4925: gcc -E  conftest.c
+configure:4931: $? = 0
+configure:4962: gcc -E  conftest.c
 conftest.c:10:28: error: ac_nonexistent.h: No such file or directory
-configure:4974: $? = 1
+configure:4968: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "libffi"
@@ -183,12 +172,12 @@ configure: failed program was:
 | #define VERSION "3.0.5"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:5007: result: gcc -E
-configure:5036: gcc -E  conftest.c
-configure:5042: $? = 0
-configure:5073: gcc -E  conftest.c
+configure:5001: result: gcc -E
+configure:5030: gcc -E  conftest.c
+configure:5036: $? = 0
+configure:5067: gcc -E  conftest.c
 conftest.c:10:28: error: ac_nonexistent.h: No such file or directory
-configure:5079: $? = 1
+configure:5073: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "libffi"
@@ -200,97 +189,97 @@ configure: failed program was:
 | #define VERSION "3.0.5"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:5117: checking for ANSI C header files
-configure:5147: gcc -c -g -O2  conftest.c >&5
-configure:5153: $? = 0
-configure:5252: gcc -o conftest -g -O2   conftest.c  >&5
-configure:5255: $? = 0
-configure:5261: ./conftest
-configure:5264: $? = 0
-configure:5281: result: yes
-configure:5305: checking for sys/types.h
-configure:5326: gcc -c -g -O2  conftest.c >&5
-configure:5332: $? = 0
-configure:5348: result: yes
-configure:5305: checking for sys/stat.h
-configure:5326: gcc -c -g -O2  conftest.c >&5
-configure:5332: $? = 0
-configure:5348: result: yes
-configure:5305: checking for stdlib.h
-configure:5326: gcc -c -g -O2  conftest.c >&5
-configure:5332: $? = 0
-configure:5348: result: yes
-configure:5305: checking for string.h
-configure:5326: gcc -c -g -O2  conftest.c >&5
-configure:5332: $? = 0
-configure:5348: result: yes
-configure:5305: checking for memory.h
-configure:5326: gcc -c -g -O2  conftest.c >&5
-configure:5332: $? = 0
-configure:5348: result: yes
-configure:5305: checking for strings.h
-configure:5326: gcc -c -g -O2  conftest.c >&5
-configure:5332: $? = 0
-configure:5348: result: yes
-configure:5305: checking for inttypes.h
-configure:5326: gcc -c -g -O2  conftest.c >&5
-configure:5332: $? = 0
-configure:5348: result: yes
-configure:5305: checking for stdint.h
-configure:5326: gcc -c -g -O2  conftest.c >&5
-configure:5332: $? = 0
-configure:5348: result: yes
-configure:5305: checking for unistd.h
-configure:5326: gcc -c -g -O2  conftest.c >&5
-configure:5332: $? = 0
-configure:5348: result: yes
-configure:5375: checking dlfcn.h usability
-configure:5392: gcc -c -g -O2  conftest.c >&5
-configure:5398: $? = 0
-configure:5412: result: yes
-configure:5416: checking dlfcn.h presence
-configure:5431: gcc -E  conftest.c
-configure:5437: $? = 0
-configure:5451: result: yes
-configure:5484: checking for dlfcn.h
-configure:5492: result: yes
-configure:5563: checking for g++
-configure:5579: found /usr/bin/g++
-configure:5590: result: g++
-configure:5621: checking for C++ compiler version
-configure:5628: g++ --version >&5
-g++ (GCC) 4.3.1 20080801 (Red Hat 4.3.1-6)
+configure:5111: checking for ANSI C header files
+configure:5141: gcc -c -g -O2  conftest.c >&5
+configure:5147: $? = 0
+configure:5246: gcc -o conftest -g -O2   conftest.c  >&5
+configure:5249: $? = 0
+configure:5255: ./conftest
+configure:5258: $? = 0
+configure:5275: result: yes
+configure:5299: checking for sys/types.h
+configure:5320: gcc -c -g -O2  conftest.c >&5
+configure:5326: $? = 0
+configure:5342: result: yes
+configure:5299: checking for sys/stat.h
+configure:5320: gcc -c -g -O2  conftest.c >&5
+configure:5326: $? = 0
+configure:5342: result: yes
+configure:5299: checking for stdlib.h
+configure:5320: gcc -c -g -O2  conftest.c >&5
+configure:5326: $? = 0
+configure:5342: result: yes
+configure:5299: checking for string.h
+configure:5320: gcc -c -g -O2  conftest.c >&5
+configure:5326: $? = 0
+configure:5342: result: yes
+configure:5299: checking for memory.h
+configure:5320: gcc -c -g -O2  conftest.c >&5
+configure:5326: $? = 0
+configure:5342: result: yes
+configure:5299: checking for strings.h
+configure:5320: gcc -c -g -O2  conftest.c >&5
+configure:5326: $? = 0
+configure:5342: result: yes
+configure:5299: checking for inttypes.h
+configure:5320: gcc -c -g -O2  conftest.c >&5
+configure:5326: $? = 0
+configure:5342: result: yes
+configure:5299: checking for stdint.h
+configure:5320: gcc -c -g -O2  conftest.c >&5
+configure:5326: $? = 0
+configure:5342: result: yes
+configure:5299: checking for unistd.h
+configure:5320: gcc -c -g -O2  conftest.c >&5
+configure:5326: $? = 0
+configure:5342: result: yes
+configure:5369: checking dlfcn.h usability
+configure:5386: gcc -c -g -O2  conftest.c >&5
+configure:5392: $? = 0
+configure:5406: result: yes
+configure:5410: checking dlfcn.h presence
+configure:5425: gcc -E  conftest.c
+configure:5431: $? = 0
+configure:5445: result: yes
+configure:5478: checking for dlfcn.h
+configure:5486: result: yes
+configure:5557: checking for g++
+configure:5573: found /usr/lib/ccache/g++
+configure:5584: result: g++
+configure:5615: checking for C++ compiler version
+configure:5622: g++ --version >&5
+g++ (GCC) 4.3.0 20080428 (Red Hat 4.3.0-8)
 Copyright (C) 2008 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:5631: $? = 0
-configure:5638: g++ -v >&5
+configure:5625: $? = 0
+configure:5632: g++ -v >&5
 Using built-in specs.
 Target: i386-redhat-linux
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-cpu=generic --build=i386-redhat-linux
 Thread model: posix
-gcc version 4.3.1 20080801 (Red Hat 4.3.1-6) (GCC) 
-configure:5641: $? = 0
-configure:5648: g++ -V >&5
+gcc version 4.3.0 20080428 (Red Hat 4.3.0-8) (GCC) 
+configure:5635: $? = 0
+configure:5642: g++ -V >&5
 g++: '-V' option must have argument
-configure:5651: $? = 1
-configure:5654: checking whether we are using the GNU C++ compiler
-configure:5683: g++ -c   conftest.cpp >&5
-configure:5689: $? = 0
-configure:5706: result: yes
-configure:5711: checking whether g++ accepts -g
-configure:5741: g++ -c -g  conftest.cpp >&5
-configure:5747: $? = 0
-configure:5846: result: yes
-configure:5871: checking dependency style of g++
-configure:5962: result: gcc3
-configure:5987: checking how to run the C++ preprocessor
-configure:6023: g++ -E  conftest.cpp
-configure:6029: $? = 0
-configure:6060: g++ -E  conftest.cpp
+configure:5645: $? = 1
+configure:5648: checking whether we are using the GNU C++ compiler
+configure:5677: g++ -c   conftest.cpp >&5
+configure:5683: $? = 0
+configure:5700: result: yes
+configure:5705: checking whether g++ accepts -g
+configure:5735: g++ -c -g  conftest.cpp >&5
+configure:5741: $? = 0
+configure:5840: result: yes
+configure:5865: checking dependency style of g++
+configure:5956: result: gcc3
+configure:5981: checking how to run the C++ preprocessor
+configure:6017: g++ -E  conftest.cpp
+configure:6023: $? = 0
+configure:6054: g++ -E  conftest.cpp
 conftest.cpp:21:28: error: ac_nonexistent.h: No such file or directory
-configure:6066: $? = 1
+configure:6060: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "libffi"
@@ -313,12 +302,12 @@ configure: failed program was:
 | #define HAVE_DLFCN_H 1
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:6099: result: g++ -E
-configure:6128: g++ -E  conftest.cpp
-configure:6134: $? = 0
-configure:6165: g++ -E  conftest.cpp
+configure:6093: result: g++ -E
+configure:6122: g++ -E  conftest.cpp
+configure:6128: $? = 0
+configure:6159: g++ -E  conftest.cpp
 conftest.cpp:21:28: error: ac_nonexistent.h: No such file or directory
-configure:6171: $? = 1
+configure:6165: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "libffi"
@@ -341,247 +330,251 @@ configure: failed program was:
 | #define HAVE_DLFCN_H 1
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:6264: checking for g77
-configure:6294: result: no
-configure:6264: checking for xlf
-configure:6294: result: no
-configure:6264: checking for f77
-configure:6294: result: no
-configure:6264: checking for frt
-configure:6294: result: no
-configure:6264: checking for pgf77
-configure:6294: result: no
-configure:6264: checking for cf77
-configure:6294: result: no
-configure:6264: checking for fort77
-configure:6294: result: no
-configure:6264: checking for fl32
-configure:6294: result: no
-configure:6264: checking for af77
-configure:6294: result: no
-configure:6264: checking for xlf90
-configure:6294: result: no
-configure:6264: checking for f90
-configure:6294: result: no
-configure:6264: checking for pgf90
-configure:6294: result: no
-configure:6264: checking for pghpf
-configure:6294: result: no
-configure:6264: checking for epcf90
-configure:6294: result: no
-configure:6264: checking for gfortran
-configure:6294: result: no
-configure:6264: checking for g95
-configure:6294: result: no
-configure:6264: checking for xlf95
-configure:6294: result: no
-configure:6264: checking for f95
-configure:6294: result: no
-configure:6264: checking for fort
-configure:6294: result: no
-configure:6264: checking for ifort
-configure:6294: result: no
-configure:6264: checking for ifc
-configure:6294: result: no
-configure:6264: checking for efc
-configure:6294: result: no
-configure:6264: checking for pgf95
-configure:6294: result: no
-configure:6264: checking for lf95
-configure:6294: result: no
-configure:6264: checking for ftn
-configure:6294: result: no
-configure:6321: checking for Fortran 77 compiler version
-configure:6328:  --version >&5
-./configure: line 6329: --version: command not found
-configure:6331: $? = 127
-configure:6338:  -v >&5
-./configure: line 6339: -v: command not found
-configure:6341: $? = 127
-configure:6348:  -V >&5
-./configure: line 6349: -V: command not found
-configure:6351: $? = 127
-configure:6359: checking whether we are using the GNU Fortran 77 compiler
-configure:6378:  -c  conftest.F >&5
-./configure: line 6379: -c: command not found
-configure:6384: $? = 127
-configure: failed program was:
-|       program main
-| #ifndef __GNUC__
-|        choke me
-| #endif
-| 
-|       end
-configure:6401: result: no
-configure:6407: checking whether  accepts -g
-configure:6424:  -c -g conftest.f >&5
-./configure: line 6425: -c: command not found
-configure:6430: $? = 127
-configure: failed program was:
-|       program main
-| 
-|       end
-configure:6446: result: no
-configure:6475: checking the maximum length of command line arguments
-configure:6587: result: 1572864
-configure:6599: checking command to parse /usr/bin/nm -B output from gcc object
-configure:6704: gcc -c -g -O2  conftest.c >&5
-configure:6707: $? = 0
-configure:6711: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ 	]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
-configure:6714: $? = 0
-configure:6766: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
-configure:6769: $? = 0
-configure:6807: result: ok
-configure:6811: checking for objdir
-configure:6826: result: .libs
-configure:6918: checking for ar
-configure:6934: found /usr/bin/ar
-configure:6945: result: ar
-configure:7014: checking for ranlib
-configure:7030: found /usr/bin/ranlib
-configure:7041: result: ranlib
-configure:7110: checking for strip
-configure:7126: found /usr/bin/strip
-configure:7137: result: strip
-configure:7735: checking if gcc supports -fno-rtti -fno-exceptions
-configure:7753: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
+configure:6258: checking for g77
+configure:6288: result: no
+configure:6258: checking for xlf
+configure:6288: result: no
+configure:6258: checking for f77
+configure:6288: result: no
+configure:6258: checking for frt
+configure:6288: result: no
+configure:6258: checking for pgf77
+configure:6288: result: no
+configure:6258: checking for cf77
+configure:6288: result: no
+configure:6258: checking for fort77
+configure:6288: result: no
+configure:6258: checking for fl32
+configure:6288: result: no
+configure:6258: checking for af77
+configure:6288: result: no
+configure:6258: checking for xlf90
+configure:6288: result: no
+configure:6258: checking for f90
+configure:6288: result: no
+configure:6258: checking for pgf90
+configure:6288: result: no
+configure:6258: checking for pghpf
+configure:6288: result: no
+configure:6258: checking for epcf90
+configure:6288: result: no
+configure:6258: checking for gfortran
+configure:6274: found /usr/bin/gfortran
+configure:6285: result: gfortran
+configure:6315: checking for Fortran 77 compiler version
+configure:6322: gfortran --version >&5
+GNU Fortran (GCC) 4.3.0 20080428 (Red Hat 4.3.0-8)
+Copyright (C) 2008 Free Software Foundation, Inc.
+
+GNU Fortran comes with NO WARRANTY, to the extent permitted by law.
+You may redistribute copies of GNU Fortran
+under the terms of the GNU General Public License.
+For more information about these matters, see the file named COPYING
+
+configure:6325: $? = 0
+configure:6332: gfortran -v >&5
+Using built-in specs.
+Target: i386-redhat-linux
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-cpu=generic --build=i386-redhat-linux
+Thread model: posix
+gcc version 4.3.0 20080428 (Red Hat 4.3.0-8) (GCC) 
+configure:6335: $? = 0
+configure:6342: gfortran -V >&5
+gfortran: '-V' option must have argument
+configure:6345: $? = 1
+configure:6353: checking whether we are using the GNU Fortran 77 compiler
+configure:6372: gfortran -c  conftest.F >&5
+configure:6378: $? = 0
+configure:6395: result: yes
+configure:6401: checking whether gfortran accepts -g
+configure:6418: gfortran -c -g conftest.f >&5
+configure:6424: $? = 0
+configure:6440: result: yes
+configure:6470: checking the maximum length of command line arguments
+configure:6582: result: 1572864
+configure:6594: checking command to parse /usr/bin/nm -B output from gcc object
+configure:6699: gcc -c -g -O2  conftest.c >&5
+configure:6702: $? = 0
+configure:6706: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ 	]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
+configure:6709: $? = 0
+configure:6761: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
+configure:6764: $? = 0
+configure:6802: result: ok
+configure:6806: checking for objdir
+configure:6821: result: .libs
+configure:6913: checking for ar
+configure:6929: found /usr/bin/ar
+configure:6940: result: ar
+configure:7009: checking for ranlib
+configure:7025: found /usr/bin/ranlib
+configure:7036: result: ranlib
+configure:7105: checking for strip
+configure:7121: found /usr/bin/strip
+configure:7132: result: strip
+configure:7418: checking if gcc supports -fno-rtti -fno-exceptions
+configure:7436: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
+cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
 cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
-configure:7757: $? = 0
-configure:7770: result: no
-configure:7785: checking for gcc option to produce PIC
-configure:8017: result: -fPIC
-configure:8025: checking if gcc PIC flag -fPIC works
-configure:8043: gcc -c -g -O2  -fPIC -DPIC conftest.c >&5
-configure:8047: $? = 0
-configure:8060: result: yes
-configure:8088: checking if gcc static flag -static works
-configure:8116: result: yes
-configure:8126: checking if gcc supports -c -o file.o
-configure:8147: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
-configure:8151: $? = 0
-configure:8173: result: yes
-configure:8199: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
-configure:9179: result: yes
-configure:9200: checking whether -lc should be explicitly linked in
-configure:9205: gcc -c -g -O2  conftest.c >&5
-configure:9208: $? = 0
-configure:9223: gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep  -lc  \>/dev/null 2\>\&1
-configure:9226: $? = 0
-configure:9238: result: no
-configure:9246: checking dynamic linker characteristics
-configure:9850: result: GNU/Linux ld.so
-configure:9874: checking how to hardcode library paths into programs
-configure:9899: result: immediate
-configure:9913: checking whether stripping libraries is possible
-configure:9918: result: yes
-configure:10720: checking if libtool supports shared libraries
-configure:10722: result: yes
-configure:10725: checking whether to build shared libraries
-configure:10746: result: yes
-configure:10749: checking whether to build static libraries
-configure:10753: result: yes
-configure:10847: creating libtool
-configure:11440: checking for ld used by g++
-configure:11507: result: /usr/bin/ld
-configure:11516: checking if the linker (/usr/bin/ld) is GNU ld
-configure:11531: result: yes
-configure:11582: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:12528: result: yes
-configure:12545: g++ -c -g -O2  conftest.cpp >&5
-configure:12548: $? = 0
-configure:12704: checking for g++ option to produce PIC
-configure:12988: result: -fPIC
-configure:12996: checking if g++ PIC flag -fPIC works
-configure:13014: g++ -c -g -O2  -fPIC -DPIC conftest.cpp >&5
-configure:13018: $? = 0
-configure:13031: result: yes
-configure:13059: checking if g++ static flag -static works
-configure:13087: result: yes
-configure:13097: checking if g++ supports -c -o file.o
-configure:13118: g++ -c -g -O2  -o out/conftest2.o conftest.cpp >&5
-configure:13122: $? = 0
-configure:13144: result: yes
-configure:13170: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:13196: result: yes
-configure:13263: checking dynamic linker characteristics
-configure:13815: result: GNU/Linux ld.so
-configure:13839: checking how to hardcode library paths into programs
-configure:13864: result: immediate
-configure:20090: checking whether to enable maintainer-specific portions of Makefiles
-configure:20099: result: yes
-configure:20128: checking sys/mman.h usability
-configure:20145: gcc -c -g -O2  conftest.c >&5
-configure:20151: $? = 0
-configure:20165: result: yes
-configure:20169: checking sys/mman.h presence
-configure:20184: gcc -E  conftest.c
-configure:20190: $? = 0
-configure:20204: result: yes
-configure:20237: checking for sys/mman.h
+configure:7440: $? = 0
+configure:7453: result: no
+configure:7468: checking for gcc option to produce PIC
+configure:7700: result: -fPIC
+configure:7708: checking if gcc PIC flag -fPIC works
+configure:7726: gcc -c -g -O2  -fPIC -DPIC conftest.c >&5
+configure:7730: $? = 0
+configure:7743: result: yes
+configure:7771: checking if gcc static flag -static works
+configure:7799: result: yes
+configure:7809: checking if gcc supports -c -o file.o
+configure:7830: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
+configure:7834: $? = 0
+configure:7856: result: yes
+configure:7882: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
+configure:8862: result: yes
+configure:8883: checking whether -lc should be explicitly linked in
+configure:8888: gcc -c -g -O2  conftest.c >&5
+configure:8891: $? = 0
+configure:8906: gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep  -lc  \>/dev/null 2\>\&1
+configure:8909: $? = 0
+configure:8921: result: no
+configure:8929: checking dynamic linker characteristics
+configure:9533: result: GNU/Linux ld.so
+configure:9542: checking how to hardcode library paths into programs
+configure:9567: result: immediate
+configure:9581: checking whether stripping libraries is possible
+configure:9586: result: yes
+configure:10388: checking if libtool supports shared libraries
+configure:10390: result: yes
+configure:10393: checking whether to build shared libraries
+configure:10414: result: yes
+configure:10417: checking whether to build static libraries
+configure:10421: result: yes
+configure:10514: creating libtool
+configure:11102: checking for ld used by g++
+configure:11169: result: /usr/bin/ld
+configure:11178: checking if the linker (/usr/bin/ld) is GNU ld
+configure:11193: result: yes
+configure:11244: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
+configure:12218: result: yes
+configure:12236: g++ -c -g -O2  conftest.cpp >&5
+configure:12239: $? = 0
+configure:12391: checking for g++ option to produce PIC
+configure:12675: result: -fPIC
+configure:12683: checking if g++ PIC flag -fPIC works
+configure:12701: g++ -c -g -O2  -fPIC -DPIC conftest.cpp >&5
+configure:12705: $? = 0
+configure:12718: result: yes
+configure:12746: checking if g++ static flag -static works
+configure:12774: result: yes
+configure:12784: checking if g++ supports -c -o file.o
+configure:12805: g++ -c -g -O2  -o out/conftest2.o conftest.cpp >&5
+configure:12809: $? = 0
+configure:12831: result: yes
+configure:12857: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
+configure:12882: result: yes
+configure:12949: checking dynamic linker characteristics
+configure:13501: result: GNU/Linux ld.so
+configure:13510: checking how to hardcode library paths into programs
+configure:13535: result: immediate
+configure:14069: checking if libtool supports shared libraries
+configure:14071: result: yes
+configure:14074: checking whether to build shared libraries
+configure:14094: result: yes
+configure:14097: checking whether to build static libraries
+configure:14101: result: yes
+configure:14111: checking for gfortran option to produce PIC
+configure:14343: result: -fPIC
+configure:14351: checking if gfortran PIC flag -fPIC works
+configure:14369: gfortran -c -g -O2 -fPIC conftest.f >&5
+configure:14373: $? = 0
+configure:14386: result: yes
+configure:14414: checking if gfortran static flag -static works
+configure:14442: result: yes
+configure:14452: checking if gfortran supports -c -o file.o
+configure:14473: gfortran -c -g -O2 -o out/conftest2.o conftest.f >&5
+configure:14477: $? = 0
+configure:14499: result: yes
+configure:14525: checking whether the gfortran linker (/usr/bin/ld) supports shared libraries
+configure:15485: result: yes
+configure:15552: checking dynamic linker characteristics
+configure:16104: result: GNU/Linux ld.so
+configure:16113: checking how to hardcode library paths into programs
+configure:16138: result: immediate
+configure:19711: checking whether to enable maintainer-specific portions of Makefiles
+configure:19720: result: yes
+configure:19749: checking sys/mman.h usability
+configure:19766: gcc -c -g -O2  conftest.c >&5
+configure:19772: $? = 0
+configure:19786: result: yes
+configure:19790: checking sys/mman.h presence
+configure:19805: gcc -E  conftest.c
+configure:19811: $? = 0
+configure:19825: result: yes
+configure:19858: checking for sys/mman.h
+configure:19866: result: yes
+configure:19883: checking for mmap
+configure:19939: gcc -o conftest -g -O2   conftest.c  >&5
+configure:19945: $? = 0
+configure:19963: result: yes
+configure:19975: checking for sys/mman.h
+configure:19980: result: yes
+configure:20111: checking for mmap
+configure:20190: result: yes
+configure:20204: checking whether read-only mmap of a plain file works
+configure:20221: result: yes
+configure:20223: checking whether mmap from /dev/zero works
 configure:20245: result: yes
-configure:20262: checking for mmap
-configure:20318: gcc -o conftest -g -O2   conftest.c  >&5
-configure:20324: $? = 0
-configure:20342: result: yes
-configure:20354: checking for sys/mman.h
-configure:20359: result: yes
-configure:20490: checking for mmap
-configure:20569: result: yes
-configure:20583: checking whether read-only mmap of a plain file works
-configure:20600: result: yes
-configure:20602: checking whether mmap from /dev/zero works
-configure:20624: result: yes
-configure:20628: checking for MAP_ANON(YMOUS)
-configure:20661: gcc -c -g -O2  conftest.c >&5
-configure:20667: $? = 0
-configure:20682: result: yes
-configure:20688: checking whether mmap with MAP_ANON(YMOUS) works
-configure:20705: result: yes
-configure:21056: checking for ANSI C header files
-configure:21220: result: yes
-configure:21234: checking for memcpy
-configure:21290: gcc -o conftest -g -O2   conftest.c  >&5
+configure:20249: checking for MAP_ANON(YMOUS)
+configure:20282: gcc -c -g -O2  conftest.c >&5
+configure:20288: $? = 0
+configure:20303: result: yes
+configure:20309: checking whether mmap with MAP_ANON(YMOUS) works
+configure:20326: result: yes
+configure:20677: checking for ANSI C header files
+configure:20841: result: yes
+configure:20855: checking for memcpy
+configure:20911: gcc -o conftest -g -O2   conftest.c  >&5
 conftest.c:50: warning: conflicting types for built-in function 'memcpy'
-configure:21296: $? = 0
-configure:21314: result: yes
-configure:21326: checking for working alloca.h
-configure:21353: gcc -o conftest -g -O2   conftest.c  >&5
-configure:21359: $? = 0
-configure:21376: result: yes
-configure:21386: checking for alloca
-configure:21433: gcc -o conftest -g -O2   conftest.c  >&5
-configure:21439: $? = 0
-configure:21456: result: yes
-configure:21684: checking for double
-configure:21714: gcc -c -g -O2  conftest.c >&5
-configure:21720: $? = 0
-configure:21735: result: yes
-configure:21742: checking size of double
-configure:22044: gcc -o conftest -g -O2   conftest.c  >&5
-configure:22047: $? = 0
-configure:22053: ./conftest
-configure:22056: $? = 0
-configure:22079: result: 8
-configure:22089: checking for long double
-configure:22119: gcc -c -g -O2  conftest.c >&5
-configure:22125: $? = 0
-configure:22140: result: yes
-configure:22147: checking size of long double
-configure:22449: gcc -o conftest -g -O2   conftest.c  >&5
-configure:22452: $? = 0
-configure:22458: ./conftest
-configure:22461: $? = 0
-configure:22484: result: 12
-configure:22511: checking whether byte ordering is bigendian
-configure:22544: gcc -c -g -O2  conftest.c >&5
-configure:22550: $? = 0
-configure:22582: gcc -c -g -O2  conftest.c >&5
+configure:20917: $? = 0
+configure:20935: result: yes
+configure:20947: checking for working alloca.h
+configure:20974: gcc -o conftest -g -O2   conftest.c  >&5
+configure:20980: $? = 0
+configure:20997: result: yes
+configure:21007: checking for alloca
+configure:21054: gcc -o conftest -g -O2   conftest.c  >&5
+configure:21060: $? = 0
+configure:21077: result: yes
+configure:21305: checking for double
+configure:21335: gcc -c -g -O2  conftest.c >&5
+configure:21341: $? = 0
+configure:21356: result: yes
+configure:21363: checking size of double
+configure:21665: gcc -o conftest -g -O2   conftest.c  >&5
+configure:21668: $? = 0
+configure:21674: ./conftest
+configure:21677: $? = 0
+configure:21700: result: 8
+configure:21710: checking for long double
+configure:21740: gcc -c -g -O2  conftest.c >&5
+configure:21746: $? = 0
+configure:21761: result: yes
+configure:21768: checking size of long double
+configure:22070: gcc -o conftest -g -O2   conftest.c  >&5
+configure:22073: $? = 0
+configure:22079: ./conftest
+configure:22082: $? = 0
+configure:22105: result: 12
+configure:22132: checking whether byte ordering is bigendian
+configure:22165: gcc -c -g -O2  conftest.c >&5
+configure:22171: $? = 0
+configure:22203: gcc -c -g -O2  conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:40: error: 'not' undeclared (first use in this function)
 conftest.c:40: error: (Each undeclared identifier is reported only once
 conftest.c:40: error: for each function it appears in.)
 conftest.c:40: error: expected ';' before 'big'
-configure:22588: $? = 1
+configure:22209: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "libffi"
@@ -628,18 +621,18 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:22728: result: no
-configure:22748: checking assembler .cfi pseudo-op support
-configure:22776: gcc -c -g -O2  conftest.c >&5
-configure:22782: $? = 0
-configure:22798: result: yes
-configure:22937: checking whether .eh_frame section should be read-only
-configure:22956: result: yes
-configure:22977: checking for __attribute__((visibility("hidden")))
-configure:22986: gcc -Werror -S conftest.c -o conftest.s 1>&5
-configure:22989: $? = 0
-configure:22998: result: yes
-configure:23407: creating ./config.status
+configure:22349: result: no
+configure:22369: checking assembler .cfi pseudo-op support
+configure:22397: gcc -c -g -O2  conftest.c >&5
+configure:22403: $? = 0
+configure:22419: result: yes
+configure:22558: checking whether .eh_frame section should be read-only
+configure:22577: result: yes
+configure:22598: checking for __attribute__((visibility("hidden")))
+configure:22607: gcc -Werror -S conftest.c -o conftest.s 1>&5
+configure:22610: $? = 0
+configure:22619: result: yes
+configure:23028: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -654,19 +647,20 @@ generated by GNU Autoconf 2.61.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on dhcp-100-3-183.bos.redhat.com
+on localhost.localdomain
 
-config.status:747: creating include/Makefile
-config.status:747: creating include/ffi.h
-config.status:747: creating Makefile
-config.status:747: creating testsuite/Makefile
-config.status:747: creating man/Makefile
-config.status:747: creating libffi.pc
-config.status:747: creating fficonfig.h
-config.status:1041: linking ./src/x86/ffitarget.h to include/ffitarget.h
-config.status:1063: executing depfiles commands
-config.status:1063: executing include commands
-config.status:1063: executing src commands
+config.status:745: creating include/Makefile
+config.status:745: creating include/ffi.h
+config.status:745: creating Makefile
+config.status:745: creating testsuite/Makefile
+config.status:745: creating man/Makefile
+config.status:745: creating libffi.pc
+config.status:745: creating fficonfig.h
+config.status:988: fficonfig.h is unchanged
+config.status:1039: linking ./src/x86/ffitarget.h to include/ffitarget.h
+config.status:1061: executing depfiles commands
+config.status:1061: executing include commands
+config.status:1061: executing src commands
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -707,7 +701,7 @@ ac_cv_env_host_alias_set=
 ac_cv_env_host_alias_value=
 ac_cv_env_target_alias_set=
 ac_cv_env_target_alias_value=
-ac_cv_f77_compiler_gnu=no
+ac_cv_f77_compiler_gnu=yes
 ac_cv_func_alloca_works=yes
 ac_cv_func_memcpy=yes
 ac_cv_func_mmap=yes
@@ -738,13 +732,14 @@ ac_cv_prog_CXXCPP='g++ -E'
 ac_cv_prog_ac_ct_AR=ar
 ac_cv_prog_ac_ct_CC=gcc
 ac_cv_prog_ac_ct_CXX=g++
+ac_cv_prog_ac_ct_F77=gfortran
 ac_cv_prog_ac_ct_RANLIB=ranlib
 ac_cv_prog_ac_ct_STRIP=strip
 ac_cv_prog_cc_c89=
 ac_cv_prog_cc_g=yes
 ac_cv_prog_cc_gcc_c_o=yes
 ac_cv_prog_cxx_g=yes
-ac_cv_prog_f77_g=no
+ac_cv_prog_f77_g=yes
 ac_cv_prog_make_make_set=yes
 ac_cv_sizeof_double=8
 ac_cv_sizeof_long_double=12
@@ -769,21 +764,17 @@ lt_cv_path_NM='/usr/bin/nm -B'
 lt_cv_path_SED=/bin/sed
 lt_cv_prog_compiler_c_o=yes
 lt_cv_prog_compiler_c_o_CXX=yes
-lt_cv_prog_compiler_pic_works=yes
-lt_cv_prog_compiler_pic_works_CXX=yes
+lt_cv_prog_compiler_c_o_F77=yes
 lt_cv_prog_compiler_rtti_exceptions=no
-lt_cv_prog_compiler_static_works=yes
-lt_cv_prog_compiler_static_works_CXX=yes
 lt_cv_prog_gnu_ld=yes
 lt_cv_prog_gnu_ldcxx=yes
 lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ 	]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'''
 lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr) \&\2},/p'\'''
 lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^. .* \(.*\)$/extern int \1;/p'\'''
-lt_cv_sys_lib_dlsearch_path_spec='/usr/lib /lib /usr/lib/mysql /usr/lib/xulrunner-1.9 '
-lt_cv_sys_lib_search_path_spec='/usr/lib /lib /usr/local/lib'
 lt_cv_sys_max_cmd_len=1572864
 lt_lt_cv_prog_compiler_c_o='"yes"'
 lt_lt_cv_prog_compiler_c_o_CXX='"yes"'
+lt_lt_cv_prog_compiler_c_o_F77='"yes"'
 lt_lt_cv_sys_global_symbol_pipe='"sed -n -e '\''s/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'\''"'
 lt_lt_cv_sys_global_symbol_to_c_name_address='"sed -n -e '\''s/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'\''"'
 lt_lt_cv_sys_global_symbol_to_cdecl='"sed -n -e '\''s/^. .* \\(.*\\)\$/extern int \\1;/p'\''"'
@@ -792,21 +783,21 @@ lt_lt_cv_sys_global_symbol_to_cdecl='"sed -n -e '\''s/^. .* \\(.*\\)\$/extern in
 ## Output variables. ##
 ## ----------------- ##
 
-ACLOCAL='${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run aclocal-1.10'
+ACLOCAL='${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run aclocal-1.10'
 ALLOCA=''
 ALPHA_FALSE=''
 ALPHA_TRUE='#'
 AMDEPBACKSLASH='\'
 AMDEP_FALSE='#'
 AMDEP_TRUE=''
-AMTAR='${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run tar'
+AMTAR='${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run tar'
 AM_RUNTESTFLAGS=''
 AR='ar'
 ARM_FALSE=''
 ARM_TRUE='#'
-AUTOCONF='${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run automake-1.10'
+AUTOCONF='${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoconf'
+AUTOHEADER='${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoheader'
+AUTOMAKE='${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run automake-1.10'
 AWK='gawk'
 CC='gcc'
 CCAS='gcc'
@@ -823,15 +814,14 @@ CXXFLAGS='-g -O2'
 CYGPATH_W='echo'
 DEFS='-DHAVE_CONFIG_H'
 DEPDIR='.deps'
-DSYMUTIL=''
 ECHO='echo'
 ECHO_C=''
 ECHO_N='-n'
 ECHO_T=''
 EGREP='/bin/grep -E'
 EXEEXT=''
-F77=''
-FFLAGS=''
+F77='gfortran'
+FFLAGS='-g -O2'
 FRV_FALSE=''
 FRV_TRUE='#'
 GREP='/bin/grep'
@@ -857,10 +847,9 @@ M68K_TRUE='#'
 MAINT=''
 MAINTAINER_MODE_FALSE='#'
 MAINTAINER_MODE_TRUE=''
-MAKEINFO='${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run makeinfo'
+MAKEINFO='${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run makeinfo'
 MIPS_FALSE=''
 MIPS_TRUE='#'
-NMEDIT=''
 OBJEXT='o'
 PA64_HPUX_FALSE=''
 PA64_HPUX_TRUE='#'
@@ -913,7 +902,7 @@ X86_WIN32_FALSE=''
 X86_WIN32_TRUE='#'
 ac_ct_CC='gcc'
 ac_ct_CXX='g++'
-ac_ct_F77=''
+ac_ct_F77='gfortran'
 am__fastdepCCAS_FALSE='#'
 am__fastdepCCAS_TRUE=''
 am__fastdepCC_FALSE='#'
@@ -945,7 +934,7 @@ host_vendor='pc'
 htmldir='${docdir}'
 includedir='${prefix}/include'
 infodir='${datarootdir}/info'
-install_sh='$(SHELL) /home/ssp/vertigo/libnul/libffi-3.0.5/install-sh'
+install_sh='$(SHELL) /home/ssp/libnul/libffi-3.0.5/install-sh'
 libdir='${exec_prefix}/lib'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
@@ -1022,7 +1011,7 @@ generated by GNU Autoconf 2.61.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status fficonfig.h
 
-on dhcp-100-3-183.bos.redhat.com
+on localhost.localdomain
 
-config.status:747: creating fficonfig.h
-config.status:990: fficonfig.h is unchanged
+config.status:745: creating fficonfig.h
+config.status:988: fficonfig.h is unchanged
diff --git a/libffi-3.0.5/config.status b/libffi-3.0.5/config.status
index 6ec821d..c4c3b56 100755
--- a/libffi-3.0.5/config.status
+++ b/libffi-3.0.5/config.status
@@ -345,7 +345,7 @@ Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/ssp/vertigo/libnul/libffi-3.0.5'
+ac_pwd='/home/ssp/libnul/libffi-3.0.5'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
@@ -565,19 +565,19 @@ s,@am__isrc@,|#_!!_#|,g
 s,@CYGPATH_W@,|#_!!_#|echo,g
 s,@PACKAGE@,|#_!!_#|libffi,g
 s,@VERSION@,|#_!!_#|3.0.5,g
-s,@ACLOCAL@,|#_!!_#|${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run aclocal-1.10,g
-s,@AUTOCONF@,|#_!!_#|${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoconf,g
-s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run automake-1.10,g
-s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoheader,g
-s,@MAKEINFO@,|#_!!_#|${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run makeinfo,g
-s,@install_sh@,|#_!!_#|$(SHELL) /home/ssp/vertigo/libnul/libffi-3.0.5/install-sh,g
+s,@ACLOCAL@,|#_!!_#|${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run aclocal-1.10,g
+s,@AUTOCONF@,|#_!!_#|${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoconf,g
+s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run automake-1.10,g
+s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoheader,g
+s,@MAKEINFO@,|#_!!_#|${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run makeinfo,g
+s,@install_sh@,|#_!!_#|$(SHELL) /home/ssp/libnul/libffi-3.0.5/install-sh,g
 s,@STRIP@,|#_!!_#|strip,g
 s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
 s,@mkdir_p@,|#_!!_#|/bin/mkdir -p,g
 s,@AWK@,|#_!!_#|gawk,g
 s,@SET_MAKE@,|#_!!_#|,g
 s,@am__leading_dot@,|#_!!_#|.,g
-s,@AMTAR@,|#_!!_#|${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run tar,g
+s,@AMTAR@,|#_!!_#|${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run tar,g
 s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
 s,@am__untar@,|#_!!_#|${AMTAR} xf -,g
 s,@CC@,|#_!!_#|gcc,g
@@ -611,8 +611,6 @@ cat >"$tmp/subs-2.sed" <<\CEOF
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
 s,@AR@,|#_!!_#|ar,g
 s,@RANLIB@,|#_!!_#|ranlib,g
-s,@DSYMUTIL@,|#_!!_#|,g
-s,@NMEDIT@,|#_!!_#|,g
 s,@CPP@,|#_!!_#|gcc -E,g
 s,@CXX@,|#_!!_#|g++,g
 s,@CXXFLAGS@,|#_!!_#|-g -O2,g
@@ -621,9 +619,9 @@ s,@CXXDEPMODE@,|#_!!_#|depmode=gcc3,g
 s,@am__fastdepCXX_TRUE@,|#_!!_#|,g
 s,@am__fastdepCXX_FALSE@,|#_!!_#|#,g
 s,@CXXCPP@,|#_!!_#|g++ -E,g
-s,@F77@,|#_!!_#|,g
-s,@FFLAGS@,|#_!!_#|,g
-s,@ac_ct_F77@,|#_!!_#|,g
+s,@F77@,|#_!!_#|gfortran,g
+s,@FFLAGS@,|#_!!_#|-g -O2,g
+s,@ac_ct_F77@,|#_!!_#|gfortran,g
 s,@LIBTOOL@,|#_!!_#|$(SHELL) $(top_builddir)/libtool,g
 s,@MAINTAINER_MODE_TRUE@,|#_!!_#|,g
 s,@MAINTAINER_MODE_FALSE@,|#_!!_#|#,g
diff --git a/libffi-3.0.5/configure b/libffi-3.0.5/configure
index 2dce4f4..a407c57 100755
--- a/libffi-3.0.5/configure
+++ b/libffi-3.0.5/configure
@@ -867,8 +867,6 @@ LN_S
 ECHO
 AR
 RANLIB
-DSYMUTIL
-NMEDIT
 CPP
 CXX
 CXXFLAGS
@@ -4476,7 +4474,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix[4-9]*)
+aix4* | aix5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4692,7 +4690,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4695 "configure"' > conftest.$ac_ext
+  echo '#line 4693 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4865,11 +4863,7 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
+      *)    LD="${LD-ld} -64" ;;
       esac
       ;;
     esac
@@ -6471,6 +6465,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # 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; }
@@ -6785,7 +6780,7 @@ EOF
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
-  rm -rf conftest* conftst*
+  rm -f conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -7345,318 +7340,6 @@ fi
   ;;
 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
 
@@ -7722,7 +7405,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 
@@ -7750,11 +7433,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7753: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7436: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7757: \$? = $ac_status" >&5
+   echo "$as_me:7440: \$? = $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.
@@ -8024,10 +7707,10 @@ if test -n "$lt_prog_compiler_pic"; then
 
 { 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_cv_prog_compiler_pic_works+set}" = set; then
+if test "${lt_prog_compiler_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_pic_works=no
+  lt_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"
@@ -8040,27 +7723,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8043: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7726: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8047: \$? = $ac_status" >&5
+   echo "$as_me:7730: \$? = $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_cv_prog_compiler_pic_works=yes
+       lt_prog_compiler_pic_works=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test x"$lt_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8087,10 +7770,10 @@ esac
 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_cv_prog_compiler_static_works+set}" = set; then
+if test "${lt_prog_compiler_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_static_works=no
+  lt_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -8103,20 +7786,20 @@ else
        $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_cv_prog_compiler_static_works=yes
+         lt_prog_compiler_static_works=yes
        fi
      else
-       lt_cv_prog_compiler_static_works=yes
+       lt_prog_compiler_static_works=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test x"$lt_prog_compiler_static_works" = xyes; then
     :
 else
     lt_prog_compiler_static=
@@ -8144,11 +7827,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8147: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7830: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8151: \$? = $ac_status" >&5
+   echo "$as_me:7834: \$? = $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
@@ -8228,13 +7911,12 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # 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_|_GLOBAL__F[ID]_.*'
+  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
   # 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
@@ -8293,7 +7975,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix[3-9]*)
+    aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
@@ -8512,7 +8194,7 @@ _LT_EOF
       fi
       ;;
 
-    aix[4-9]*)
+    aix4* | aix5*)
       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.
@@ -8532,7 +8214,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -8804,10 +8486,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       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 $_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}"
+        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}'
     else
       case $cc_basename in
         xlc*)
@@ -9327,7 +9010,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9851,21 +9534,6 @@ esac
 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"
@@ -10185,7 +9853,7 @@ fi
 { 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="-ldld"
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
   { echo "$as_me:$LINENO: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -10461,7 +10129,7 @@ fi
 { 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="-ldld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
 
 
@@ -10510,7 +10178,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10513 "configure"
+#line 10181 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10610,7 +10278,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10613 "configure"
+#line 10281 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10737,7 +10405,7 @@ aix3*)
   fi
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -10793,7 +10461,6 @@ if test -f "$ltmain"; then
     predeps \
     postdeps \
     compiler_lib_search_path \
-    compiler_lib_search_dirs \
     archive_cmds \
     archive_expsym_cmds \
     postinstall_cmds \
@@ -10854,7 +10521,7 @@ echo "$as_me: creating $ofile" >&6;}
 # 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, 2008
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -11090,10 +10757,6 @@ predeps=$lt_predeps
 # shared library.
 postdeps=$lt_postdeps
 
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -11342,7 +11005,6 @@ postdep_objects_CXX=
 predeps_CXX=
 postdeps_CXX=
 compiler_lib_search_path_CXX=
-compiler_lib_search_dirs_CXX=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -11380,7 +11042,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -11587,7 +11249,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  aix[4-9]*)
+  aix4* | aix5*)
     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.
@@ -11600,7 +11262,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -11858,23 +11520,51 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     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
-      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
+
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
       output_verbose_link_cmd='echo'
-      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}"
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
       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*)
@@ -12125,7 +11815,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC* | pgcpp*)
+      pgCC*)
         # 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'
@@ -12532,6 +12222,7 @@ test "$ld_shlibs_CXX" = no && can_build_shared=no
 GCC_CXX="$GXX"
 LD_CXX="$LD"
 
+
 cat > conftest.$ac_ext <<EOF
 class Foo
 {
@@ -12633,11 +12324,6 @@ fi
 
 $rm -f confest.$objext
 
-compiler_lib_search_dirs_CXX=
-if test -n "$compiler_lib_search_path_CXX"; then
-  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
 # PORTME: override above test on systems where it is broken
 case $host_os in
 interix[3-9]*)
@@ -12693,6 +12379,7 @@ solaris*)
   ;;
 esac
 
+
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -12768,7 +12455,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   else
     case $host_os in
-      aix[4-9]*)
+      aix4* | aix5*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -12864,7 +12551,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  pgCC* | pgcpp*)
+	  pgCC*)
 	    # Portland Group C++ compiler.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-fpic'
@@ -12995,10 +12682,10 @@ if test -n "$lt_prog_compiler_pic_CXX"; then
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_pic_works_CXX=no
+  lt_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"
@@ -13011,27 +12698,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13014: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12701: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13018: \$? = $ac_status" >&5
+   echo "$as_me:12705: \$? = $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_cv_prog_compiler_pic_works_CXX=yes
+       lt_prog_compiler_pic_works_CXX=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -13058,10 +12745,10 @@ esac
 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_cv_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_static_works_CXX=no
+  lt_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -13074,20 +12761,20 @@ else
        $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_cv_prog_compiler_static_works_CXX=yes
+         lt_prog_compiler_static_works_CXX=yes
        fi
      else
-       lt_cv_prog_compiler_static_works_CXX=yes
+       lt_prog_compiler_static_works_CXX=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
     :
 else
     lt_prog_compiler_static_CXX=
@@ -13115,11 +12802,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13118: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12805: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13122: \$? = $ac_status" >&5
+   echo "$as_me:12809: \$? = $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
@@ -13172,7 +12859,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix[4-9]*)
+  aix4* | aix5*)
     # 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
@@ -13191,7 +12878,6 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     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; }
@@ -13293,7 +12979,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13816,21 +13502,6 @@ esac
 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"
@@ -13914,7 +13585,6 @@ if test -f "$ltmain"; then
     predeps_CXX \
     postdeps_CXX \
     compiler_lib_search_path_CXX \
-    compiler_lib_search_dirs_CXX \
     archive_cmds_CXX \
     archive_expsym_cmds_CXX \
     postinstall_cmds_CXX \
@@ -14163,10 +13833,6 @@ predeps=$lt_predeps_CXX
 # 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
@@ -14381,7 +14047,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -14419,7 +14085,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix[4-9]*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -14684,10 +14350,10 @@ if test -n "$lt_prog_compiler_pic_F77"; then
 
 { 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_cv_prog_compiler_pic_works_F77+set}" = set; then
+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_pic_works_F77=no
+  lt_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"
@@ -14700,27 +14366,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14703: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14369: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14707: \$? = $ac_status" >&5
+   echo "$as_me:14373: \$? = $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_cv_prog_compiler_pic_works_F77=yes
+       lt_prog_compiler_pic_works_F77=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -14747,10 +14413,10 @@ esac
 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_cv_prog_compiler_static_works_F77+set}" = set; then
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_static_works_F77=no
+  lt_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -14763,20 +14429,20 @@ else
        $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_cv_prog_compiler_static_works_F77=yes
+         lt_prog_compiler_static_works_F77=yes
        fi
      else
-       lt_cv_prog_compiler_static_works_F77=yes
+       lt_prog_compiler_static_works_F77=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
     :
 else
     lt_prog_compiler_static_F77=
@@ -14804,11 +14470,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14807: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14473: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14811: \$? = $ac_status" >&5
+   echo "$as_me:14477: \$? = $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
@@ -14888,13 +14554,12 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # 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_|_GLOBAL__F[ID]_.*'
+  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
   # 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
@@ -14953,7 +14618,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix[3-9]*)
+    aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_F77=no
@@ -15172,7 +14837,7 @@ _LT_EOF
       fi
       ;;
 
-    aix[4-9]*)
+    aix4* | aix5*)
       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.
@@ -15192,7 +14857,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -15444,10 +15109,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       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 $_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}"
+        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}'
     else
       case $cc_basename in
         xlc*)
@@ -15916,7 +15582,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16439,21 +16105,6 @@ esac
 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"
@@ -16537,7 +16188,6 @@ if test -f "$ltmain"; then
     predeps_F77 \
     postdeps_F77 \
     compiler_lib_search_path_F77 \
-    compiler_lib_search_dirs_F77 \
     archive_cmds_F77 \
     archive_expsym_cmds_F77 \
     postinstall_cmds_F77 \
@@ -16786,10 +16436,6 @@ predeps=$lt_predeps_F77
 # 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
@@ -16964,7 +16610,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -17013,11 +16659,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17016: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16662: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17020: \$? = $ac_status" >&5
+   echo "$as_me:16666: \$? = $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.
@@ -17077,7 +16723,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # 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*)
@@ -17147,7 +16793,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     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*)
@@ -17287,10 +16933,10 @@ if test -n "$lt_prog_compiler_pic_GCJ"; then
 
 { 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_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_pic_works_GCJ=no
+  lt_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"
@@ -17303,27 +16949,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17306: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16952: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17310: \$? = $ac_status" >&5
+   echo "$as_me:16956: \$? = $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_cv_prog_compiler_pic_works_GCJ=yes
+       lt_prog_compiler_pic_works_GCJ=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -17350,10 +16996,10 @@ esac
 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_cv_prog_compiler_static_works_GCJ+set}" = set; then
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_prog_compiler_static_works_GCJ=no
+  lt_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -17366,20 +17012,20 @@ else
        $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_cv_prog_compiler_static_works_GCJ=yes
+         lt_prog_compiler_static_works_GCJ=yes
        fi
      else
-       lt_cv_prog_compiler_static_works_GCJ=yes
+       lt_prog_compiler_static_works_GCJ=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
     :
 else
     lt_prog_compiler_static_GCJ=
@@ -17407,11 +17053,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17410: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17056: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17414: \$? = $ac_status" >&5
+   echo "$as_me:17060: \$? = $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
@@ -17491,13 +17137,12 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # 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_|_GLOBAL__F[ID]_.*'
+  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
   # 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
@@ -17556,7 +17201,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix[3-9]*)
+    aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_GCJ=no
@@ -17775,7 +17420,7 @@ _LT_EOF
       fi
       ;;
 
-    aix[4-9]*)
+    aix4* | aix5*)
       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.
@@ -17795,7 +17440,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -18067,10 +17712,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       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 $_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}"
+        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}'
     else
       case $cc_basename in
         xlc*)
@@ -18539,7 +18185,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[4-9]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -19062,21 +18708,6 @@ esac
 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"
@@ -19160,7 +18791,6 @@ if test -f "$ltmain"; then
     predeps_GCJ \
     postdeps_GCJ \
     compiler_lib_search_path_GCJ \
-    compiler_lib_search_dirs_GCJ \
     archive_cmds_GCJ \
     archive_expsym_cmds_GCJ \
     postinstall_cmds_GCJ \
@@ -19409,10 +19039,6 @@ predeps=$lt_predeps_GCJ
 # 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
@@ -19586,7 +19212,7 @@ ac_outfile=conftest.$ac_objext
 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 -r conftest*
+$rm conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -19646,7 +19272,6 @@ if test -f "$ltmain"; then
     predeps_RC \
     postdeps_RC \
     compiler_lib_search_path_RC \
-    compiler_lib_search_dirs_RC \
     archive_cmds_RC \
     archive_expsym_cmds_RC \
     postinstall_cmds_RC \
@@ -19895,10 +19520,6 @@ predeps=$lt_predeps_RC
 # 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
@@ -24086,8 +23707,6 @@ for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
 AR!$AR$ac_delim
 RANLIB!$RANLIB$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
 CPP!$CPP$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
@@ -24164,7 +23783,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/libffi-3.0.5/include/Makefile b/libffi-3.0.5/include/Makefile
index 44001a2..70bba27 100644
--- a/libffi-3.0.5/include/Makefile
+++ b/libffi-3.0.5/include/Makefile
@@ -46,14 +46,14 @@ CONFIG_CLEAN_FILES = ffi.h ffitarget.h
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run aclocal-1.10
 ALLOCA = 
-AMTAR = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run tar
+AMTAR = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run tar
 AM_RUNTESTFLAGS = 
 AR = ar
-AUTOCONF = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run automake-1.10
+AUTOCONF = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run automake-1.10
 AWK = gawk
 CC = gcc
 CCAS = gcc
@@ -70,15 +70,14 @@ CXXFLAGS = -g -O2
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DSYMUTIL = 
 ECHO = echo
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
 EXEEXT = 
-F77 = 
-FFLAGS = 
+F77 = gfortran
+FFLAGS = -g -O2
 GREP = /bin/grep
 HAVE_LONG_DOUBLE = 1
 INSTALL = /usr/bin/install -c
@@ -93,9 +92,8 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
 LTLIBOBJS = 
 MAINT = 
-MAKEINFO = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NMEDIT = 
 OBJEXT = o
 PACKAGE = libffi
 PACKAGE_BUGREPORT = http://gcc.gnu.org/bugs.html
@@ -112,13 +110,13 @@ STRIP = strip
 TARGET = X86
 TARGETDIR = x86
 VERSION = 3.0.5
-abs_builddir = /home/ssp/vertigo/libnul/libffi-3.0.5/include
-abs_srcdir = /home/ssp/vertigo/libnul/libffi-3.0.5/include
-abs_top_builddir = /home/ssp/vertigo/libnul/libffi-3.0.5
-abs_top_srcdir = /home/ssp/vertigo/libnul/libffi-3.0.5
+abs_builddir = /home/ssp/libnul/libffi-3.0.5/include
+abs_srcdir = /home/ssp/libnul/libffi-3.0.5/include
+abs_top_builddir = /home/ssp/libnul/libffi-3.0.5
+abs_top_srcdir = /home/ssp/libnul/libffi-3.0.5
 ac_ct_CC = gcc
 ac_ct_CXX = g++
-ac_ct_F77 = 
+ac_ct_F77 = gfortran
 am__include = include
 am__leading_dot = .
 am__quote = 
@@ -144,7 +142,7 @@ host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/ssp/vertigo/libnul/libffi-3.0.5/install-sh
+install_sh = $(SHELL) /home/ssp/libnul/libffi-3.0.5/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/libffi-3.0.5/include/Makefile.in b/libffi-3.0.5/include/Makefile.in
index d817555..5a9ade3 100644
--- a/libffi-3.0.5/include/Makefile.in
+++ b/libffi-3.0.5/include/Makefile.in
@@ -70,7 +70,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -95,7 +94,6 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/libffi-3.0.5/libtool b/libffi-3.0.5/libtool
index c522634..43ac58e 100755
--- a/libffi-3.0.5/libtool
+++ b/libffi-3.0.5/libtool
@@ -4,7 +4,7 @@
 # Generated automatically by  (GNU libffi 3.0.5)
 # 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, 2008
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -40,11 +40,11 @@ Xsed="/bin/sed -e 1s/^X//"
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
-available_tags=" CXX"
+available_tags=" CXX F77"
 
 # ### BEGIN LIBTOOL CONFIG
 
-# Libtool was configured on host dhcp-100-3-183.bos.redhat.com:
+# Libtool was configured on host localhost.localdomain:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -243,10 +243,6 @@ predeps=""
 # shared library.
 postdeps=""
 
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=""
-
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=""
@@ -332,7 +328,7 @@ link_all_deplibs=unknown
 sys_lib_search_path_spec="/usr/lib /lib /usr/local/lib"
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/usr/lib /lib /usr/lib/mysql /usr/lib/xulrunner-1.9 "
+sys_lib_dlsearch_path_spec="/usr/lib /lib /usr/lib/atlas /usr/lib/mysql /usr/lib/qt-3.3/lib /usr/lib/tcl8.5 /usr/lib/xulrunner-1.9 "
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -347,7 +343,7 @@ export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED
 extract_expsyms_cmds=""
 
 # Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
 
 # Symbols that must always be exported.
 include_expsyms=""
@@ -7286,7 +7282,7 @@ disable_libs=static
 # End:
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 
-# Libtool was configured on host dhcp-100-3-183.bos.redhat.com:
+# Libtool was configured on host localhost.localdomain:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -7468,11 +7464,11 @@ striplib="strip --strip-unneeded"
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects="/usr/lib/gcc/i386-redhat-linux/4.3.1/../../../crti.o /usr/lib/gcc/i386-redhat-linux/4.3.1/crtbeginS.o"
+predep_objects="/usr/lib/gcc/i386-redhat-linux/4.3.0/../../../crti.o /usr/lib/gcc/i386-redhat-linux/4.3.0/crtbeginS.o"
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects="/usr/lib/gcc/i386-redhat-linux/4.3.1/crtendS.o /usr/lib/gcc/i386-redhat-linux/4.3.1/../../../crtn.o"
+postdep_objects="/usr/lib/gcc/i386-redhat-linux/4.3.0/crtendS.o /usr/lib/gcc/i386-redhat-linux/4.3.0/../../../crtn.o"
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -7482,13 +7478,9 @@ predeps=""
 # shared library.
 postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
 
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs="/usr/lib/gcc/i386-redhat-linux/4.3.1 /usr/lib/gcc/i386-redhat-linux/4.3.1 /usr/lib/gcc/i386-redhat-linux/4.3.1/../../.."
-
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/i386-redhat-linux/4.3.1 -L/usr/lib/gcc/i386-redhat-linux/4.3.1 -L/usr/lib/gcc/i386-redhat-linux/4.3.1/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/i386-redhat-linux/4.3.0 -L/usr/lib/gcc/i386-redhat-linux/4.3.0 -L/usr/lib/gcc/i386-redhat-linux/4.3.0/../../.."
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method="pass_all"
@@ -7571,7 +7563,7 @@ link_all_deplibs=unknown
 sys_lib_search_path_spec="/usr/lib /lib /usr/local/lib"
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/usr/lib /lib /usr/lib/mysql /usr/lib/xulrunner-1.9 "
+sys_lib_dlsearch_path_spec="/usr/lib /lib /usr/lib/atlas /usr/lib/mysql /usr/lib/qt-3.3/lib /usr/lib/tcl8.5 /usr/lib/xulrunner-1.9 "
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -7586,10 +7578,318 @@ export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED
 extract_expsyms_cmds=""
 
 # Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
+exclude_expsyms=""
 
 # Symbols that must always be exported.
 include_expsyms=""
 
 # ### END LIBTOOL TAG CONFIG: CXX
 
+# ### BEGIN LIBTOOL TAG CONFIG: F77
+
+# Libtool was configured on host localhost.localdomain:
+
+# Shell to use when invoking shell scripts.
+SHELL="/bin/sh"
+
+# Whether or not to build shared libraries.
+build_libtool_libs=yes
+
+# Whether or not to build static libraries.
+build_old_libs=yes
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=no
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=no
+
+# Whether or not to optimize for fast installation.
+fast_install=yes
+
+# The host system.
+host_alias=
+host=i686-pc-linux-gnu
+host_os=linux-gnu
+
+# The build system.
+build_alias=
+build=i686-pc-linux-gnu
+build_os=linux-gnu
+
+# An echo program that does not interpret backslashes.
+echo="echo"
+
+# The archiver.
+AR="ar"
+AR_FLAGS="cru"
+
+# A C compiler.
+LTCC="gcc"
+
+# LTCC compiler flags.
+LTCFLAGS="-g -O2"
+
+# A language-specific compiler.
+CC="gfortran"
+
+# Is the compiler the GNU C compiler?
+with_gcc=yes
+
+# An ERE matcher.
+EGREP="/bin/grep -E"
+
+# The linker used to build libraries.
+LD="/usr/bin/ld"
+
+# Whether we need hard or soft links.
+LN_S="ln -s"
+
+# A BSD-compatible nm program.
+NM="/usr/bin/nm -B"
+
+# A symbol stripping program
+STRIP="strip"
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=file
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="dlltool"
+
+# Used on cygwin: object dumper.
+OBJDUMP="objdump"
+
+# Used on cygwin: assembler.
+AS="as"
+
+# The name of the directory that contains temporary libtool files.
+objdir=.libs
+
+# How to create reloadable object files.
+reload_flag=" -r"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+
+# How to pass a linker flag through the compiler.
+wl="-Wl,"
+
+# Object file suffix (normally "o").
+objext="o"
+
+# Old archive suffix (normally "a").
+libext="a"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='.so'
+
+# Executable file suffix (normally "").
+exeext=""
+
+# Additional compiler flags for building library objects.
+pic_flag=" -fPIC"
+pic_mode=default
+
+# What is the maximum length of a command?
+max_cmd_len=1572864
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o="yes"
+
+# Must we lock files when doing compilation?
+need_locks="no"
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=no
+
+# Do we need a version for libraries?
+need_version=no
+
+# Whether dlopen is supported.
+dlopen_support=unknown
+
+# Whether dlopen of programs is supported.
+dlopen_self=unknown
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=unknown
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag="-static"
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=""
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec="\${wl}--export-dynamic"
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=""
+
+# Library versioning type.
+version_type=linux
+
+# Format of library name prefix.
+libname_spec="lib\$name"
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+
+# The coded name of the library, if different from the real name.
+soname_spec="\${libname}\${release}\${shared_ext}\$major"
+
+# Commands used to build and install an old-style archive.
+RANLIB="ranlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
+old_postuninstall_cmds=""
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=""
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=""
+
+# Commands used to build and install a shared archive.
+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
+  cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
+  \$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
+	  \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+postinstall_cmds=""
+postuninstall_cmds=""
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=""
+module_expsym_cmds=""
+
+# Commands to strip libraries.
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=""
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=""
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=""
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method="pass_all"
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd="\$MAGIC_CMD"
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=""
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=""
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=""
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
+
+# This is the shared library runtime path variable.
+runpath_var=LD_RUN_PATH
+
+# This is the shared library path variable.
+shlibpath_var=LD_LIBRARY_PATH
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=no
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=immediate
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=yes
+
+# Flag to hardcode $libdir into a binary during linking.
+# This must work even if $libdir does not exist.
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+
+# If ld is used when linking, flag to hardcode $libdir into
+# a binary during linking. This must work even if $libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=""
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=""
+
+# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=no
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=no
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=unsupported
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=no
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=unknown
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec="/usr/lib /lib /usr/local/lib"
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec="/usr/lib /lib /usr/lib/atlas /usr/lib/mysql /usr/lib/qt-3.3/lib /usr/lib/tcl8.5 /usr/lib/xulrunner-1.9 "
+
+# Fix the shell variable $srcfile for the compiler.
+fix_srcfile_path=""
+
+# Set to yes if exported symbols are required.
+always_export_symbols=no
+
+# The commands to list exported symbols.
+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=""
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+
+# Symbols that must always be exported.
+include_expsyms=""
+
+# ### END LIBTOOL TAG CONFIG: F77
+
diff --git a/libffi-3.0.5/man/Makefile b/libffi-3.0.5/man/Makefile
index 5e2118c..b6704c6 100644
--- a/libffi-3.0.5/man/Makefile
+++ b/libffi-3.0.5/man/Makefile
@@ -45,14 +45,14 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run aclocal-1.10
 ALLOCA = 
-AMTAR = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run tar
+AMTAR = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run tar
 AM_RUNTESTFLAGS = 
 AR = ar
-AUTOCONF = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run automake-1.10
+AUTOCONF = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run automake-1.10
 AWK = gawk
 CC = gcc
 CCAS = gcc
@@ -69,15 +69,14 @@ CXXFLAGS = -g -O2
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DSYMUTIL = 
 ECHO = echo
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
 EXEEXT = 
-F77 = 
-FFLAGS = 
+F77 = gfortran
+FFLAGS = -g -O2
 GREP = /bin/grep
 HAVE_LONG_DOUBLE = 1
 INSTALL = /usr/bin/install -c
@@ -92,9 +91,8 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
 LTLIBOBJS = 
 MAINT = 
-MAKEINFO = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NMEDIT = 
 OBJEXT = o
 PACKAGE = libffi
 PACKAGE_BUGREPORT = http://gcc.gnu.org/bugs.html
@@ -111,13 +109,13 @@ STRIP = strip
 TARGET = X86
 TARGETDIR = x86
 VERSION = 3.0.5
-abs_builddir = /home/ssp/vertigo/libnul/libffi-3.0.5/man
-abs_srcdir = /home/ssp/vertigo/libnul/libffi-3.0.5/man
-abs_top_builddir = /home/ssp/vertigo/libnul/libffi-3.0.5
-abs_top_srcdir = /home/ssp/vertigo/libnul/libffi-3.0.5
+abs_builddir = /home/ssp/libnul/libffi-3.0.5/man
+abs_srcdir = /home/ssp/libnul/libffi-3.0.5/man
+abs_top_builddir = /home/ssp/libnul/libffi-3.0.5
+abs_top_srcdir = /home/ssp/libnul/libffi-3.0.5
 ac_ct_CC = gcc
 ac_ct_CXX = g++
-ac_ct_F77 = 
+ac_ct_F77 = gfortran
 am__include = include
 am__leading_dot = .
 am__quote = 
@@ -143,7 +141,7 @@ host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/ssp/vertigo/libnul/libffi-3.0.5/install-sh
+install_sh = $(SHELL) /home/ssp/libnul/libffi-3.0.5/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/libffi-3.0.5/man/Makefile.in b/libffi-3.0.5/man/Makefile.in
index 7801541..8150cb8 100644
--- a/libffi-3.0.5/man/Makefile.in
+++ b/libffi-3.0.5/man/Makefile.in
@@ -69,7 +69,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -94,7 +93,6 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/libffi-3.0.5/src/.deps/closures.Plo b/libffi-3.0.5/src/.deps/closures.Plo
index 0411f99..4ebefb0 100644
--- a/libffi-3.0.5/src/.deps/closures.Plo
+++ b/libffi-3.0.5/src/.deps/closures.Plo
@@ -1,7 +1,7 @@
 src/closures.lo: src/closures.c include/ffi.h include/ffitarget.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h \
   /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
@@ -24,7 +24,7 @@ src/closures.lo: src/closures.c include/ffi.h include/ffitarget.h \
   /usr/include/bits/environments.h /usr/include/bits/confname.h \
   /usr/include/getopt.h /usr/include/stdio.h /usr/include/libio.h \
   /usr/include/_G_config.h /usr/include/wchar.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/stdarg.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/stdarg.h \
   /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
   /usr/include/mntent.h /usr/include/paths.h /usr/include/sys/param.h \
   /usr/include/linux/param.h /usr/include/asm/param.h \
@@ -39,11 +39,11 @@ include/ffi.h:
 
 include/ffitarget.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h:
 
 /usr/include/limits.h:
 
@@ -147,7 +147,7 @@ fficonfig.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/stdarg.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/stdarg.h:
 
 /usr/include/bits/sys_errlist.h:
 
diff --git a/libffi-3.0.5/src/.deps/debug.Plo b/libffi-3.0.5/src/.deps/debug.Plo
index f4558dd..ab0a820 100644
--- a/libffi-3.0.5/src/.deps/debug.Plo
+++ b/libffi-3.0.5/src/.deps/debug.Plo
@@ -1,7 +1,7 @@
 src/debug.lo: src/debug.c include/ffi.h include/ffitarget.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h \
   /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
@@ -17,7 +17,7 @@ src/debug.lo: src/debug.c include/ffi.h include/ffitarget.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
   /usr/include/wchar.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/stdarg.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h
 
@@ -25,11 +25,11 @@ include/ffi.h:
 
 include/ffitarget.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h:
 
 /usr/include/limits.h:
 
@@ -97,7 +97,7 @@ fficonfig.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/stdarg.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
diff --git a/libffi-3.0.5/src/.deps/java_raw_api.Plo b/libffi-3.0.5/src/.deps/java_raw_api.Plo
index bd08056..f651739 100644
--- a/libffi-3.0.5/src/.deps/java_raw_api.Plo
+++ b/libffi-3.0.5/src/.deps/java_raw_api.Plo
@@ -1,7 +1,7 @@
 src/java_raw_api.lo: src/java_raw_api.c include/ffi.h include/ffitarget.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h \
   /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
@@ -20,11 +20,11 @@ include/ffi.h:
 
 include/ffitarget.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/libffi-3.0.5/src/.deps/prep_cif.Plo b/libffi-3.0.5/src/.deps/prep_cif.Plo
index e592d11..6716fc0 100644
--- a/libffi-3.0.5/src/.deps/prep_cif.Plo
+++ b/libffi-3.0.5/src/.deps/prep_cif.Plo
@@ -1,7 +1,7 @@
 src/prep_cif.lo: src/prep_cif.c include/ffi.h include/ffitarget.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h \
   /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
@@ -20,11 +20,11 @@ include/ffi.h:
 
 include/ffitarget.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/libffi-3.0.5/src/.deps/raw_api.Plo b/libffi-3.0.5/src/.deps/raw_api.Plo
index 7131d36..1a1bc28 100644
--- a/libffi-3.0.5/src/.deps/raw_api.Plo
+++ b/libffi-3.0.5/src/.deps/raw_api.Plo
@@ -1,7 +1,7 @@
 src/raw_api.lo: src/raw_api.c include/ffi.h include/ffitarget.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h \
   /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
@@ -16,11 +16,11 @@ include/ffi.h:
 
 include/ffitarget.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/libffi-3.0.5/src/.deps/types.Plo b/libffi-3.0.5/src/.deps/types.Plo
index 21f71e8..26fb8fd 100644
--- a/libffi-3.0.5/src/.deps/types.Plo
+++ b/libffi-3.0.5/src/.deps/types.Plo
@@ -1,7 +1,7 @@
 src/types.lo: src/types.c include/ffi.h include/ffitarget.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h \
   /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
@@ -16,11 +16,11 @@ include/ffi.h:
 
 include/ffitarget.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/libffi-3.0.5/src/.libs/closures.o b/libffi-3.0.5/src/.libs/closures.o
index 825dbe7..887146d 100644
--- a/libffi-3.0.5/src/.libs/closures.o
+++ b/libffi-3.0.5/src/.libs/closures.o
diff --git a/libffi-3.0.5/src/.libs/debug.o b/libffi-3.0.5/src/.libs/debug.o
index 93dadb5..dbfc01e 100644
--- a/libffi-3.0.5/src/.libs/debug.o
+++ b/libffi-3.0.5/src/.libs/debug.o
diff --git a/libffi-3.0.5/src/.libs/java_raw_api.o b/libffi-3.0.5/src/.libs/java_raw_api.o
index 205aa64..97f2ba3 100644
--- a/libffi-3.0.5/src/.libs/java_raw_api.o
+++ b/libffi-3.0.5/src/.libs/java_raw_api.o
diff --git a/libffi-3.0.5/src/.libs/prep_cif.o b/libffi-3.0.5/src/.libs/prep_cif.o
index 18d216b..7b6d075 100644
--- a/libffi-3.0.5/src/.libs/prep_cif.o
+++ b/libffi-3.0.5/src/.libs/prep_cif.o
diff --git a/libffi-3.0.5/src/.libs/raw_api.o b/libffi-3.0.5/src/.libs/raw_api.o
index 5009ffa..b74bb05 100644
--- a/libffi-3.0.5/src/.libs/raw_api.o
+++ b/libffi-3.0.5/src/.libs/raw_api.o
diff --git a/libffi-3.0.5/src/.libs/types.o b/libffi-3.0.5/src/.libs/types.o
index 2dfa179..55f36ea 100644
--- a/libffi-3.0.5/src/.libs/types.o
+++ b/libffi-3.0.5/src/.libs/types.o
diff --git a/libffi-3.0.5/src/closures.o b/libffi-3.0.5/src/closures.o
index 4103832..fbe789d 100644
--- a/libffi-3.0.5/src/closures.o
+++ b/libffi-3.0.5/src/closures.o
diff --git a/libffi-3.0.5/src/debug.o b/libffi-3.0.5/src/debug.o
index 4b6920a..125b9e3 100644
--- a/libffi-3.0.5/src/debug.o
+++ b/libffi-3.0.5/src/debug.o
diff --git a/libffi-3.0.5/src/java_raw_api.o b/libffi-3.0.5/src/java_raw_api.o
index bedcaba..d114913 100644
--- a/libffi-3.0.5/src/java_raw_api.o
+++ b/libffi-3.0.5/src/java_raw_api.o
diff --git a/libffi-3.0.5/src/prep_cif.o b/libffi-3.0.5/src/prep_cif.o
index f270630..f43bdd2 100644
--- a/libffi-3.0.5/src/prep_cif.o
+++ b/libffi-3.0.5/src/prep_cif.o
diff --git a/libffi-3.0.5/src/raw_api.o b/libffi-3.0.5/src/raw_api.o
index 88e2aa2..bc245f0 100644
--- a/libffi-3.0.5/src/raw_api.o
+++ b/libffi-3.0.5/src/raw_api.o
diff --git a/libffi-3.0.5/src/types.o b/libffi-3.0.5/src/types.o
index 2dfa179..55f36ea 100644
--- a/libffi-3.0.5/src/types.o
+++ b/libffi-3.0.5/src/types.o
diff --git a/libffi-3.0.5/src/x86/.deps/ffi.Plo b/libffi-3.0.5/src/x86/.deps/ffi.Plo
index 99596b0..025eeb4 100644
--- a/libffi-3.0.5/src/x86/.deps/ffi.Plo
+++ b/libffi-3.0.5/src/x86/.deps/ffi.Plo
@@ -1,7 +1,7 @@
 src/x86/ffi.lo: src/x86/ffi.c include/ffi.h include/ffitarget.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h \
-  /usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h \
+  /usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h \
   /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
@@ -20,11 +20,11 @@ include/ffi.h:
 
 include/ffitarget.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/stddef.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/stddef.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/limits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/limits.h:
 
-/usr/lib/gcc/i386-redhat-linux/4.3.1/include/syslimits.h:
+/usr/lib/gcc/i386-redhat-linux/4.3.0/include/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/libffi-3.0.5/src/x86/.libs/ffi.o b/libffi-3.0.5/src/x86/.libs/ffi.o
index 1456ca1..6a36414 100644
--- a/libffi-3.0.5/src/x86/.libs/ffi.o
+++ b/libffi-3.0.5/src/x86/.libs/ffi.o
diff --git a/libffi-3.0.5/src/x86/.libs/sysv.o b/libffi-3.0.5/src/x86/.libs/sysv.o
index dc5d326..0a167fa 100644
--- a/libffi-3.0.5/src/x86/.libs/sysv.o
+++ b/libffi-3.0.5/src/x86/.libs/sysv.o
diff --git a/libffi-3.0.5/src/x86/ffi.o b/libffi-3.0.5/src/x86/ffi.o
index 3800d5a..87a2fdf 100644
--- a/libffi-3.0.5/src/x86/ffi.o
+++ b/libffi-3.0.5/src/x86/ffi.o
diff --git a/libffi-3.0.5/src/x86/sysv.o b/libffi-3.0.5/src/x86/sysv.o
index b77b627..361118b 100644
--- a/libffi-3.0.5/src/x86/sysv.o
+++ b/libffi-3.0.5/src/x86/sysv.o
diff --git a/libffi-3.0.5/testsuite/Makefile b/libffi-3.0.5/testsuite/Makefile
index 5989dae..6a8c17f 100644
--- a/libffi-3.0.5/testsuite/Makefile
+++ b/libffi-3.0.5/testsuite/Makefile
@@ -47,14 +47,14 @@ DIST_SOURCES =
 DEJATOOL = $(PACKAGE)
 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run aclocal-1.10
 ALLOCA = 
-AMTAR = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run tar
+AMTAR = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run tar
 AM_RUNTESTFLAGS = 
 AR = ar
-AUTOCONF = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run automake-1.10
+AUTOCONF = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run automake-1.10
 AWK = gawk
 CC = gcc
 CCAS = gcc
@@ -71,15 +71,14 @@ CXXFLAGS = -g -O2
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DSYMUTIL = 
 ECHO = echo
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
 EXEEXT = 
-F77 = 
-FFLAGS = 
+F77 = gfortran
+FFLAGS = -g -O2
 GREP = /bin/grep
 HAVE_LONG_DOUBLE = 1
 INSTALL = /usr/bin/install -c
@@ -94,9 +93,8 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
 LTLIBOBJS = 
 MAINT = 
-MAKEINFO = ${SHELL} /home/ssp/vertigo/libnul/libffi-3.0.5/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/ssp/libnul/libffi-3.0.5/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NMEDIT = 
 OBJEXT = o
 PACKAGE = libffi
 PACKAGE_BUGREPORT = http://gcc.gnu.org/bugs.html
@@ -113,13 +111,13 @@ STRIP = strip
 TARGET = X86
 TARGETDIR = x86
 VERSION = 3.0.5
-abs_builddir = /home/ssp/vertigo/libnul/libffi-3.0.5/testsuite
-abs_srcdir = /home/ssp/vertigo/libnul/libffi-3.0.5/testsuite
-abs_top_builddir = /home/ssp/vertigo/libnul/libffi-3.0.5
-abs_top_srcdir = /home/ssp/vertigo/libnul/libffi-3.0.5
+abs_builddir = /home/ssp/libnul/libffi-3.0.5/testsuite
+abs_srcdir = /home/ssp/libnul/libffi-3.0.5/testsuite
+abs_top_builddir = /home/ssp/libnul/libffi-3.0.5
+abs_top_srcdir = /home/ssp/libnul/libffi-3.0.5
 ac_ct_CC = gcc
 ac_ct_CXX = g++
-ac_ct_F77 = 
+ac_ct_F77 = gfortran
 am__include = include
 am__leading_dot = .
 am__quote = 
@@ -145,7 +143,7 @@ host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/ssp/vertigo/libnul/libffi-3.0.5/install-sh
+install_sh = $(SHELL) /home/ssp/libnul/libffi-3.0.5/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/libffi-3.0.5/testsuite/Makefile.in b/libffi-3.0.5/testsuite/Makefile.in
index 07440e2..967128b 100644
--- a/libffi-3.0.5/testsuite/Makefile.in
+++ b/libffi-3.0.5/testsuite/Makefile.in
@@ -71,7 +71,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -96,7 +95,6 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/libnul.h b/libnul.h
index a78f0c9..9324e13 100644
--- a/libnul.h
+++ b/libnul.h
@@ -1,7 +1,26 @@
+/*  libnul 
+ *  Copyright (C) 2002, 2008  Søren Sandmann (sandmann@daimi.au.dk)
+ *
+ *  This library is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef INVOKE_H
 #define INVOKE_H
 
 #include <stdint.h>
+#include <glib.h>
 
 typedef union
 {
@@ -56,12 +75,91 @@ typedef void (* Function)();
 
 typedef struct FunDef FunDef;
 
-FunDef *fun_def_new    (Type       ret_type,
-			int        n_args,
-			const Type *arg_types);
-Arg     fun_def_invoke (FunDef     *fun,
-			Function    f,
-			Arg        *args);
-void	fun_def_free   (FunDef     *fun);
+FunDef *fun_def_new    (Function  f,
+			Type      ret_type,
+			int       n_args,
+			Type     *arg_types);
+Arg     fun_def_invoke (FunDef   *fun,
+			Arg      *args);
+void	fun_def_free   (FunDef   *fun);
+
+/*
+ * Watching file descriptors
+ */
+typedef void (* WatchCallback) (gpointer data);
+
+void     fd_add_watch             (int             fd,
+				   gpointer         data);
+gpointer fd_get_data		  (int             fd);
+void     fd_set_data		  (int		    fd,
+				   gpointer         data);
+void     fd_set_read_callback     (int             fd,
+				   WatchCallback read_cb);
+void     fd_set_write_callback    (int             fd,
+				   WatchCallback write_cb);
+void     fd_set_hangup_callback   (int             fd,
+				   WatchCallback hangup_cb);
+void     fd_set_error_callback    (int             fd,
+				   WatchCallback error_cb);
+void     fd_set_priority_callback (int             fd,
+				   WatchCallback priority_cb);
+void	 fd_set_poll_handler      (int		    fd,
+				   WatchCallback poll_handler);
+void     fd_remove_watch          (int             fd);
+gboolean fd_is_watched            (int             fd);
+
+/* Implementing a service */
+
+typedef struct DbwService DbwService;
+typedef struct DbwObject DbwObject;
+typedef struct DbwMember DbwMember;
+typedef struct DbwInterface DbwInterface;
+typedef struct DbwType DbwType;
+typedef struct DbwParameter DbwParameter;
+typedef struct DbwArg DbwArg;
+
+/* Return TRUE for handled, FALSE for not handled */
+typedef gboolean (* DbwFunction) ();
+
+DbwService *  dbw_session_service (const char    *name,
+				   DbwObject     *object1,
+				   ...);
+DbwObject *   dbw_object          (const char    *name,
+				   gpointer       data,
+				   DbwInterface  *interface1,
+				   ...);
+DbwInterface *dbw_interface       (const char    *name,
+				   DbwMember     *member1,
+				   ...);
+DbwMember *   dbw_method          (const char    *name,
+				   DbwFunction    function,
+				   DbwParameter  *parameter1,
+				   ...);
+DbwParameter *dbw_parameter_in    (const char    *name,
+				   const DbwType *type);
+DbwParameter *dbw_parameter_out   (const char    *name,
+				   const DbwType *type);
+gboolean      dbw_service_start   (DbwService *service);
+void          dbw_service_stop    (DbwService *service);
+
+/* The returned values here are automatically freed at idle. You
+ * must copy them if you want to keep them around
+ */
+const DbwType * dbw_type_int32  (void);
+const DbwType * dbw_type_uint32 (void);
+const DbwType * dbw_type_string (void);
+
+/* Using a service */
+typedef struct DbwProxy DbwProxy;
+
+DbwProxy *dbw_proxy_new_session_service (const char *bus_name,
+					 const char *object,
+					 const char *interface);
 
+void
+dbw_invoke (DbwService *service,
+	    const char *method_desc,
+	    DbwFunction callback,
+	    gpointer data,
+	    ...);
 #endif
diff --git a/watch.c b/watch.c
new file mode 100644
index 0000000..6fe0341
--- /dev/null
+++ b/watch.c
@@ -0,0 +1,375 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- */
+
+/*  libnul
+ *  Copyright (C) 2002  Søren Sandmann (sandmann@daimi.au.dk)
+ *
+ *  This library is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <glib.h>
+#include "libnul.h"
+
+typedef struct Watch Watch;
+
+struct Watch
+{
+    GSource source;
+    GPollFD poll_fd;
+    gboolean removed;
+    
+    WatchCallback read_callback;
+    WatchCallback write_callback;
+    WatchCallback hangup_callback;
+    WatchCallback error_callback;
+    WatchCallback priority_callback;
+    WatchCallback poll_callback; /* Called before going back to poll */
+
+    gpointer data;
+};
+
+static GHashTable *watched_fds;
+
+static void
+init (void)
+{
+    if (!watched_fds)
+        watched_fds = g_hash_table_new (g_int_hash, g_int_equal);
+}
+
+static Watch *
+lookup_watch (gint fd)
+{
+    init ();
+    
+    return g_hash_table_lookup (watched_fds, &fd);
+}
+
+static void
+internal_add_watch (Watch *watch)
+{
+    gpointer fd = &(watch->poll_fd.fd);
+    
+    init ();
+    
+    g_hash_table_insert (watched_fds, fd, watch);
+    g_source_add_poll ((GSource *)watch, &(watch->poll_fd));
+}
+
+static void
+internal_remove_watch (Watch *watch)
+{
+    gpointer fd = &(watch->poll_fd.fd);
+    
+    init ();
+    
+    watch->removed = TRUE;
+    g_source_remove_poll ((GSource *)watch, &(watch->poll_fd));
+    g_hash_table_remove (watched_fds, fd);
+}
+
+static gboolean
+watch_prepare (GSource *source,
+               gint    *timeout)
+{
+    Watch *watch = (Watch *)source;
+    
+    *timeout = -1;
+    
+    if (watch->poll_callback)
+        watch->poll_callback (watch->data);
+    
+    return FALSE;
+}
+
+static gboolean
+watch_check (GSource *source)
+{
+    Watch *watch = (Watch *)source;
+    gint revents = watch->poll_fd.revents;
+    
+    if (revents & (G_IO_NVAL))
+    {
+        /* This can happen if the user closes the file descriptor
+         * without first removing the watch. We silently ignore it
+         */
+        internal_remove_watch (watch);
+        g_source_unref (source);
+        return FALSE;
+    }
+    
+    if ((revents & G_IO_HUP) && watch->hangup_callback)
+        return TRUE;
+    
+    if ((revents & G_IO_IN) && watch->read_callback)
+        return TRUE;
+    
+    if ((revents & G_IO_PRI) && watch->priority_callback)
+        return TRUE;
+    
+    if ((revents & G_IO_ERR) && watch->error_callback)
+        return TRUE;
+    
+    if ((revents & G_IO_OUT) && watch->write_callback)
+        return TRUE;
+    
+    return FALSE;
+}
+
+static gboolean
+watch_dispatch (GSource     *source,
+                GSourceFunc  callback,
+                gpointer     user_data)
+{
+    Watch *watch = (Watch *)source;
+    gint revents = watch->poll_fd.revents;
+    gboolean removed;
+    
+    g_source_ref (source);
+    
+    if (!watch->removed && (revents & G_IO_IN)  && watch->read_callback)
+        watch->read_callback (watch->data);
+    
+    if (!watch->removed && (revents & G_IO_PRI) && watch->priority_callback)
+        watch->priority_callback (watch->data);
+    
+    if (!watch->removed && (revents & G_IO_OUT) && watch->write_callback)
+        watch->write_callback (watch->data);
+    
+    if (!watch->removed && (revents & G_IO_ERR) && watch->error_callback)
+        watch->error_callback (watch->data);
+    
+    if (!watch->removed && (revents & G_IO_HUP) && watch->hangup_callback)
+        watch->hangup_callback (watch->data);
+    
+    removed = watch->removed;
+    
+    g_source_unref (source);
+    
+    if (removed)
+        return FALSE;
+    
+    return TRUE;
+}
+
+static void
+watch_finalize (GSource *source)
+{
+}
+
+static void
+update_poll_mask (Watch *watch)
+{
+    gint events = 0;
+    
+    g_source_remove_poll ((GSource *)watch, &(watch->poll_fd));
+    
+    if (watch->read_callback)
+        events |= G_IO_IN;
+    
+    if (watch->write_callback)
+        events |= G_IO_OUT;
+    
+    if (watch->priority_callback)
+        events |= G_IO_PRI;
+    
+    if (watch->hangup_callback)
+        events |= G_IO_HUP;
+    
+    if (watch->error_callback)
+        events |= G_IO_ERR;
+    
+    watch->poll_fd.events = events;
+    
+    g_source_add_poll ((GSource *)watch, &(watch->poll_fd));
+}
+
+void
+fd_add_watch (gint     fd,
+              gpointer data)
+{
+    static GSourceFuncs watch_funcs = {
+        watch_prepare,
+        watch_check,
+        watch_dispatch,
+        watch_finalize,
+    };
+    Watch *watch = lookup_watch (fd);
+    
+    g_return_if_fail (fd > 0);
+    g_return_if_fail (watch == NULL);
+    
+    watch = (Watch *)g_source_new (&watch_funcs, sizeof (Watch)); 
+    g_source_set_can_recurse ((GSource *)watch, TRUE);
+    g_source_attach ((GSource *)watch, NULL);
+    
+    watch->poll_fd.fd = fd;
+    watch->poll_fd.events = 0;
+    watch->removed = FALSE;
+    
+    watch->read_callback = NULL;
+    watch->write_callback = NULL;
+    watch->hangup_callback = NULL;
+    watch->error_callback = NULL;
+    watch->priority_callback = NULL;
+    
+    watch->data = data;
+    
+    internal_add_watch (watch);
+}
+
+gpointer
+fd_get_data (gint fd)
+{
+    Watch *watch = lookup_watch (fd);
+    
+    g_return_val_if_fail (fd > 0, NULL);
+    g_return_val_if_fail (watch != NULL, NULL);
+
+    return watch->data;
+}
+
+void
+fd_set_data (gint     fd,
+             gpointer data)
+{
+    Watch *watch = lookup_watch (fd);
+    
+    g_return_if_fail (fd > 0);
+    g_return_if_fail (watch != NULL);
+
+    watch->data = data;
+}
+
+void
+fd_set_read_callback (gint             fd,
+                      WatchCallback read_cb)
+{
+    Watch *watch = lookup_watch (fd);
+    
+    g_return_if_fail (fd > 0);
+    g_return_if_fail (watch != NULL);
+    
+    if (watch->read_callback != read_cb)
+    {
+        watch->read_callback = read_cb;
+        update_poll_mask (watch);
+    }
+}
+
+void
+fd_set_write_callback (gint             fd,
+                       WatchCallback write_cb)
+{
+    Watch *watch = lookup_watch (fd);
+    
+    g_return_if_fail (fd > 0);
+    g_return_if_fail (watch != NULL);
+    
+    if (watch->write_callback != write_cb)
+    {
+        watch->write_callback = write_cb;
+        update_poll_mask (watch);
+    }
+}
+
+void
+fd_set_hangup_callback (gint             fd,
+                        WatchCallback hangup_cb)
+{
+    Watch *watch = lookup_watch (fd);
+    
+    g_return_if_fail (fd > 0);
+    g_return_if_fail (watch != NULL);
+    
+    if (watch->hangup_callback != hangup_cb)
+    {
+        watch->hangup_callback = hangup_cb;
+        update_poll_mask (watch);
+    }
+}
+
+void
+fd_set_error_callback (gint             fd,
+                       WatchCallback error_cb)
+{
+    Watch *watch = lookup_watch (fd);
+    
+    g_return_if_fail (fd > 0);
+    g_return_if_fail (watch != NULL);
+    
+    if (watch->error_callback != error_cb)
+    {
+        watch->error_callback = error_cb;
+        update_poll_mask (watch);
+    }
+}
+
+void
+fd_set_priority_callback (gint             fd,
+                          WatchCallback priority_cb)
+{
+    Watch *watch = lookup_watch (fd);
+    
+    g_return_if_fail (fd > 0);
+    g_return_if_fail (watch != NULL);
+    
+    if (watch->priority_callback != priority_cb)
+    {
+        watch->priority_callback = priority_cb;
+        update_poll_mask (watch);
+    }
+}
+
+void
+fd_set_poll_handler (gint	   fd,
+                     WatchCallback poll_cb)
+{
+    Watch *watch = lookup_watch (fd);
+
+    g_return_if_fail (fd > 0);
+    g_return_if_fail (watch != NULL);
+
+    if (watch->poll_callback != poll_cb)
+    {
+        watch->poll_callback = poll_cb;
+        update_poll_mask (watch);
+    }
+}
+
+void
+fd_remove_watch (gint fd)
+{
+    Watch *watch = lookup_watch (fd);
+    
+    g_return_if_fail (fd > 0);
+    
+    if (!watch)
+        return;
+    
+    internal_remove_watch (watch);
+    g_source_unref ((GSource *)watch);
+}
+
+gboolean
+fd_is_watched (gint fd)
+{
+    g_return_val_if_fail (fd > 0, FALSE);
+    
+    if (lookup_watch (fd))
+        return TRUE;
+    else
+        return FALSE;
+}
+