Request 4498 (accepted)

imagination.changes Changed

@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+Sun May 26 09:23:54 UTC 2019 - Mathias Homann <Mathias.Homann@opensuse.org>
+
+- Version bump to 3.4
+  * Subtitle info are no more saved in the project file if the slide hasn't got any text.
+  * Starting the preview from the middle plays music accordingly to its timing in the slideshow.
+  * Project can be ported to other media as filenames can be saved without their path.
+  * Subtitle can be now rotated.
+  * Subtitle can now be freely positioned on the slide.
+  * Added a nice fading gradient animation in the Add/Edit slide dialog.
+  * Fixed seg-fault when trying to delete a slide when preview is running.
+  * Current slideshow is no more closed if user cancels when opening a new one.
+  * Enjoy FULLSCREEN preview with background music and continuos mode.
+  * The CTRL+A shortcut doesn't select all the slides anymore when pressed from the subtitle widget entry.
+  * Subtitles can now have a pattern.
+  * Empty slide background can now be edited.
+  * Subtitle can have a background.
+  * Got rid of Update button in the Slide Motion as it's now automatic.
+  * Got rid of subtitle placing option.
+  * Moved Add and Remove buttons in the Slide Motion on the right.
+
+-------------------------------------------------------------------
 Tue May 22 20:39:09 UTC 2012 - seife+obs@b1-systems.com
 
 - fix build on 12.1 and later by adding LDFLAGS=... to configure

imagination.spec Changed

@@ -1,4 +1,4 @@
-# vim: set ts=4 sw=4 et:
+## vim: set ts=4 sw=4 et:
 # Copyright (c) 2009-2010 oc2pus
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
@@ -6,7 +6,7 @@
 # Please submit bugfixes or comments to packman@links2linux.de
 
 Name:           imagination
-Version:        3.0
+Version:        3.4
 Release:        0.pm.1
 Summary:        A lightweight and simple DVD slide show maker
 Group:          Productivity/Multimedia/Video/Editors and Convertors
@@ -14,7 +14,10 @@
 License: GPL-2.0
 # http://prdownloads.sourceforge.net/imagination/imagination-%{version}.tar.gz
 Source:         imagination-%{version}.tar.bz2
-Patch1:         imagination-plugins_installed.patch
+#
+# not needed anymore, already set upstream
+#
+# Patch1:         imagination-plugins_installed.patch
 Source90:       %{name}-rpmlintrc
 BuildRoot:      %{_tmppath}/buildroot-%{name}-%{version}
 BuildRequires:  gtk2-devel
@@ -83,7 +86,10 @@
 # If you fail to do so Imagination won't be able to load the transitions and the
 # transition's images when the package is installed.
 
-%patch1
+#
+# not needed anymore, already set upstream
+#
+# %patch1
 
 %build
 # the LDFLAGS hack saves me from patching the makefiles... --seife

imagination-plugins_installed.patch Deleted

imagination-3.0.tar.bz2/configure.in Deleted

@@ -1,115 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(imagination, 3.0,
-		http://sourceforge.net/tracker/?group_id=244319&atid=1125540)
-AC_CONFIG_SRCDIR(src/imagination.h)
-AM_INIT_AUTOMAKE
-
-# Enable silent rules if supported
-m4_ifdef(AM_SILENT_RULES, AM_SILENT_RULES(yes))
-
-AM_MAINTAINER_MODE
-
-AC_ISC_POSIX
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_INTLTOOL
-
-# for plugins
-AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
-LIBTOOL="$LIBTOOL --silent"
-
-pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0"
-PKG_CHECK_MODULES(PACKAGE, $pkg_modules)
-
-sox_modules="sox >= 14.2.0"
-PKG_CHECK_MODULES(SOX, $sox_modules)
-
-plugins_modules="cairo >= 1.6 glib-2.0 > 2.18.0"
-PKG_CHECK_MODULES(PLUGINS, $plugins_modules)
-
-# get svn revision
-REVISION="r0"
-if test "x${REVISION}" = "xr0"
-then
-	SVN=`which svn 2>/dev/null`
-	if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}"
-	then
-		REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4`
-	fi
-fi
-if test "x${REVISION}" != "xr0"
-then
-	# force debug mode for a SVN working copy
-	CFLAGS="-g -Wall"
-else
-	REVISION="-1"
-fi
-AC_DEFINE_UNQUOTED(REVISION, "$REVISION", subversion revision number)
-
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
-
-AC_SUBST(SOX_CFLAGS)
-AC_SUBST(SOX_LIBS)
-
-AC_SUBST(PLUGINS_CFLAGS)
-AC_SUBST(PLUGINS_LIBS)
-
-GETTEXT_PACKAGE=imagination
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", Gettext package.)
-
-AC_PATH_PROG(XSLTPROC, xsltproc, yes)
-
-AM_CONDITIONAL(ENABLE_XSLTPROC, test x"$enable_xsltproc" = x"yes")
-
-dnl Add the languages which your application supports here.
-ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`"
-AM_GLIB_GNU_GETTEXT
-
-GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
-SOX_VERSION=`$PKG_CONFIG --modversion sox`
-
-AC_OUTPUT(
-Makefile
-src/Makefile
-transitions/Makefile
-doc/Makefile
-doc/en/Makefile
-doc/en/imagination.xml
-doc/en/images/Makefile
-doc/fr/Makefile
-doc/fr/imagination.xml
-doc/fr/images/Makefile
-doc/es/Makefile
-doc/es/imagination.xml
-doc/es/images/Makefile
-doc/pt_BR/Makefile
-doc/pt_BR/imagination.xml
-doc/pt_BR/images/Makefile
-po/Makefile.in
-icons/Makefile
-icons/16x16/Makefile
-icons/24x24/Makefile
-icons/48x48/Makefile
-icons/scalable/Makefile
-)
-
-echo ""
-echo "Imagination configuration:"
-echo "--------------------------"
-echo ""
-echo "Install in  :       ${prefix}/bin"
-echo "GTK version :       ${GTK_VERSION}"
-echo "SOX version :       ${SOX_VERSION}"
-if test "${REVISION}" != "-1"
-then
-	echo "SVN revision:       ${REVISION}"
-fi
-echo ""

imagination-3.0.tar.bz2/mkinstalldirs Deleted

@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs -h --help -m mode dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here

imagination-3.0.tar.bz2/pixmaps/imagination-file-not-found.png Deleted

imagination-3.0.tar.bz2/pixmaps/imagination-pos-0.png Deleted

imagination-3.0.tar.bz2/pixmaps/imagination-pos-1.png Deleted

imagination-3.0.tar.bz2/pixmaps/imagination-pos-2.png Deleted

imagination-3.0.tar.bz2/pixmaps/imagination-pos-3.png Deleted

imagination-3.0.tar.bz2/pixmaps/imagination-pos-4.png Deleted

imagination-3.0.tar.bz2/pixmaps/imagination-pos-5.png Deleted

imagination-3.0.tar.bz2/pixmaps/imagination-pos-6.png Deleted

imagination-3.0.tar.bz2/pixmaps/imagination-pos-7.png Deleted

imagination-3.0.tar.bz2/pixmaps/imagination-pos-8.png Deleted

imagination-3.0.tar.bz2/src/imgtablebutton.c Deleted

@@ -1,813 +0,0 @@
-/*
-** Copyright (C) 2009 Tadej Borovšak <tadeboro@gmail.com>
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#include "imgtablebutton.h"
-#include <math.h>
-
-/* Convenience macros */
-#define IMG_PARAM_DEFAULTS \
-	G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB
-#define IMG_PARAM_READWRITE \
-	G_PARAM_WRITABLE | G_PARAM_READABLE | IMG_PARAM_DEFAULTS
-#define IMG_PARAM_READ \
-	G_PARAM_READABLE | IMG_PARAM_DEFAULTS
-#define IMG_PARAM_WRITE \
-	G_PARAM_WRITABLE | IMG_PARAM_DEFAULTS
-
-enum
-{
-	S_ACTIVE_ITEM_CHANGED,
-	S_LAST_SIGNAL
-};
-
-enum
-{
-	P_0,
-	P_ROWS,          /* RW */
-	P_COLS,          /* RW */
-	P_NO_ITEMS,      /* R  */
-	P_PIXBUFS,       /* R  */
-	P_LABELS,        /* R  */
-	P_USE_MNEMONICS, /* RW */
-	P_USE_STOCK,     /* RW */
-	P_ACTIVE_ITEM    /* RW */
-};
-
-static guint table_button_signalsS_LAST_SIGNAL = { 0 };
-
-#define IMG_TABLE_BUTTON_GET_PRIVATE( obj ) \
-	( G_TYPE_INSTANCE_GET_PRIVATE( ( obj ), \
-								   IMG_TYPE_TABLE_BUTTON, \
-								   ImgTableButtonPrivate ) )
-
-typedef struct _ImgTableButtonPrivate ImgTableButtonPrivate;
-struct _ImgTableButtonPrivate
-{
-	gint        rows;          /* Number of rows */
-	gint        cols;          /* Number of columns */
-	gint        no_items;      /* Number of items in array */
-	gchar     **labels;        /* Array of all labels */
-	GdkPixbuf **pixbufs;       /* Array of all pixbufs */
-	gboolean    use_mnemonics; /* Do we use mnemonics */
-	gboolean    use_stock;     /* Do we use stock items? */
-	gint        active_item;   /* Currently active item */
-
-	GtkWidget *popup; /* Popup window */
-	GtkWidget *table; /* Main container for buttons */
-};
-
-/* ****************************************************************************
- * Local declarations
- * ************************************************************************* */
-static void
-img_table_button_set_property( GObject      *object,
-							   guint         prop_id,
-							   const GValue *value,
-							   GParamSpec   *pspec );
-
-static void
-img_table_button_get_property( GObject    *object,
-							   guint       prop_id,
-							   GValue     *value,
-							   GParamSpec *pspec );
-
-static void
-img_table_button_destroy( GtkObject *object );
-
-static void
-img_table_button_clicked( GtkButton *button );
-
-static void
-child_clicked( GObject        *child,
-			   ImgTableButton *parent );
-
-static void
-img_table_button_calc_popup_coords( GtkWidget             *widget,
-									ImgTableButtonPrivate *priv,
-									gint                  *x,
-									gint                  *y );
-
-static void
-img_table_button_clear_items( ImgTableButtonPrivate *priv );
-
-static void
-img_table_button_real_set_pixbufs( ImgTableButtonPrivate  *priv,
-								   gint                    no_images,
-								   GdkPixbuf             **pixbufs );
-
-static void
-img_table_button_calculate_layout( ImgTableButtonPrivate *priv );
-
-
-/* ****************************************************************************
- * Initialization
- * ************************************************************************* */
-G_DEFINE_TYPE( ImgTableButton, img_table_button, GTK_TYPE_BUTTON );
-
-static void
-img_table_button_class_init( ImgTableButtonClass *klass )
-{
-	GParamSpec     *spec;
-	GObjectClass   *gobject_class = G_OBJECT_CLASS( klass );
-	GtkObjectClass *object_class = (GtkObjectClass *)klass;
-	GtkButtonClass *button_class = (GtkButtonClass *)klass;
-
-	gobject_class->set_property = img_table_button_set_property;
-	gobject_class->get_property = img_table_button_get_property;
-	object_class->destroy = img_table_button_destroy;
-	button_class->clicked = img_table_button_clicked;
-	klass->active_item_changed = NULL;
-
-	/* Number of rows */
-	spec = g_param_spec_int( "rows", "Rows",
-							 "Number of rows in popup widget.",
-							 -1, G_MAXINT, -1, IMG_PARAM_READWRITE );
-	g_object_class_install_property( gobject_class, P_ROWS, spec );
-
-	/* Number of columns */
-	spec = g_param_spec_int( "columns", "Columns",
-							 "Number of columns in popup widget.",
-							 -1, G_MAXINT, -1, IMG_PARAM_READWRITE );
-	g_object_class_install_property( gobject_class, P_COLS, spec );
-
-	/* Nunber of images/string to be added onto buttons */
-	spec = g_param_spec_int( "number-of-items", "Number of items",
-							 "Number of items in pixbufs or labels array.",
-							 0, G_MAXINT, 0, IMG_PARAM_READ );
-	g_object_class_install_property( gobject_class, P_NO_ITEMS, spec );
-
-	/* Images to be added onto buttons */
-	spec = g_param_spec_pointer( "pixbufs", "Pixbufs",
-								 "Array of pixbufs for buttons.",
-								 IMG_PARAM_READ );
-	g_object_class_install_property( gobject_class, P_PIXBUFS, spec );
-
-	/* Labels to be added onto buttons */
-	spec = g_param_spec_pointer( "labels", "Labels", 
-								 "Array of labels for buttons.",
-								 IMG_PARAM_READ );
-	g_object_class_install_property( gobject_class, P_LABELS, spec );
-
-	/* Do labels use mnemonics? */
-	spec = g_param_spec_boolean( "use-mnemonics", "Use mnemonics",
-								 "Do labels contain mnemonics?",
-								 FALSE, IMG_PARAM_READWRITE );
-	g_object_class_install_property( gobject_class, P_USE_MNEMONICS, spec );
-
-	/* Do labels represent stock items? */
-	g_object_class_override_property( gobject_class, P_USE_STOCK, "use-stock" );
-
-	/* Currently active item */
-	spec = g_param_spec_int( "active-item", "Active item",
-							 "Index of currently active item.",
-							 -1, G_MAXINT, -1, IMG_PARAM_READWRITE );
-	g_object_class_install_property( gobject_class, P_ACTIVE_ITEM, spec );
-
-
-	/* Selection changed signal */
-	table_button_signalsS_ACTIVE_ITEM_CHANGED =
-		g_signal_new( "active-item-changed",
-					  G_TYPE_FROM_CLASS( klass ),
-					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET( ImgTableButtonClass,
-									   active_item_changed ),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__INT,
-					  G_TYPE_NONE, 1, G_TYPE_INT );
-
-	g_type_class_add_private( gobject_class, sizeof( ImgTableButtonPrivate ) );
-}
-
-static void
-img_table_button_init( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	/* Set default values for properties */
-	priv->rows = -1;
-	priv->cols = -1;
-	priv->no_items = 0;
-	priv->labels = NULL;
-	priv->pixbufs = NULL;
-	priv->use_mnemonics = FALSE;
-	priv->use_stock = FALSE;
-	priv->active_item = -1;
-
-	/* Create additional widgets */
-	priv->popup = gtk_window_new( GTK_WINDOW_POPUP );
-	g_signal_connect( G_OBJECT( priv->popup ), "leave-notify-event",
-					  G_CALLBACK( gtk_widget_hide ), NULL );
-
-	priv->table = NULL;
-}
-
-
-/* ****************************************************************************
- * Local functions
- * ************************************************************************* */
-static void
-img_table_button_set_property( GObject      *object,
-							   guint         prop_id,
-							   const GValue *value,
-							   GParamSpec   *pspec )
-{
-	ImgTableButton *button = IMG_TABLE_BUTTON( object );
-
-	switch( prop_id )
-	{
-		case P_ROWS:
-			img_table_button_set_rows( button, g_value_get_int( value ) );
-			break;
-
-		case P_COLS:
-			img_table_button_set_columns( button, g_value_get_int( value ) );
-			break;
-
-		case P_USE_MNEMONICS:
-			img_table_button_set_use_mnemonics( button,
-												g_value_get_boolean( value ) );
-			break;
-
-		case P_USE_STOCK:
-			img_table_button_set_use_stock( button,
-											g_value_get_boolean( value ) );
-			break;
-
-		case P_ACTIVE_ITEM:
-			img_table_button_set_active_item( button,
-											  g_value_get_int( value ) );
-			break;
-
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID( object, prop_id, pspec );
-			break;
-	}
-}
-
-static void
-img_table_button_get_property( GObject    *object,
-							   guint       prop_id,
-							   GValue     *value,
-							   GParamSpec *pspec )
-{
-	ImgTableButton *button = IMG_TABLE_BUTTON( object );
-
-	switch( prop_id )
-	{
-		case P_ROWS:
-			g_value_set_int( value, img_table_button_get_rows( button ) );
-			break;
-
-		case P_COLS:
-			g_value_set_int( value, img_table_button_get_columns( button ) );
-			break;
-
-		case P_NO_ITEMS:
-			g_value_set_int( value, img_table_button_get_no_items( button ) );
-			break;
-
-		case P_PIXBUFS:
-			{
-				GdkPixbuf **pixs;
-
-				pixs = img_table_button_get_pixbufs( button );
-				g_value_set_pointer( value, pixs );
-			}
-			break;
-
-		case P_LABELS:
-			{
-				gchar **labs;
-
-				labs = img_table_button_get_labels( button );
-				g_value_set_pointer( value, labs );
-			}
-			break;
-
-		case P_USE_MNEMONICS:
-			g_value_set_boolean( value,
-								 img_table_button_get_use_mnemonics( button ) );
-			break;
-
-		case P_USE_STOCK:
-			g_value_set_boolean( value,
-								 img_table_button_get_use_stock( button ) );
-			break;
-
-		case P_ACTIVE_ITEM:
-			g_value_set_int( value,
-							 img_table_button_get_active_item( button ) );
-			break;
-
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID( object, prop_id, pspec );
-			break;
-	}
-}
-
-static void
-img_table_button_destroy( GtkObject *object )
-{
-	/* Free structures here */
-	ImgTableButtonPrivate *priv = IMG_TABLE_BUTTON_GET_PRIVATE( object );
-	if( priv->popup )
-	{
-		img_table_button_clear_items( priv );
-
-		gtk_widget_destroy( priv->popup );
-		priv->popup = NULL;
-	}
-
-	GTK_OBJECT_CLASS( img_table_button_parent_class )->destroy( object );
-}
-
-static void
-img_table_button_clicked( GtkButton *button )
-{
-	ImgTableButtonPrivate *priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-	gint                   x,
-						   y;
-
-	/* Calculate proper position */
-	img_table_button_calc_popup_coords( GTK_WIDGET( button ), priv, &x, &y );
-	gtk_window_move( GTK_WINDOW( priv->popup ), x, y ); 
-	gtk_widget_show( priv->popup );
-}
-
-static void
-child_clicked( GObject        *child,
-			   ImgTableButton *parent )
-{
-	gint count;
-
-	count = GPOINTER_TO_INT( g_object_get_data( child, "count" ) );
-	img_table_button_set_active_item( parent, count );
-}
-
-static void
-img_table_button_calc_popup_coords( GtkWidget             *widget,
-									ImgTableButtonPrivate *priv,
-									gint                  *x,
-									gint                  *y )
-{
-	gint            a, b,
-				    monitor_n;
-	GdkScreen      *screen;
-	GdkRectangle    monitor;
-	GtkRequisition  req;
-
-	/* Calculate proper position */
-	gdk_window_get_origin( widget->window, &a, &b );
-	gtk_widget_size_request( priv->popup, &req );
-	a += widget->allocation.x - req.width;
-	b += widget->allocation.y - req.height;
-
-	screen = gtk_widget_get_screen( widget );
-	monitor_n = gdk_screen_get_monitor_at_window( screen, widget->window );
-	gdk_screen_get_monitor_geometry( screen, monitor_n, &monitor);
-	
-	if( a < monitor.x )
-		a = monitor.x;
-
-	if( b < monitor.y )
-		b = monitor.y;
-
-	*x = a;
-	*y = b;
-}
-
-static void
-img_table_button_clear_items( ImgTableButtonPrivate *priv )
-{
-	if( priv->pixbufs )
-	{
-		gint i;
-
-		for( i = 0; i < priv->no_items; i++ )
-			g_object_unref( G_OBJECT( priv->pixbufsi ) );
-		g_slice_free1( sizeof( GdkPixbuf * ) * priv->no_items, priv->pixbufs );
-		priv->pixbufs = NULL;
-	}
-	else if( priv->labels )
-	{
-		gint i;
-
-		for( i = 0; i < priv->no_items; i++ )
-			g_free( priv->labelsi );
-		g_slice_free1( sizeof( gchar * ) * priv->no_items, priv->labels );
-		priv->labels = NULL;
-	}
-
-	priv->no_items = 0;
-}
-
-static void
-img_table_button_real_set_pixbufs( ImgTableButtonPrivate  *priv,
-								   gint                    no_images,
-								   GdkPixbuf             **pixbufs )
-{
-	gint i;
-
-	priv->no_items = no_images;
-	priv->pixbufs = g_slice_alloc( sizeof( GdkPixbuf * ) * no_images );
-	for( i = 0; i < no_images; i++ )
-	{
-		priv->pixbufsi = pixbufsi;
-		g_object_ref( G_OBJECT( pixbufsi ) );
-	}
-}
-
-static void
-img_table_button_calculate_layout( ImgTableButtonPrivate *priv )
-{
-	gint root;
-
-	if( priv->rows < 0 && priv->cols > 0 )
-	{
-		/* Calculate number of rows from cols */
-		priv->rows = priv->no_items / priv->cols;
-		priv->rows += ( priv->no_items % priv->cols ? 1 : 0 );
-
-		return;
-	}
-
-	if( priv->rows > 0 && priv->cols < 0 )
-	{
-		/* Calculate numer fo cols from rows */
-		priv->cols = priv->no_items / priv->rows;
-		priv->cols += ( priv->no_items % priv->rows ? 1 : 0 );
-
-		return;
-	}
-
-	/* Calculate both */
-	root = (gint)sqrtf( priv->no_items );
-	if( ( root * root ) >= priv->no_items )
-	{
-		priv->rows = root;
-		priv->cols = root;
-	}
-	else if( ( root * ( root + 1 ) ) >= priv->no_items )
-	{
-		priv->rows = root + 1;
-		priv->cols = root;
-	}
-	else
-	{
-		priv->rows = root + 1;
-		priv->cols = root + 1;
-	}
-}
-
-/* ****************************************************************************
- * PUBLIC API
- * ************************************************************************* */
-
-GtkWidget *
-img_table_button_new( void )
-{
-	return( g_object_new( IMG_TYPE_TABLE_BUTTON, NULL ) );
-}
-
-void
-img_table_button_set_pixbufs( ImgTableButton  *button,
-							  gint             no_images,
-							  GdkPixbuf      **pixbufs )
-{
-	ImgTableButtonPrivate *priv;
-
-	g_return_if_fail( IMG_IS_TABLE_BUTTON( button ) );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	img_table_button_clear_items( priv );
-	img_table_button_real_set_pixbufs( priv, no_images, pixbufs );
-	if( priv->rows < 0 || priv->cols < 0 )
-		img_table_button_calculate_layout( priv );
-	img_table_button_update_layout( button );
-}
-
-void
-img_table_button_set_rows( ImgTableButton *button,
-						   gint            rows )
-{
-	ImgTableButtonPrivate *priv;
-
-	g_return_if_fail( IMG_IS_TABLE_BUTTON( button ) );
-	g_return_if_fail( rows > -2 && rows < G_MAXINT );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-	if( priv->rows == rows )
-		return;
-
-	priv->rows = rows;
-	if( priv->rows < 0 || priv->cols < 0 )
-		img_table_button_calculate_layout( priv );
-	img_table_button_update_layout( button );
-}
-
-void
-img_table_button_set_columns( ImgTableButton *button,
-							  gint            columns )
-{
-	ImgTableButtonPrivate *priv;
-
-	g_return_if_fail( IMG_IS_TABLE_BUTTON( button ) );
-	g_return_if_fail( columns > -2 && columns < G_MAXINT );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-	if( priv->cols == columns )
-		return;
-
-	priv->cols = columns;
-	if( priv->rows < 0 || priv->cols < 0 )
-		img_table_button_calculate_layout( priv );
-	img_table_button_update_layout( button );
-}
-
-
-void
-img_table_button_set_use_mnemonics( ImgTableButton *button,
-									gboolean        use_mnemonics )
-{
-	ImgTableButtonPrivate *priv;
-	gboolean               cmp;
-
-	g_return_if_fail( IMG_IS_TABLE_BUTTON( button ) );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-	cmp = ( use_mnemonics ? TRUE : FALSE );
-
-	if( priv->use_mnemonics == cmp )
-		return;
-
-	priv->use_mnemonics = cmp;
-	img_table_button_update_layout( button );
-}
-
-void
-img_table_button_set_use_stock( ImgTableButton *button,
-								gboolean        use_stock )
-{
-	ImgTableButtonPrivate *priv;
-	gboolean               cmp;
-
-	g_return_if_fail( IMG_IS_TABLE_BUTTON( button ) );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-	cmp = ( use_stock ? TRUE : FALSE );
-
-	if( priv->use_stock == cmp )
-		return;
-
-	priv->use_stock = cmp;
-	img_table_button_update_layout( button );
-}
-
-void
-img_table_button_set_active_item( ImgTableButton *button,
-								  gint            active )
-{
-	ImgTableButtonPrivate *priv;
-
-	g_return_if_fail( IMG_IS_TABLE_BUTTON( button ) );
-	g_return_if_fail( active > -2 && active < G_MAXINT );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	if( priv->active_item == active )
-	{
-		gtk_widget_hide( priv->popup );
-		return;
-	}
-
-	priv->active_item = MIN( active, priv->no_items - 1 );
-
-	/* If no items are present or nothing should be selected, destroy child
-	 * widget and display empty button */
-	if( ! priv->no_items || priv->active_item < 0 )
-	{
-		GtkWidget *child = gtk_bin_get_child( GTK_BIN( button ) );
-
-		if( child )
-			gtk_widget_destroy( child );
-
-		g_signal_emit( button, table_button_signalsS_ACTIVE_ITEM_CHANGED,
-					   0, priv->active_item );
-
-		return;
-	}
-
-	gtk_widget_hide( priv->popup );
-	if( priv->labels )
-		gtk_button_set_label( GTK_BUTTON( button ),
-							  priv->labelspriv->active_item );
-	else
-	{
-		GtkWidget *image;
-
-		image = gtk_bin_get_child( GTK_BIN( button ) );
-		if( ! image )
-		{
-			image = gtk_image_new();
-			gtk_container_add( GTK_CONTAINER( button ), image );
-			gtk_widget_show( image );
-		}
-
-		gtk_image_set_from_pixbuf( GTK_IMAGE( image ),
-								   priv->pixbufspriv->active_item );
-	}
-
-	g_signal_emit( button, table_button_signalsS_ACTIVE_ITEM_CHANGED,
-				   0, priv->active_item );
-}
-
-gint
-img_table_button_get_rows( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv;
-
-
-	g_return_val_if_fail( IMG_IS_TABLE_BUTTON( button ), -1 );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	return( priv->rows );
-}
-
-gint
-img_table_button_get_columns( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv;
-
-
-	g_return_val_if_fail( IMG_IS_TABLE_BUTTON( button ), -1 );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	return( priv->cols );
-}
-
-gint
-img_table_button_get_no_items( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv;
-
-
-	g_return_val_if_fail( IMG_IS_TABLE_BUTTON( button ), -1 );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	return( priv->no_items );
-}
-
-GdkPixbuf **
-img_table_button_get_pixbufs( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv;
-
-
-	g_return_val_if_fail( IMG_IS_TABLE_BUTTON( button ), NULL );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	return( priv->pixbufs );
-}
-
-gchar **
-img_table_button_get_labels( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv;
-
-
-	g_return_val_if_fail( IMG_IS_TABLE_BUTTON( button ), NULL );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	return( priv->labels );
-}
-
-gboolean
-img_table_button_get_use_mnemonics( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv;
-
-
-	g_return_val_if_fail( IMG_IS_TABLE_BUTTON( button ), FALSE );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	return( priv->use_mnemonics );
-}
-
-gboolean
-img_table_button_get_use_stock( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv;
-
-
-	g_return_val_if_fail( IMG_IS_TABLE_BUTTON( button ), FALSE );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	return( priv->use_stock );
-}
-
-gint
-img_table_button_get_active_item( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv;
-
-	g_return_val_if_fail( IMG_IS_TABLE_BUTTON( button ), -1 );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	return( priv->active_item );
-}
-
-void
-img_table_button_update_layout( ImgTableButton *button )
-{
-	ImgTableButtonPrivate *priv;
-	gint                   x,
-						   y,
-						   count = 0;
-	GtkWidget             *child;
-
-	g_return_if_fail( IMG_IS_TABLE_BUTTON( button ) );
-
-	priv = IMG_TABLE_BUTTON_GET_PRIVATE( button );
-
-	if( priv->table )
-	{
-		gtk_widget_destroy( priv->table );
-		priv->table = NULL;
-	}
-
-	if( ! priv->no_items )
-		return;
-
-	priv->table = gtk_table_new( priv->rows, priv->cols, TRUE );
-	gtk_container_add( GTK_CONTAINER( priv->popup ), priv->table );
-
-	/* This outer if is for diferent packing directions. Currently only
-	 * horizontal is implemented. */
-	if( TRUE )
-	{
-		for( x = 0; x < priv->rows; x++ )
-		{
-			for( y = 0;
-				 y < priv->cols && count < priv->no_items;
-				 y++, count++ )
-			{
-				if( priv->labels )
-				{
-					gchar *label = priv->labelscount;
-
-					child = gtk_button_new_with_label( label );
-					gtk_button_set_use_stock( GTK_BUTTON( child ),
-											  priv->use_stock );
-					gtk_button_set_use_underline( GTK_BUTTON( child ),
-												  priv->use_mnemonics );
-				}
-				else
-				{
-					GdkPixbuf *pix = priv->pixbufscount;
-					GtkWidget *image;
-
-					child = gtk_button_new();
-
-					image = gtk_image_new_from_pixbuf( pix );
-					gtk_container_add( GTK_CONTAINER( child ), image );
-				}
-
-				g_object_set_data( G_OBJECT( child ), "count",
-								   GINT_TO_POINTER( count ) );
-				g_signal_connect( G_OBJECT( child ), "clicked",
-								  G_CALLBACK( child_clicked ), button );
-				gtk_table_attach( GTK_TABLE( priv->table ), child, y, y + 1,
-								  x, x + 1, GTK_EXPAND | GTK_FILL,
-								  GTK_EXPAND | GTK_FILL, 0, 0 );
-			}
-		}
-	}
-
-	/* Prepare for showing */
-	gtk_widget_show_all( priv->table );
-}
-

imagination-3.0.tar.bz2/src/imgtablebutton.h Deleted

@@ -1,125 +0,0 @@
-/*
-** Copyright (C) 2009 Tadej Borovšak <tadeboro@gmail.com>
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __IMG_TABLE_BUTTON_H__
-#define __IMG_TABLE_BUTTON_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define IMG_TYPE_TABLE_BUTTON \
-	( img_table_button_get_type() )
-
-#define IMG_TABLE_BUTTON( obj ) \
-	( G_TYPE_CHECK_INSTANCE_CAST( ( obj ), \
-								  IMG_TYPE_TABLE_BUTTON, \
-								  ImgTableButton ) )
-
-#define IMG_TABLE_BUTTON_CLASS( klass ) \
-	( G_TYPE_CHECK_CLASS_CAST( ( klass ), \
-							   IMG_TYPE_TABLE_BUTTON_CLASS, \
-							   ImgTableButtonClass ) )
-
-#define IMG_IS_TABLE_BUTTON( obj ) \
-	( G_TYPE_CHECK_INSTANCE_TYPE( ( obj ), \
-								  IMG_TYPE_TABLE_BUTTON ) )
-
-#define IMG_IS_TABLE_BUTTON_CLASS( klass ) \
-	( G_TYPE_CHECK_CLASS_TYPE( ( klass ), \
-							   IMG_TYPE_TABLE_BUTTON_CLASS ) )
-
-typedef struct _ImgTableButton ImgTableButton;
-typedef struct _ImgTableButtonClass ImgTableButtonClass;
-
-struct _ImgTableButton
-{
-	GtkButton parent;
-};
-
-struct _ImgTableButtonClass
-{
-	GtkButtonClass parent_class;
-
-	void (* active_item_changed)( ImgTableButton *button,
-								  gint            item );
-};
-
-
-GType
-img_table_button_get_type( void ) G_GNUC_CONST;
-
-GtkWidget *
-img_table_button_new( void );
-
-void
-img_table_button_set_pixbufs( ImgTableButton  *button,
-							  gint             no_images,
-							  GdkPixbuf      **pixbufs );
-
-void
-img_table_button_set_rows( ImgTableButton *button,
-						   gint            rows );
-
-void
-img_table_button_set_columns( ImgTableButton *button,
-							  gint            columns );
-
-void
-img_table_button_set_use_mnemonics( ImgTableButton *button,
-									gboolean        use_mnemonics );
-
-void
-img_table_button_set_use_stock( ImgTableButton *button,
-								gboolean        use_stock );
-
-void
-img_table_button_set_active_item( ImgTableButton *button,
-								  gint            active );
-
-gint
-img_table_button_get_rows( ImgTableButton *button );
-
-gint
-img_table_button_get_columns( ImgTableButton *button );
-
-gint
-img_table_button_get_no_items( ImgTableButton *button );
-
-GdkPixbuf **
-img_table_button_get_pixbufs( ImgTableButton *button );
-
-gchar **
-img_table_button_get_labels( ImgTableButton *button );
-
-gboolean
-img_table_button_get_use_mnemonics( ImgTableButton *button );
-
-gboolean
-img_table_button_get_use_stock( ImgTableButton *button );
-
-gint
-img_table_button_get_active_item( ImgTableButton *button );
-
-void
-img_table_button_update_layout( ImgTableButton *button );
-
-G_END_DECLS
-
-#endif /* __IMG_TABLE_BUTTON_H__ */
-

imagination-3.0.tar.bz2/src/sexy-icon-entry.c Deleted

@@ -1,950 +0,0 @@
-/*
- * @file libsexy/sexy-icon-entry.c Entry widget
- *
- * @Copyright (C) 2004-2006 Christian Hammond.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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 <string.h>
-#include <gtk/gtk.h>
-#include "sexy-icon-entry.h"
-
-#define ICON_MARGIN 2
-#define MAX_ICONS 2
-
-#define IS_VALID_ICON_ENTRY_POSITION(pos) \
-	((pos) == SEXY_ICON_ENTRY_PRIMARY || \
-	 (pos) == SEXY_ICON_ENTRY_SECONDARY)
-
-typedef struct
-{
-	GtkImage *icon;
-	gboolean highlight;
-	gboolean hovered;
-	GdkWindow *window;
-
-} SexyIconInfo;
-
-struct _SexyIconEntryPriv
-{
-	SexyIconInfo iconsMAX_ICONS;
-
-	gulong icon_released_id;
-};
-
-enum
-{
-	ICON_PRESSED,
-	ICON_RELEASED,
-	LAST_SIGNAL
-};
-
-static void sexy_icon_entry_class_init(SexyIconEntryClass *klass);
-static void sexy_icon_entry_editable_init(GtkEditableClass *iface);
-static void sexy_icon_entry_init(SexyIconEntry *entry);
-static void sexy_icon_entry_finalize(GObject *obj);
-static void sexy_icon_entry_destroy(GtkObject *obj);
-static void sexy_icon_entry_map(GtkWidget *widget);
-static void sexy_icon_entry_unmap(GtkWidget *widget);
-static void sexy_icon_entry_realize(GtkWidget *widget);
-static void sexy_icon_entry_unrealize(GtkWidget *widget);
-static void sexy_icon_entry_size_request(GtkWidget *widget,
-										  GtkRequisition *requisition);
-static void sexy_icon_entry_size_allocate(GtkWidget *widget,
-										   GtkAllocation *allocation);
-static gint sexy_icon_entry_expose(GtkWidget *widget, GdkEventExpose *event);
-static gint sexy_icon_entry_enter_notify(GtkWidget *widget,
-											   GdkEventCrossing *event);
-static gint sexy_icon_entry_leave_notify(GtkWidget *widget,
-											   GdkEventCrossing *event);
-static gint sexy_icon_entry_button_press(GtkWidget *widget,
-											   GdkEventButton *event);
-static gint sexy_icon_entry_button_release(GtkWidget *widget,
-												 GdkEventButton *event);
-
-static GtkEntryClass *parent_class = NULL;
-static guint signalsLAST_SIGNAL = {0};
-
-G_DEFINE_TYPE_EXTENDED(SexyIconEntry, sexy_icon_entry, GTK_TYPE_ENTRY,
-					   0,
-					   G_IMPLEMENT_INTERFACE(GTK_TYPE_EDITABLE,
-											 sexy_icon_entry_editable_init));
-
-static void
-sexy_icon_entry_class_init(SexyIconEntryClass *klass)
-{
-	GObjectClass *gobject_class;
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	parent_class = g_type_class_peek_parent(klass);
-
-	gobject_class = G_OBJECT_CLASS(klass);
-	object_class  = GTK_OBJECT_CLASS(klass);
-	widget_class  = GTK_WIDGET_CLASS(klass);
-
-	gobject_class->finalize = sexy_icon_entry_finalize;
-
-	object_class->destroy = sexy_icon_entry_destroy;
-
-	widget_class->map = sexy_icon_entry_map;
-	widget_class->unmap = sexy_icon_entry_unmap;
-	widget_class->realize = sexy_icon_entry_realize;
-	widget_class->unrealize = sexy_icon_entry_unrealize;
-	widget_class->size_request = sexy_icon_entry_size_request;
-	widget_class->size_allocate = sexy_icon_entry_size_allocate;
-	widget_class->expose_event = sexy_icon_entry_expose;
-	widget_class->enter_notify_event = sexy_icon_entry_enter_notify;
-	widget_class->leave_notify_event = sexy_icon_entry_leave_notify;
-	widget_class->button_press_event = sexy_icon_entry_button_press;
-	widget_class->button_release_event = sexy_icon_entry_button_release;
-
-	/**
-	 * SexyIconEntry::icon-pressed:
-	 * @entry: The entry on which the signal is emitted.
-	 * @icon_pos: The position of the clicked icon.
-	 * @button: The mouse button clicked.
-	 *
-	 * The ::icon-pressed signal is emitted when an icon is clicked.
-	 */
-	signalsICON_PRESSED =
-		g_signal_new("icon_pressed",
-					 G_TYPE_FROM_CLASS(gobject_class),
-					 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-					 G_STRUCT_OFFSET(SexyIconEntryClass, icon_pressed),
-					 NULL, NULL,
-					 gtk_marshal_VOID__INT_INT,
-					 G_TYPE_NONE, 2,
-					 G_TYPE_INT,
-					 G_TYPE_INT);
-
-	/**
-	 * SexyIconEntry::icon-released:
-	 * @entry: The entry on which the signal is emitted.
-	 * @icon_pos: The position of the clicked icon.
-	 * @button: The mouse button clicked.
-	 *
-	 * The ::icon-released signal is emitted on the button release from a
-	 * mouse click.
-	 */
-	signalsICON_RELEASED =
-		g_signal_new("icon_released",
-					 G_TYPE_FROM_CLASS(gobject_class),
-					 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-					 G_STRUCT_OFFSET(SexyIconEntryClass, icon_released),
-					 NULL, NULL,
-					 gtk_marshal_VOID__INT_INT,
-					 G_TYPE_NONE, 2,
-					 G_TYPE_INT,
-					 G_TYPE_INT);
-}
-
-static void
-sexy_icon_entry_editable_init(GtkEditableClass *iface G_GNUC_UNUSED )
-{
-};
-
-static void
-sexy_icon_entry_init(SexyIconEntry *entry)
-{
-	entry->priv = g_new0(SexyIconEntryPriv, 1);
-}
-
-static void
-sexy_icon_entry_finalize(GObject *obj)
-{
-	SexyIconEntry *entry;
-
-	g_return_if_fail(obj != NULL);
-	g_return_if_fail(SEXY_IS_ICON_ENTRY(obj));
-
-	entry = SEXY_ICON_ENTRY(obj);
-
-	g_free(entry->priv);
-
-	if (G_OBJECT_CLASS(parent_class)->finalize)
-		G_OBJECT_CLASS(parent_class)->finalize(obj);
-}
-
-static void
-sexy_icon_entry_destroy(GtkObject *obj)
-{
-	SexyIconEntry *entry;
-
-	entry = SEXY_ICON_ENTRY(obj);
-
-	sexy_icon_entry_set_icon(entry, SEXY_ICON_ENTRY_PRIMARY, NULL);
-	sexy_icon_entry_set_icon(entry, SEXY_ICON_ENTRY_SECONDARY, NULL);
-
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(obj);
-}
-
-static void
-sexy_icon_entry_map(GtkWidget *widget)
-{
-	if (GTK_WIDGET_REALIZED(widget) && !GTK_WIDGET_MAPPED(widget))
-	{
-		SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
-		int i;
-
-		GTK_WIDGET_CLASS(parent_class)->map(widget);
-
-		for (i = 0; i < MAX_ICONS; i++)
-		{
-			if (entry->priv->iconsi.icon != NULL)
-				gdk_window_show(entry->priv->iconsi.window);
-		}
-	}
-}
-
-static void
-sexy_icon_entry_unmap(GtkWidget *widget)
-{
-	if (GTK_WIDGET_MAPPED(widget))
-	{
-		SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
-		int i;
-
-		for (i = 0; i < MAX_ICONS; i++)
-		{
-			if (entry->priv->iconsi.icon != NULL)
-				gdk_window_hide(entry->priv->iconsi.window);
-		}
-
-		GTK_WIDGET_CLASS(parent_class)->unmap(widget);
-	}
-}
-
-static gint
-get_icon_width(SexyIconEntry *entry, SexyIconEntryPosition icon_pos)
-{
-	GtkRequisition requisition;
-	gint menu_icon_width;
-	gint width;
-	SexyIconInfo *icon_info = &entry->priv->iconsicon_pos;
-
-	if (icon_info->icon == NULL)
-		return 0;
-
-	gtk_widget_size_request(GTK_WIDGET(icon_info->icon), &requisition);
-	gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &menu_icon_width, NULL);
-
-	width = MAX(requisition.width, menu_icon_width);
-
-	return width;
-}
-
-static void
-get_borders(SexyIconEntry *entry, gint *xborder, gint *yborder)
-{
-	GtkWidget *widget = GTK_WIDGET(entry);
-	gint focus_width;
-	gboolean interior_focus;
-
-	gtk_widget_style_get(widget,
-						 "interior-focus", &interior_focus,
-						 "focus-line-width", &focus_width,
-						 NULL);
-
-	if (gtk_entry_get_has_frame(GTK_ENTRY(entry)))
-	{
-		*xborder = widget->style->xthickness;
-		*yborder = widget->style->ythickness;
-	}
-	else
-	{
-		*xborder = 0;
-		*yborder = 0;
-	}
-
-	if (!interior_focus)
-	{
-		*xborder += focus_width;
-		*yborder += focus_width;
-	}
-}
-
-static void
-get_text_area_size(SexyIconEntry *entry, GtkAllocation *alloc)
-{
-	GtkWidget *widget = GTK_WIDGET(entry);
-	GtkRequisition requisition;
-	gint xborder, yborder;
-
-	gtk_widget_get_child_requisition(widget, &requisition);
-	get_borders(entry, &xborder, &yborder);
-
-	alloc->x      = xborder;
-	alloc->y      = yborder;
-	alloc->width  = widget->allocation.width - xborder * 2;
-	alloc->height = requisition.height       - yborder * 2;
-}
-
-static void
-get_icon_allocation(SexyIconEntry *icon_entry,
-					gboolean left,
-					GtkAllocation *widget_alloc G_GNUC_UNUSED,
-					GtkAllocation *text_area_alloc,
-					GtkAllocation *allocation,
-					SexyIconEntryPosition *icon_pos)
-{
-	gboolean rtl;
-
-	rtl = (gtk_widget_get_direction(GTK_WIDGET(icon_entry)) ==
-		   GTK_TEXT_DIR_RTL);
-
-	if (left)
-		*icon_pos = (rtl ? SEXY_ICON_ENTRY_SECONDARY : SEXY_ICON_ENTRY_PRIMARY);
-	else
-		*icon_pos = (rtl ? SEXY_ICON_ENTRY_PRIMARY : SEXY_ICON_ENTRY_SECONDARY);
-
-	allocation->y = text_area_alloc->y;
-	allocation->width = get_icon_width(icon_entry, *icon_pos);
-	allocation->height = text_area_alloc->height;
-
-	if (left)
-		allocation->x = text_area_alloc->x + ICON_MARGIN;
-	else
-	{
-		allocation->x = text_area_alloc->x + text_area_alloc->width -
-		                allocation->width - ICON_MARGIN;
-	}
-}
-
-static void
-sexy_icon_entry_realize(GtkWidget *widget)
-{
-	SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
-	GdkWindowAttr attributes;
-	gint attributes_mask;
-	int i;
-
-	GTK_WIDGET_CLASS(parent_class)->realize(widget);
-
-	attributes.x = 0;
-	attributes.y = 0;
-	attributes.width = 1;
-	attributes.height = 1;
-	attributes.window_type = GDK_WINDOW_CHILD;
-	attributes.wclass = GDK_INPUT_OUTPUT;
-	attributes.visual = gtk_widget_get_visual(widget);
-	attributes.colormap = gtk_widget_get_colormap(widget);
-	attributes.event_mask = gtk_widget_get_events(widget);
-	attributes.event_mask |=
-		(GDK_EXPOSURE_MASK
-		 | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-		 | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
-
-	attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
-	for (i = 0; i < MAX_ICONS; i++)
-	{
-		SexyIconInfo *icon_info;
-
-		icon_info = &entry->priv->iconsi;
-		icon_info->window = gdk_window_new(widget->window, &attributes,
-										   attributes_mask);
-		gdk_window_set_user_data(icon_info->window, widget);
-
-		gdk_window_set_background(icon_info->window,
-			&widget->style->baseGTK_WIDGET_STATE(widget));
-	}
-
-	gtk_widget_queue_resize(widget);
-}
-
-static void
-sexy_icon_entry_unrealize(GtkWidget *widget)
-{
-	SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
-	int i;
-
-	GTK_WIDGET_CLASS(parent_class)->unrealize(widget);
-
-	for (i = 0; i < MAX_ICONS; i++)
-	{
-		SexyIconInfo *icon_info = &entry->priv->iconsi;
-
-		gdk_window_destroy(icon_info->window);
-		icon_info->window = NULL;
-	}
-}
-
-static void
-sexy_icon_entry_size_request(GtkWidget *widget, GtkRequisition *requisition)
-{
-	SexyIconEntry *entry;
-	gint icon_widths = 0;
-	int i;
-
-	entry    = SEXY_ICON_ENTRY(widget);
-
-	for (i = 0; i < MAX_ICONS; i++)
-	{
-		int icon_width = get_icon_width(entry, i);
-
-		if (icon_width > 0)
-			icon_widths += icon_width + ICON_MARGIN;
-	}
-
-	GTK_WIDGET_CLASS(parent_class)->size_request(widget, requisition);
-
-	if (icon_widths > requisition->width)
-		requisition->width += icon_widths;
-}
-
-static void
-place_windows(SexyIconEntry *icon_entry, GtkAllocation *widget_alloc)
-{
-	SexyIconEntryPosition left_icon_pos;
-	SexyIconEntryPosition right_icon_pos;
-	GtkAllocation left_icon_alloc;
-	GtkAllocation right_icon_alloc;
-	GtkAllocation text_area_alloc;
-
-	get_text_area_size(icon_entry, &text_area_alloc);
-	get_icon_allocation(icon_entry, TRUE, widget_alloc, &text_area_alloc,
-						&left_icon_alloc, &left_icon_pos);
-	get_icon_allocation(icon_entry, FALSE, widget_alloc, &text_area_alloc,
-						&right_icon_alloc, &right_icon_pos);
-
-	if (left_icon_alloc.width > 0)
-	{
-		text_area_alloc.x = left_icon_alloc.x + left_icon_alloc.width +
-		                    ICON_MARGIN;
-	}
-
-	if (right_icon_alloc.width > 0)
-		text_area_alloc.width -= right_icon_alloc.width + ICON_MARGIN;
-
-	text_area_alloc.width -= text_area_alloc.x;
-
-	gdk_window_move_resize(icon_entry->priv->iconsleft_icon_pos.window,
-						   left_icon_alloc.x, left_icon_alloc.y,
-						   left_icon_alloc.width, left_icon_alloc.height);
-
-	gdk_window_move_resize(icon_entry->priv->iconsright_icon_pos.window,
-						   right_icon_alloc.x, right_icon_alloc.y,
-						   right_icon_alloc.width, right_icon_alloc.height);
-
-	gdk_window_move_resize(GTK_ENTRY(icon_entry)->text_area,
-						   text_area_alloc.x, text_area_alloc.y,
-						   text_area_alloc.width, text_area_alloc.height);
-}
-
-static void
-sexy_icon_entry_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-	g_return_if_fail(SEXY_IS_ICON_ENTRY(widget));
-	g_return_if_fail(allocation != NULL);
-
-	widget->allocation = *allocation;
-
-	GTK_WIDGET_CLASS(parent_class)->size_allocate(widget, allocation);
-
-	if (GTK_WIDGET_REALIZED(widget))
-		place_windows(SEXY_ICON_ENTRY(widget), allocation);
-}
-
-static GdkPixbuf *
-get_pixbuf_from_icon(SexyIconEntry *entry, SexyIconEntryPosition icon_pos)
-{
-	GdkPixbuf *pixbuf = NULL;
-	gchar *stock_id;
-	SexyIconInfo *icon_info = &entry->priv->iconsicon_pos;
-	GtkIconSize size;
-
-	switch (gtk_image_get_storage_type(GTK_IMAGE(icon_info->icon)))
-	{
-		case GTK_IMAGE_PIXBUF:
-			pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(icon_info->icon));
-			g_object_ref(pixbuf);
-			break;
-
-		case GTK_IMAGE_STOCK:
-			gtk_image_get_stock(GTK_IMAGE(icon_info->icon), &stock_id, &size);
-			pixbuf = gtk_widget_render_icon(GTK_WIDGET(entry),
-											stock_id, size, NULL);
-			break;
-
-		default:
-			return NULL;
-	}
-
-	return pixbuf;
-}
-
-/* Kudos to the gnome-panel guys. */
-static void
-colorshift_pixbuf(GdkPixbuf *dest, GdkPixbuf *src, int shift)
-{
-	gint i, j;
-	gint width, height, has_alpha, src_rowstride, dest_rowstride;
-	guchar *target_pixels;
-	guchar *original_pixels;
-	guchar *pix_src;
-	guchar *pix_dest;
-	int val;
-	guchar r, g, b;
-
-	has_alpha       = gdk_pixbuf_get_has_alpha(src);
-	width           = gdk_pixbuf_get_width(src);
-	height          = gdk_pixbuf_get_height(src);
-	src_rowstride   = gdk_pixbuf_get_rowstride(src);
-	dest_rowstride  = gdk_pixbuf_get_rowstride(dest);
-	original_pixels = gdk_pixbuf_get_pixels(src);
-	target_pixels   = gdk_pixbuf_get_pixels(dest);
-
-	for (i = 0; i < height; i++)
-	{
-		pix_dest = target_pixels   + i * dest_rowstride;
-		pix_src  = original_pixels + i * src_rowstride;
-
-		for (j = 0; j < width; j++)
-		{
-			r = *(pix_src++);
-			g = *(pix_src++);
-			b = *(pix_src++);
-
-			val = r + shift;
-			*(pix_dest++) = CLAMP(val, 0, 255);
-
-			val = g + shift;
-			*(pix_dest++) = CLAMP(val, 0, 255);
-
-			val = b + shift;
-			*(pix_dest++) = CLAMP(val, 0, 255);
-
-			if (has_alpha)
-				*(pix_dest++) = *(pix_src++);
-		}
-	}
-}
-
-static void
-draw_icon(GtkWidget *widget, SexyIconEntryPosition icon_pos)
-{
-	SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
-	SexyIconInfo *icon_info = &entry->priv->iconsicon_pos;
-	GdkPixbuf *pixbuf;
-	gint x, y, width, height;
-
-	if (icon_info->icon == NULL || !GTK_WIDGET_REALIZED(widget))
-		return;
-
-	if ((pixbuf = get_pixbuf_from_icon(entry, icon_pos)) == NULL)
-		return;
-
-	gdk_drawable_get_size(icon_info->window, &width, &height);
-
-	if (width == 1 || height == 1)
-	{
-		/*
-		 * size_allocate hasn't been called yet. These are the default values.
-		 */
-		return;
-	}
-
-	if (gdk_pixbuf_get_height(pixbuf) > height)
-	{
-		GdkPixbuf *temp_pixbuf;
-		int scale;
-
-		scale = height - (2 * ICON_MARGIN);
-
-		temp_pixbuf = gdk_pixbuf_scale_simple(pixbuf, scale, scale, GDK_INTERP_BILINEAR);
-
-		g_object_unref(pixbuf);
-
-		pixbuf = temp_pixbuf;
-	}
-
-	x = (width  - gdk_pixbuf_get_width(pixbuf)) / 2;
-	y = (height - gdk_pixbuf_get_height(pixbuf)) / 2;
-
-	if (icon_info->hovered)
-	{
-		GdkPixbuf *temp_pixbuf;
-
-		temp_pixbuf = gdk_pixbuf_copy(pixbuf);
-
-		colorshift_pixbuf(temp_pixbuf, pixbuf, 30);
-
-		g_object_unref(pixbuf);
-
-		pixbuf = temp_pixbuf;
-	}
-
-	gdk_draw_pixbuf(icon_info->window, widget->style->black_gc, pixbuf,
-					0, 0, x, y, -1, -1,
-					GDK_RGB_DITHER_NORMAL, 0, 0);
-
-	g_object_unref(pixbuf);
-}
-
-static gint
-sexy_icon_entry_expose(GtkWidget *widget, GdkEventExpose *event)
-{
-	SexyIconEntry *entry;
-
-	g_return_val_if_fail(SEXY_IS_ICON_ENTRY(widget), FALSE);
-	g_return_val_if_fail(event != NULL, FALSE);
-
-	entry = SEXY_ICON_ENTRY(widget);
-
-	if (GTK_WIDGET_DRAWABLE(widget))
-	{
-		gboolean found = FALSE;
-		int i;
-
-		for (i = 0; i < MAX_ICONS && !found; i++)
-		{
-			SexyIconInfo *icon_info = &entry->priv->iconsi;
-
-			if (event->window == icon_info->window)
-			{
-				gint width;
-				GtkAllocation text_area_alloc;
-
-				get_text_area_size(entry, &text_area_alloc);
-				gdk_drawable_get_size(icon_info->window, &width, NULL);
-
-				gtk_paint_flat_box(widget->style, icon_info->window,
-								   GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
-								   NULL, widget, "entry_bg",
-								   0, 0, width, text_area_alloc.height);
-
-				draw_icon(widget, i);
-
-				found = TRUE;
-			}
-		}
-
-		if (!found)
-			GTK_WIDGET_CLASS(parent_class)->expose_event(widget, event);
-	}
-
-	return FALSE;
-}
-
-static void
-update_icon(GObject *obj G_GNUC_UNUSED, GParamSpec *param, SexyIconEntry *entry)
-{
-	if (param != NULL)
-	{
-		const char *name = g_param_spec_get_name(param);
-
-		if (strcmp(name, "pixbuf")   && strcmp(name, "stock")  &&
-			strcmp(name, "image")    && strcmp(name, "pixmap") &&
-			strcmp(name, "icon_set") && strcmp(name, "pixbuf_animation"))
-		{
-			return;
-		}
-	}
-
-	gtk_widget_queue_resize(GTK_WIDGET(entry));
-}
-
-static gint
-sexy_icon_entry_enter_notify(GtkWidget *widget, GdkEventCrossing *event)
-{
-	SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
-	int i;
-
-	for (i = 0; i < MAX_ICONS; i++)
-	{
-		if (event->window == entry->priv->iconsi.window)
-		{
-			if (sexy_icon_entry_get_icon_highlight(entry, i))
-			{
-				entry->priv->iconsi.hovered = TRUE;
-
-				update_icon(NULL, NULL, entry);
-
-				break;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-static gint
-sexy_icon_entry_leave_notify(GtkWidget *widget, GdkEventCrossing *event)
-{
-	SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
-	int i;
-
-	for (i = 0; i < MAX_ICONS; i++)
-	{
-		if (event->window == entry->priv->iconsi.window)
-		{
-			if (sexy_icon_entry_get_icon_highlight(entry, i))
-			{
-				entry->priv->iconsi.hovered = FALSE;
-
-				update_icon(NULL, NULL, entry);
-
-				break;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-static gint
-sexy_icon_entry_button_press(GtkWidget *widget, GdkEventButton *event)
-{
-	SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
-	int i;
-
-	for (i = 0; i < MAX_ICONS; i++)
-	{
-		if (event->window == entry->priv->iconsi.window)
-		{
-			if (event->button == 1 &&
-				sexy_icon_entry_get_icon_highlight(entry, i))
-			{
-				entry->priv->iconsi.hovered = FALSE;
-
-				update_icon(NULL, NULL, entry);
-			}
-
-			g_signal_emit(entry, signalsICON_PRESSED, 0, i, event->button);
-
-			return TRUE;
-		}
-	}
-
-	if (GTK_WIDGET_CLASS(parent_class)->button_press_event)
-		return GTK_WIDGET_CLASS(parent_class)->button_press_event(widget,
-																  event);
-
-	return FALSE;
-}
-
-static gint
-sexy_icon_entry_button_release(GtkWidget *widget, GdkEventButton *event)
-{
-	SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
-	int i;
-
-	for (i = 0; i < MAX_ICONS; i++)
-	{
-		GdkWindow *icon_window = entry->priv->iconsi.window;
-
-		if (event->window == icon_window)
-		{
-			int width, height;
-			gdk_drawable_get_size(icon_window, &width, &height);
-
-			if (event->button == 1 &&
-				sexy_icon_entry_get_icon_highlight(entry, i) &&
-				event->x >= 0     && event->y >= 0 &&
-				event->x <= width && event->y <= height)
-			{
-				entry->priv->iconsi.hovered = TRUE;
-
-				update_icon(NULL, NULL, entry);
-			}
-
-			g_signal_emit(entry, signalsICON_RELEASED, 0, i, event->button);
-
-			return TRUE;
-		}
-	}
-
-	if (GTK_WIDGET_CLASS(parent_class)->button_release_event)
-		return GTK_WIDGET_CLASS(parent_class)->button_release_event(widget,
-																	event);
-
-	return FALSE;
-}
-
-/**
- * sexy_icon_entry_new
- *
- * Creates a new SexyIconEntry widget.
- *
- * Returns a new #SexyIconEntry.
- */
-GtkWidget *
-sexy_icon_entry_new(void)
-{
-	return GTK_WIDGET(g_object_new(SEXY_TYPE_ICON_ENTRY, NULL));
-}
-
-/**
- * sexy_icon_entry_set_icon
- * @entry: A #SexyIconEntry.
- * @position: Icon position.
- * @icon: A #GtkImage to set as the icon.
- *
- * Sets the icon shown in the entry
- */
-void
-sexy_icon_entry_set_icon(SexyIconEntry *entry, SexyIconEntryPosition icon_pos,
-						 GtkImage *icon)
-{
-	SexyIconInfo *icon_info;
-
-	g_return_if_fail(entry != NULL);
-	g_return_if_fail(SEXY_IS_ICON_ENTRY(entry));
-	g_return_if_fail(IS_VALID_ICON_ENTRY_POSITION(icon_pos));
-	g_return_if_fail(icon == NULL || GTK_IS_IMAGE(icon));
-
-	icon_info = &entry->priv->iconsicon_pos;
-
-	if (icon == icon_info->icon)
-		return;
-
-	if (icon_pos == SEXY_ICON_ENTRY_SECONDARY &&
-		entry->priv->icon_released_id != 0)
-	{
-		g_signal_handler_disconnect(entry, entry->priv->icon_released_id);
-		entry->priv->icon_released_id = 0;
-	}
-
-	if (icon == NULL)
-	{
-		if (icon_info->icon != NULL)
-		{
-			gtk_widget_destroy(GTK_WIDGET(icon_info->icon));
-			icon_info->icon = NULL;
-
-			/*
-			 * Explicitly check, as the pointer may become invalidated
-			 * during destruction.
-			 */
-			if (icon_info->window != NULL && GDK_IS_WINDOW(icon_info->window))
-				gdk_window_hide(icon_info->window);
-		}
-	}
-	else
-	{
-		if (icon_info->window != NULL && icon_info->icon == NULL)
-			gdk_window_show(icon_info->window);
-
-		g_signal_connect(G_OBJECT(icon), "notify",
-						 G_CALLBACK(update_icon), entry);
-
-		icon_info->icon = icon;
-		g_object_ref(icon);
-	}
-
-	update_icon(NULL, NULL, entry);
-}
-
-/**
- * sexy_icon_entry_set_icon_highlight
- * @entry: A #SexyIconEntry;
- * @position: Icon position.
- * @highlight: TRUE if the icon should highlight on mouse-over
- *
- * Determines whether the icon will highlight on mouse-over.
- */
-void
-sexy_icon_entry_set_icon_highlight(SexyIconEntry *entry,
-								   SexyIconEntryPosition icon_pos,
-								   gboolean highlight)
-{
-	SexyIconInfo *icon_info;
-
-	g_return_if_fail(entry != NULL);
-	g_return_if_fail(SEXY_IS_ICON_ENTRY(entry));
-	g_return_if_fail(IS_VALID_ICON_ENTRY_POSITION(icon_pos));
-
-	icon_info = &entry->priv->iconsicon_pos;
-
-	if (icon_info->highlight == highlight)
-		return;
-
-	icon_info->highlight = highlight;
-}
-
-/**
- * sexy_icon_entry_get_icon
- * @entry: A #SexyIconEntry.
- * @position: Icon position.
- *
- * Retrieves the image used for the icon
- *
- * Returns: A #GtkImage.
- */
-GtkImage *
-sexy_icon_entry_get_icon(const SexyIconEntry *entry,
-						 SexyIconEntryPosition icon_pos)
-{
-	g_return_val_if_fail(entry != NULL, NULL);
-	g_return_val_if_fail(SEXY_IS_ICON_ENTRY(entry), NULL);
-	g_return_val_if_fail(IS_VALID_ICON_ENTRY_POSITION(icon_pos), NULL);
-
-	return entry->priv->iconsicon_pos.icon;
-}
-
-/**
- * sexy_icon_entry_get_icon_highlight
- * @entry: A #SexyIconEntry.
- * @position: Icon position.
- *
- * Retrieves whether entry will highlight the icon on mouseover.
- *
- * Returns: TRUE if icon highlights.
- */
-gboolean
-sexy_icon_entry_get_icon_highlight(const SexyIconEntry *entry,
-								   SexyIconEntryPosition icon_pos)
-{
-	g_return_val_if_fail(entry != NULL, FALSE);
-	g_return_val_if_fail(SEXY_IS_ICON_ENTRY(entry), FALSE);
-	g_return_val_if_fail(IS_VALID_ICON_ENTRY_POSITION(icon_pos), FALSE);
-
-	return entry->priv->iconsicon_pos.highlight;
-}
-
-/**
- * sexy_icon_entry_add_clear_button
- * @icon_entry: A #SexyIconEntry.
- *
- * A convenience function to add a clear button to the end of the entry.
- * This is useful for search boxes.
- */
-void
-sexy_icon_entry_add_clear_button(SexyIconEntry *icon_entry,gpointer data, gpointer function)
-{
-	GtkWidget *icon;
-
-	g_return_if_fail(icon_entry != NULL);
-	g_return_if_fail(SEXY_IS_ICON_ENTRY(icon_entry));
-
-	icon = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-	gtk_widget_show(icon);
-	sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(icon_entry),
-							 SEXY_ICON_ENTRY_SECONDARY,
-							 GTK_IMAGE(icon));
-	sexy_icon_entry_set_icon_highlight(SEXY_ICON_ENTRY(icon_entry),
-									   SEXY_ICON_ENTRY_SECONDARY, TRUE);
-
-	if (icon_entry->priv->icon_released_id != 0)
-	{
-		g_signal_handler_disconnect(icon_entry,
-									icon_entry->priv->icon_released_id);
-	}
-
-	icon_entry->priv->icon_released_id = g_signal_connect(G_OBJECT(icon_entry), "icon_released",G_CALLBACK(function), data);
-}

imagination-3.0.tar.bz2/src/sexy-icon-entry.h Deleted

@@ -1,101 +0,0 @@
-/*
- * @file libsexy/sexy-icon-entry.h Entry widget
- *
- * @Copyright (C) 2004-2006 Christian Hammond.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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 _SEXY_ICON_ENTRY_H_
-#define _SEXY_ICON_ENTRY_H_
-
-typedef struct _SexyIconEntry      SexyIconEntry;
-typedef struct _SexyIconEntryClass SexyIconEntryClass;
-typedef struct _SexyIconEntryPriv  SexyIconEntryPriv;
-
-#include <gtk/gtkentry.h>
-#include <gtk/gtkimage.h>
-
-#define SEXY_TYPE_ICON_ENTRY (sexy_icon_entry_get_type())
-#define SEXY_ICON_ENTRY(obj) \
-		(G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_ICON_ENTRY, SexyIconEntry))
-#define SEXY_ICON_ENTRY_CLASS(klass) \
-		(G_TYPE_CHECK_CLASS_CAST((klass), SEXY_TYPE_ICON_ENTRY, SexyIconEntryClass))
-#define SEXY_IS_ICON_ENTRY(obj) \
-		(G_TYPE_CHECK_INSTANCE_TYPE((obj), SEXY_TYPE_ICON_ENTRY))
-#define SEXY_IS_ICON_ENTRY_CLASS(klass) \
-		(G_TYPE_CHECK_CLASS_TYPE((klass), SEXY_TYPE_ICON_ENTRY))
-#define SEXY_ICON_ENTRY_GET_CLASS(obj) \
-		(G_TYPE_INSTANCE_GET_CLASS ((obj), SEXY_TYPE_ICON_ENTRY, SexyIconEntryClass))
-
-typedef enum
-{
-	SEXY_ICON_ENTRY_PRIMARY,
-	SEXY_ICON_ENTRY_SECONDARY
-
-} SexyIconEntryPosition;
-
-struct _SexyIconEntry
-{
-	GtkEntry parent_object;
-
-	SexyIconEntryPriv *priv;
-
-	void (*gtk_reserved1)(void);
-	void (*gtk_reserved2)(void);
-	void (*gtk_reserved3)(void);
-	void (*gtk_reserved4)(void);
-};
-
-struct _SexyIconEntryClass
-{
-	GtkEntryClass parent_class;
-
-	/* Signals */
-	void (*icon_pressed)(SexyIconEntry *entry, SexyIconEntryPosition icon_pos,
-						 int button);
-	void (*icon_released)(SexyIconEntry *entry, SexyIconEntryPosition icon_pos,
-						  int button);
-
-	void (*gtk_reserved1)(void);
-	void (*gtk_reserved2)(void);
-	void (*gtk_reserved3)(void);
-	void (*gtk_reserved4)(void);
-};
-
-G_BEGIN_DECLS
-
-GType sexy_icon_entry_get_type(void);
-
-GtkWidget *sexy_icon_entry_new(void);
-
-void sexy_icon_entry_set_icon(SexyIconEntry *entry,
-							  SexyIconEntryPosition position,
-							  GtkImage *icon);
-
-void sexy_icon_entry_set_icon_highlight(SexyIconEntry *entry,
-										SexyIconEntryPosition position,
-										gboolean highlight);
-
-GtkImage *sexy_icon_entry_get_icon(const SexyIconEntry *entry,
-								   SexyIconEntryPosition position);
-
-gboolean sexy_icon_entry_get_icon_highlight(const SexyIconEntry *entry,
-											SexyIconEntryPosition position);
-void sexy_icon_entry_add_clear_button(SexyIconEntry *icon_entry,gpointer, gpointer);
-
-G_END_DECLS
-
-#endif /* _SEXY_ICON_ENTRY_H_ */

imagination-3.0.tar.bz2/ChangeLog -> imagination-3.4.tar.bz2/ChangeLog Changed

@@ -1,5 +1,38 @@
 Imagination changelog
 
+18/12/18 - 3.4		- Subtitle info are no more saved in the project file if the slide hasn't any text.
+			- Starting the preview from the middle plays music accordingly to its timing in the slideshow.
+			- Project can be ported to other media as filenames can be saved without their path.
+			- Subtitle can be now rotated.
+			- Subtitle can now be freely positioned on the slide.
+			- Added a nice fading gradient animation in the Add/Edit slide dialog.
+			- Fixed seg-fault when trying to delete a slide when preview is running.
+			- Current slideshow is no more closed if user cancels when opening a new one.
+			- Enjoy FULLSCREEN preview with background music and continuos mode. WOOOOOOOOOOW !!!
+			- The CTRL+A shortcut doesn't select all the slides anymore when pressed from the subtitle widget entry.
+			- Subtitles can now have a pattern.
+			- Empty slide background can now be edited.
+			- Subtitle can have a background.
+			- Got rid of Update button in the Slide Motion as it's now automatic.
+			- Got rid of subtitle placing option.
+			- Moved Add and Remove buttons in the Slide Motion on the right.
+14/10/18 - 3.1:
+			- Export is now much faster than 3.0!
+			- Ending the slideshow with a blank slide with the same transition applied to the first one is now optional.
+			- Added an elapsed time information in the Export dialog.
+			- Made the slides to be selected during the preview/export and their number shown on the menu bar.
+			- Fixed seg-fault when trying to rotate gradient/text slides.
+			- Current slideshow is not closed anymore when clicking ok/cancel in the properties/new slideshow dialog.
+			- Slide duration can be finally set to less than a second. That was a long requested feature!
+			- Added patch from Giovanni Mariani to fix ffmpeg cmd line error when producing VOB.
+			- Added two more text transitions and moved -r encoder option before the input filename thanks to Bruce Guenter. 
+			- Fixed bugs #82 and #83 thanks to Davide Capodaglio. 
+            		- Fixed compilation error on Fedora 13 (check for libm)
+            		- Fix loading of slides without image, bug #3306969
+            		- Fix: Propose a project name (unknown.img) when saving a new project from the "save" button.
+            		- The video formats code was rewritten, including saving/loading the project settings. Fixes bug #3306974.
+            		- Added H.264/MPEG-4 AVC support, thanks to David Gnedt
+
 06/03/11 - 3.0:
 			- Added Chinese simplified and Chinese traditional translations.
 			- Icons in the transition menu are animated.

imagination-3.0.tar.bz2/INSTALL -> imagination-3.4.tar.bz2/INSTALL Changed

@@ -1,19 +1,25 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -159,10 +222,15 @@
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -174,6 +242,16 @@
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +267,8 @@
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -230,9 +309,10 @@
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -277,7 +357,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
@@ -288,4 +368,3 @@
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-

imagination-3.0.tar.bz2/Makefile.in -> imagination-3.4.tar.bz2/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,34 +89,44 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
-	install-sh ltmain.sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -84,23 +148,56 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(desktopdir)"
 DATA = $(desktop_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
+	INSTALL NEWS README TODO compile config.guess config.sub \
+	depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$^/*$/.*$$,\1,'; \
@@ -128,7 +225,10 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -150,6 +250,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -173,6 +274,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -181,8 +287,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -228,6 +336,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -256,11 +365,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,6 +378,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -296,7 +407,7 @@
 all: all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -311,7 +422,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -341,8 +451,11 @@
 	-rm -f libtool config.lt
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -356,27 +469,28 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -391,57 +505,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -457,12 +526,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -474,15 +538,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -491,9 +551,31 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -529,13 +611,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -566,37 +645,43 @@
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -604,31 +689,33 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^^:\\/:\\/,/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -651,13 +738,21 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -691,10 +786,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -777,26 +877,27 @@
 
 uninstall-am: uninstall-desktopDATA uninstall-local
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-desktopDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-desktopDATA uninstall-local
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-libtool distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-desktopDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-desktopDATA uninstall-local
+
+.PRECIOUS: Makefile
 
 
 uninstall-local:

imagination-3.0.tar.bz2/README -> imagination-3.4.tar.bz2/README Changed

@@ -4,29 +4,13 @@
 ===================
 
 Before packaging Imagination (unless this hasn't already been done) please
-comment line 23 in file src/support.h from this:
+edit line 23 in file src/support.h from this:
 
 #define PLUGINS_INSTALLED 0
+
 to this:
+
 #define PLUGINS_INSTALLED 1
 
 If you fail to do so Imagination won't be able to load the transitions and the
 transition's images when the package is installed.
-
-UPGRADE FROM 1.5 TO 2.0 NOTES:
-==============================
-
-Because Imagination's backend changed from 1.5 to 2.0, old transition plugins do
-not work with new version anymore. This and the fact that some transitions have
-been grouped together may cause some trouble if you don't uninstall previous
-version of Imagination prior installing 2.0.
-
-But if you did this already, there is a simple fix. Just navigate to
-Imagination's plugin folder (PREFIX/lib/imagination) and delete remnants of old
-installation by executing:
-$ su
-# rm -f fade.*
-
-or 
-$ sudo rm -f fade.*
-

imagination-3.0.tar.bz2/aclocal.m4 -> imagination-3.4.tar.bz2/aclocal.m4 Changed

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef(AC_CONFIG_MACRO_DIRS, m4_defun(_AM_CONFIG_MACRO_DIRS, )m4_defun(AC_CONFIG_MACRO_DIRS, _AM_CONFIG_MACRO_DIRS($@)))
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.67,,
-m4_warning(this file was generated for autoconf 2.67.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
+m4_warning(this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.))
+To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -46,7 +47,10 @@
 #
 # Modified to require ngettext
 # Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
+
+# Increment this whenever this file is changed.
+#serial 1
+
 # We need this here as well, since someone might use autoconf-2.5x
 # to configure GLib then an older version to configure a package
 # using AM_GLIB_GNU_GETTEXT
@@ -118,6 +122,51 @@
 AC_SUBST($1)dnl
 )
 
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+dnl
+dnl Copied from intlmacosx.m4 in gettext, GPL.
+dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+glib_DEFUN(glib_gt_INTL_MACOSX,
+
+  dnl Check for API introduced in Mac OS X 10.2.
+  AC_CACHE_CHECK(for CFPreferencesCopyAppValue,
+    gt_cv_func_CFPreferencesCopyAppValue,
+    gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       AC_LANG_PROGRAM(
+          #include <CoreFoundation/CFPreferences.h>,
+          CFPreferencesCopyAppValue(NULL, NULL)),
+       gt_cv_func_CFPreferencesCopyAppValue=yes,
+       gt_cv_func_CFPreferencesCopyAppValue=no)
+     LIBS="$gt_save_LIBS")
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE(HAVE_CFPREFERENCESCOPYAPPVALUE, 1,
+      Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.)
+  fi
+  dnl Check for API introduced in Mac OS X 10.3.
+  AC_CACHE_CHECK(for CFLocaleCopyCurrent, gt_cv_func_CFLocaleCopyCurrent,
+    gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       AC_LANG_PROGRAM(
+          #include <CoreFoundation/CFLocale.h>,
+          CFLocaleCopyCurrent();),
+       gt_cv_func_CFLocaleCopyCurrent=yes,
+       gt_cv_func_CFLocaleCopyCurrent=no)
+     LIBS="$gt_save_LIBS")
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE(HAVE_CFLOCALECOPYCURRENT, 1,
+      Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.)
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST(INTL_MACOSX_LIBS)
+)
+
 # GLIB_WITH_NLS
 #-----------------
 glib_DEFUN(GLIB_WITH_NLS,
@@ -131,6 +180,8 @@
     XGETTEXT=:
     INTLLIBS=
 
+    glib_gt_INTL_MACOSX
+
     AC_CHECK_HEADER(libintl.h,
      gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
@@ -214,7 +265,7 @@
       fi
   
       if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
+        INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS"
       fi
   
       if test "$gt_cv_have_gettext" = "yes"; then
@@ -260,6 +311,10 @@
 	      CATOBJEXT=.mo
                DATADIRNAME=lib)
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -330,9 +385,8 @@
 # on various variables needed by the Makefile.in.in installed by 
 # glib-gettextize.
 dnl
-glib_DEFUN(GLIB_GNU_GETTEXT,
+AU_DEFUN(GLIB_GNU_GETTEXT,
   AC_REQUIRE(AC_PROG_CC)dnl
-   AC_REQUIRE(AC_HEADER_STDC)dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -401,7 +455,8 @@
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/$.*$ \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
-  )
+  ,
+  $0: This macro is deprecated. You should use upstream gettext instead.)
 
 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 # -------------------------------
@@ -454,7 +509,7 @@
 
 
 dnl IT_PROG_INTLTOOL(MINIMUM-VERSION, no-xml)
-# serial 40 IT_PROG_INTLTOOL
+# serial 42 IT_PROG_INTLTOOL
 AC_DEFUN(IT_PROG_INTLTOOL, 
 AC_PREREQ(2.50)dnl
 AC_REQUIRE(AM_NLS)dnl
@@ -467,13 +522,11 @@
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n "$1"; then
     AC_MSG_CHECKING(for intltool >= $1)
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    
     AC_MSG_RESULT($INTLTOOL_APPLIED_VERSION found)
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
 	AC_MSG_ERROR(Your intltool is too old.  You need intltool $1 or later.)
@@ -486,25 +539,48 @@
     AC_MSG_ERROR(The intltool scripts were not found. Please install intltool.)
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST(AM_DEFAULT_VERBOSITY)
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
 
 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -550,7 +626,7 @@
 if test $? -ne 0; then
    AC_MSG_ERROR(perl 5.8.1 is required for intltool)
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    AC_MSG_RESULT($IT_PERL_VERSION)
 fi
 if test "x$2" != "xno-xml"; then
@@ -565,31 +641,6 @@
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    AC_LANG_PROGRAM(,
-                     extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr),
-    DATADIRNAME=share,
-    case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      DATADIRNAME=share, DATADIRNAME=lib)
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac)
-fi
-AC_SUBST(DATADIRNAME)
-
 IT_PO_SUBDIR(po)
 
 )
@@ -648,8 +699,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -657,35 +707,30 @@
 # modifications, as long as this notice is preserved.
 
 m4_define(_LT_COPYING, dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
+# Copyright (C) 2014 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.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
 #
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
-# serial 56 LT_INIT
+# serial 58 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -713,7 +758,8 @@
 # LT_INIT(OPTIONS)
 # ------------------
 AC_DEFUN(LT_INIT,
-AC_PREREQ(2.58)dnl We use AC_INCLUDES_DEFAULT
+AC_PREREQ(2.62)dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
 AC_BEFORE($0, LT_LANG)dnl
 AC_BEFORE($0, LT_OUTPUT)dnl
 AC_BEFORE($0, LTDL_INIT)dnl
@@ -730,11 +776,13 @@
 AC_REQUIRE(LTOBSOLETE_VERSION)dnl
 m4_require(_LT_PROG_LTMAIN)dnl
 
+_LT_SHELL_INIT(SHELL=${CONFIG_SHELL-/bin/sh})
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS($0, $1)
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -754,26 +802,43 @@
 dnl AC_DEFUN(AM_PROG_LIBTOOL, )
 
 
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun(_LT_PREPARE_CC_BASENAME, 
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *\\/compile | ccache | *\\/ccache ) ;;
+        distcc | *\\/distcc | purify | *\\/purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+)# _LT_PREPARE_CC_BASENAME
+
+
 # _LT_CC_BASENAME(CC)
 # -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
 m4_defun(_LT_CC_BASENAME,
-for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *\\/compile | ccache | *\\/ccache ) ;;
-    distcc | *\\/distcc | purify | *\\/purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+m4_require(_LT_PREPARE_CC_BASENAME)dnl
+AC_REQUIRE(_LT_DECL_SED)dnl
+AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
 )
 
 
 # _LT_FILEUTILS_DEFAULTS
 # ----------------------
 # It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require(_LT_FILEUTILS_DEFAULTS)'.
+# sensibly after 'm4_require(_LT_FILEUTILS_DEFAULTS)'.
 m4_defun(_LT_FILEUTILS_DEFAULTS,
 : ${CP="cp -f"}
 : ${MV="mv -f"}
@@ -786,6 +851,11 @@
 m4_defun(_LT_SETUP,
 AC_REQUIRE(AC_CANONICAL_HOST)dnl
 AC_REQUIRE(AC_CANONICAL_BUILD)dnl
+AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
+AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
+
+_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl
+dnl
 _LT_DECL(, host_alias, 0, The host system)dnl
 _LT_DECL(, host, 0)dnl
 _LT_DECL(, host_os, 0)dnl
@@ -808,68 +878,54 @@
 dnl
 m4_require(_LT_FILEUTILS_DEFAULTS)dnl
 m4_require(_LT_CHECK_SHELL_FEATURES)dnl
+m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
 m4_require(_LT_CMD_RELOAD)dnl
 m4_require(_LT_CHECK_MAGIC_METHOD)dnl
+m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
 m4_require(_LT_CMD_OLD_ARCHIVE)dnl
 m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
+m4_require(_LT_WITH_SYSROOT)dnl
+m4_require(_LT_CMD_TRUNCATE)dnl
 
 _LT_CONFIG_LIBTOOL_INIT(
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 )
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 _LT_CHECK_OBJDIR
 
 m4_require(_LT_TAG_COMPILER)dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
   # reason, if we set the COLLECT_NAMES environment variable, the problems
   # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$"`$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
@@ -898,23 +954,45 @@
 )# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun(_LT_PREPARE_SED_QUOTE_VARS,
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$"`$\\$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$"`\\$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+)
+
 # _LT_PROG_LTMAIN
 # ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
 # now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
 # so we pass a copy along to make sure it has a sensible value anyway.
 m4_defun(_LT_PROG_LTMAIN,
 m4_ifdef(AC_REQUIRE_AUX_FILE, AC_REQUIRE_AUX_FILE(ltmain.sh))dnl
 _LT_CONFIG_LIBTOOL_INIT(ac_aux_dir='$ac_aux_dir')
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 )# _LT_PROG_LTMAIN
 
 
 
 # So that we can recreate a full libtool script including additional
 # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
 # label.
 
 
@@ -1046,11 +1124,11 @@
 
 # _LT_CONFIG_STATUS_DECLARE(VARNAME)
 # ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define(_LT_CONFIG_STATUS_DECLARE,
-$1='`$ECHO "X$$1" | $Xsed -e "$delay_single_quote_subst"`')
+$1='`$ECHO "$$1" | $SED "$delay_single_quote_subst"`')
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -1060,7 +1138,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun(_LT_CONFIG_STATUS_DECLARATIONS,
 m4_foreach(_lt_var, m4_quote(lt_decl_all_varnames),
     m4_n(_LT_CONFIG_STATUS_DECLARE(_lt_var))))
@@ -1071,7 +1149,7 @@
 # Output comment and list of tags supported by the script
 m4_defun(_LT_LIBTOOL_TAGS,
 _LT_FORMAT_COMMENT(The names of the tagged configurations supported by this script)dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
 )
 
 
@@ -1099,7 +1177,7 @@
 # _LT_LIBTOOL_CONFIG_VARS
 # -----------------------
 # Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
 # script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
 # section) are produced by _LT_LIBTOOL_TAG_VARS.
 m4_defun(_LT_LIBTOOL_CONFIG_VARS,
@@ -1125,8 +1203,8 @@
 # Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
 # variables for single and double quote escaping we saved from calls
 # to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
 # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
 m4_defun(_LT_CONFIG_COMMANDS,
 AC_PROVIDE_IFELSE(LT_OUTPUT,
@@ -1159,12 +1237,20 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames( \
 , lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1175,9 +1261,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames( \
 , lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1185,16 +1271,38 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
 _LT_OUTPUT_LIBTOOL_INIT
 )
 
+# _LT_GENERATED_FILE_INIT(FILE, COMMENT)
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef(AS_INIT_GENERATED,
+m4_defun(_LT_GENERATED_FILE_INIT,AS_INIT_GENERATED($@)),
+m4_defun(_LT_GENERATED_FILE_INIT,
+m4_require(AS_PREPARE)dnl
+m4_pushdef(AS_MESSAGE_LOG_FD)dnl
+lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1dnl
+m4_popdef(AS_MESSAGE_LOG_FD)))# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -1204,20 +1312,11 @@
 AC_DEFUN(LT_OUTPUT,
 : ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE(creating $CONFIG_LT)
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT("$CONFIG_LT",
+# Run this file to recreate a libtool stub with the current configuration.)
 
 cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
@@ -1225,7 +1324,7 @@
 } >&AS_MESSAGE_LOG_FD
 
 lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
 for use in further configure time tests before the real libtool is
 generated.
 
@@ -1243,11 +1342,11 @@
 m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
 configured by $0, generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
-while test $# != 0
+while test 0 != $#
 do
   case $1 in
     --version | --v* | -V )
@@ -1260,10 +1359,10 @@
       lt_cl_silent=: ;;
 
     -*) AC_MSG_ERROR(unrecognized option: $1
-Try \`$0 --help' for more information.) ;;
+Try '$0 --help' for more information.) ;;
 
     *) AC_MSG_ERROR(unrecognized argument: $1
-Try \`$0 --help' for more information.) ;;
+Try '$0 --help' for more information.) ;;
   esac
   shift
 done
@@ -1288,15 +1387,13 @@
 # appending to config.log, which fails on DOS, as config.log is still kept
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
 )# LT_OUTPUT
 
 
@@ -1311,27 +1408,30 @@
 _LT_CONFIG_SAVE_COMMANDS(
   m4_define(_LT_TAG, m4_if($1, , C, $1))dnl
   m4_if(_LT_TAG, C, 
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    cfgfile=${ofile}T
     trap "$RM \"$cfgfile\"; exit 1" 1 2 15
     $RM "$cfgfile"
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Generated automatically by $as_me ($PACKAGE) $VERSION
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
 _LT_COPYING
 _LT_LIBTOOL_TAGS
 
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
 # ### BEGIN LIBTOOL CONFIG
 _LT_LIBTOOL_CONFIG_VARS
 _LT_LIBTOOL_TAG_VARS
@@ -1339,13 +1439,24 @@
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
   case $host_os in
   aix3*)
     cat <<\_LT_EOF >> "$cfgfile"
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -1359,15 +1470,10 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ,
@@ -1384,7 +1490,6 @@
 m4_if($1, , 
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile', )
 )dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -1412,6 +1517,7 @@
 m4_case($1,
   C,			_LT_LANG(C),
   C++,		_LT_LANG(CXX),
+  Go,			_LT_LANG(GO),
   Java,		_LT_LANG(GCJ),
   Fortran 77,		_LT_LANG(F77),
   Fortran,		_LT_LANG(FC),
@@ -1433,6 +1539,29 @@
 )# _LT_LANG
 
 
+m4_ifndef(AC_PROG_GO, 
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun(AC_PROG_GO,
+AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR(GOC,     Go compiler command)dnl
+AC_ARG_VAR(GOFLAGS, Go compiler flags)dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, ${ac_tool_prefix}gccgo, ${ac_tool_prefix}gccgo)
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+)#m4_defun
+)#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun(_LT_LANG_DEFAULT_CONFIG,
@@ -1463,6 +1592,10 @@
        m4_ifdef(LT_PROG_GCJ,
 	m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
 
+AC_PROVIDE_IFELSE(AC_PROG_GO,
+  LT_LANG(GO),
+  m4_define(AC_PROG_GO, defn(AC_PROG_GO)LT_LANG(GO)))
+
 AC_PROVIDE_IFELSE(LT_PROG_RC,
   LT_LANG(RC),
   m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
@@ -1473,11 +1606,13 @@
 AU_DEFUN(AC_LIBTOOL_F77, LT_LANG(Fortran 77))
 AU_DEFUN(AC_LIBTOOL_FC, LT_LANG(Fortran))
 AU_DEFUN(AC_LIBTOOL_GCJ, LT_LANG(Java))
+AU_DEFUN(AC_LIBTOOL_RC, LT_LANG(Windows Resource))
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN(AC_LIBTOOL_CXX, )
 dnl AC_DEFUN(AC_LIBTOOL_F77, )
 dnl AC_DEFUN(AC_LIBTOOL_FC, )
 dnl AC_DEFUN(AC_LIBTOOL_GCJ, )
+dnl AC_DEFUN(AC_LIBTOOL_RC, )
 
 
 # _LT_TAG_COMPILER
@@ -1551,7 +1686,7 @@
 
     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
+      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
@@ -1563,7 +1698,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1571,6 +1712,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi)
+
     AC_CACHE_CHECK(for -exported_symbols_list linker flag,
       lt_cv_ld_exported_symbols_list,
       lt_cv_ld_exported_symbols_list=no
@@ -1580,36 +1722,64 @@
       AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
 	lt_cv_ld_exported_symbols_list=yes,
 	lt_cv_ld_exported_symbols_list=no)
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
+    )
+
+    AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
+      lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
     )
     case $host_os in
     rhapsody* | darwin1.012)
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # 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,*-darwin91*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.012*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	  _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' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+    if test yes = "$lt_cv_apple_cc_single_mod"; 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'
+    if test yes = "$lt_cv_ld_exported_symbols_list"; 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}'
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -1619,8 +1789,8 @@
 )
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES(TAG)
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun(_LT_DARWIN_LINKER_FEATURES,
 
@@ -1629,23 +1799,29 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_automatic, $1)=yes
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case($1, F77, _LT_TAGVAR(compiler_needs_object, $1)=yes,
+                  FC,  _LT_TAGVAR(compiler_needs_object, $1)=yes)
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
   _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_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 yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_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"
     m4_if($1, CXX,
-   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_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_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 test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_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_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 ,)
   else
@@ -1653,234 +1829,176 @@
   fi
 )
 
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX(TAGNAME)
+# ----------------------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun(_LT_SYS_MODULE_PATH_AIX,
 m4_require(_LT_DECL_SED)dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *$.*$$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi,)
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL(_LT_TAGVAR(lt_cv_aix_libpath_, $1),
+  AC_LINK_IFELSE(AC_LANG_PROGRAM,
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$^ *$ *$/\1/
+	      p
+	  }
+      }'
+  _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
+    _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi,)
+  if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
+    _LT_TAGVAR(lt_cv_aix_libpath_, $1)=/usr/lib:/lib
+  fi
+  )
+  aix_libpath=$_LT_TAGVAR(lt_cv_aix_libpath_, $1)
+fi
 )# _LT_SYS_MODULE_PATH_AIX
 
 
 # _LT_SHELL_INIT(ARG)
 # -------------------
 m4_define(_LT_SHELL_INIT,
-ifdef(AC_DIVERSION_NOTICE,
-	     AC_DIVERT_PUSH(AC_DIVERSION_NOTICE),
-	 AC_DIVERT_PUSH(NOTICE))
-$1
-AC_DIVERT_POP
-)# _LT_SHELL_INIT
+m4_divert_text(M4SH-INIT, $1
+))# _LT_SHELL_INIT
+
 
 
 # _LT_PROG_ECHO_BACKSLASH
 # -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
 m4_defun(_LT_PROG_ECHO_BACKSLASH,
-_LT_SHELL_INIT(
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING(how to print strings)
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
 else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
 fi
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
 
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
+case $ECHO in
+  printf*) AC_MSG_RESULT(printf) ;;
+  print*) AC_MSG_RESULT(print -r) ;;
+  *) AC_MSG_RESULT(cat) ;;
+esac
 
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
+m4_ifdef(_AS_DETECT_SUGGESTED,
+_AS_DETECT_SUGGESTED(
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )))
 
-AC_SUBST(lt_ECHO)
-)
 _LT_DECL(, SHELL, 1, Shell to use when invoking shell scripts)
-_LT_DECL(, ECHO, 1,
-    An echo program that does not interpret backslashes)
+_LT_DECL(, ECHO, 1, An echo program that protects backslashes)
 )# _LT_PROG_ECHO_BACKSLASH
 
 
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN(_LT_WITH_SYSROOT,
+AC_MSG_CHECKING(for sysroot)
+AC_ARG_WITH(sysroot,
+AS_HELP_STRING(--with-sysroot@<:@=DIR@:>@,
+  Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).),
+, with_sysroot=no)
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT($with_sysroot)
+   AC_MSG_ERROR(The sysroot must be an absolute path.)
+   ;;
+esac
+
+ AC_MSG_RESULT(${lt_sysroot:-no})
+_LT_DECL(, lt_sysroot, 0, The root where to search for dnl
+dependent libraries, and where our libraries should be installed.))
+
 # _LT_ENABLE_LOCK
 # ---------------
 m4_defun(_LT_ENABLE_LOCK,
 AC_ARG_ENABLE(libtool-lock,
   AS_HELP_STRING(--disable-libtool-lock,
     avoid locking (might break parallel builds)))
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case $host in
 ia64-*-hpux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
-	HPUX_IA64_MODE="32"
+	HPUX_IA64_MODE=32
 	;;
       *ELF-64*)
-	HPUX_IA64_MODE="64"
+	HPUX_IA64_MODE=64
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line __oline__ "configure"' > conftest.$ac_ext
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
@@ -1909,9 +2027,46 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
@@ -1921,9 +2076,19 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1942,7 +2107,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -1960,25 +2128,39 @@
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
+  SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK(whether the C compiler needs -belf, lt_cv_cc_needs_belf,
     AC_LANG_PUSH(C)
      AC_LINK_IFELSE(AC_LANG_PROGRAM(,),lt_cv_cc_needs_belf=yes,lt_cv_cc_needs_belf=no)
      AC_LANG_POP)
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+  if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
+    CFLAGS=$SAVE_CFLAGS
   fi
   ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1992,18 +2174,51 @@
   ;;
 esac
 
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
 )# _LT_ENABLE_LOCK
 
 
+# _LT_PROG_AR
+# -----------
+m4_defun(_LT_PROG_AR,
+AC_CHECK_TOOLS(AR, ar, false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL(, AR, 1, The archiver)
+_LT_DECL(, AR_FLAGS, 1, Flags to create an archive)
+
+AC_CACHE_CHECK(for archiver @FILE support, lt_cv_ar_at_file,
+  lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE(AC_LANG_PROGRAM,
+     echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL(lt_ar_try)
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL(lt_ar_try)
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     )
+  )
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL(, archiver_list_spec, 1,
+  How to feed a file listing to the archiver)
+)# _LT_PROG_AR
+
+
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 m4_defun(_LT_CMD_OLD_ARCHIVE,
-AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL(, AR, 1, The archiver)
-_LT_DECL(, AR_FLAGS, 1)
+_LT_PROG_AR
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -2021,19 +2236,28 @@
 
 if test -n "$RANLIB"; then
   case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
 _LT_DECL(, old_postinstall_cmds, 2)
 _LT_DECL(, old_postuninstall_cmds, 2)
 _LT_TAGDECL(, old_archive_cmds, 2,
     Commands used to build an old-style archive)
+_LT_DECL(, lock_old_archive_extraction, 0,
+    Whether to use a lock for old archive extraction)
 )# _LT_CMD_OLD_ARCHIVE
 
 
@@ -2048,7 +2272,7 @@
   $2=no
    m4_if($4, , ac_outfile=conftest.$ac_objext, ac_outfile=$4)
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -2058,15 +2282,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
@@ -2075,7 +2299,7 @@
    $RM conftest*
 )
 
-if test x"$$2" = xyes; then
+if test yes = "$$2"; then
     m4_if($5, , :, $5)
 else
     m4_if($6, , :, $6)
@@ -2097,7 +2321,7 @@
 m4_require(_LT_DECL_SED)dnl
 AC_CACHE_CHECK($1, $2,
   $2=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $3"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -2106,7 +2330,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -2116,10 +2340,10 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 )
 
-if test x"$$2" = xyes; then
+if test yes = "$$2"; then
     m4_if($4, , :, $4)
 else
     m4_if($5, , :, $5)
@@ -2140,7 +2364,7 @@
 AC_MSG_CHECKING(the maximum length of command line arguments)
 AC_CACHE_VAL(lt_cv_sys_max_cmd_len, dnl
   i=0
-  teststring="ABCD"
+  teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
@@ -2169,13 +2393,18 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -2194,6 +2423,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -2220,22 +2454,23 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
       # Make teststring a little bigger before we do anything with it.
       # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
+      for i in 1 2 3 4 5 6 7 8; do
         teststring=$teststring$teststring
       done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
@@ -2251,7 +2486,7 @@
     ;;
   esac
 )
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
   AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
 else
   AC_MSG_RESULT(none)
@@ -2279,13 +2514,13 @@
 # ----------------------------------------------------------------
 m4_defun(_LT_TRY_DLOPEN_SELF,
 m4_require(_LT_HEADER_DLFCN)dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
   $4
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line __oline__ "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -2326,7 +2561,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -2335,7 +2576,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -2344,7 +2589,7 @@
   return status;
 }
 _LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -2365,7 +2610,7 @@
 # ------------------
 AC_DEFUN(LT_SYS_DLOPEN_SELF,
 m4_require(_LT_HEADER_DLFCN)dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -2375,44 +2620,52 @@
 
   case $host_os in
   beos*)
-    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen=load_add_on
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ;;
 
   mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
-    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
-  # if libdl is installed we need to link against it
+    # if libdl is installed we need to link against it
     AC_CHECK_LIB(dl, dlopen,
-		lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl",
-    lt_cv_dlopen="dyld"
+		lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl,
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     )
     ;;
 
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
   *)
     AC_CHECK_FUNC(shl_load,
-	  lt_cv_dlopen="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=-ldld,
 	AC_CHECK_FUNC(dlopen,
-	      lt_cv_dlopen="dlopen",
+	      lt_cv_dlopen=dlopen,
 	  AC_CHECK_LIB(dl, dlopen,
-		lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl",
+		lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl,
 	    AC_CHECK_LIB(svld, dlopen,
-		  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld",
+		  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=-ldld)
 	      )
 	    )
 	  )
@@ -2421,21 +2674,21 @@
     ;;
   esac
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
+  if test no = "$lt_cv_dlopen"; then
     enable_dlopen=no
+  else
+    enable_dlopen=yes
   fi
 
   case $lt_cv_dlopen in
   dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
-    save_LDFLAGS="$LDFLAGS"
+    save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-    save_LIBS="$LIBS"
+    save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     AC_CACHE_CHECK(whether a program can dlopen itself,
@@ -2445,7 +2698,7 @@
 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
     )
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
+    if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK(whether a statically linked program can dlopen itself,
 	  lt_cv_dlopen_self_static, dnl
@@ -2455,9 +2708,9 @@
       )
     fi
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
     ;;
   esac
 
@@ -2511,16 +2764,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2549,8 +2802,8 @@
 m4_require(_LT_FILEUTILS_DEFAULTS)dnl
 _LT_COMPILER_C_O($1)
 
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   AC_MSG_CHECKING(if we can lock with hard links)
   hard_links=yes
@@ -2560,8 +2813,8 @@
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   AC_MSG_RESULT($hard_links)
-  if test "$hard_links" = no; then
-    AC_MSG_WARN(`$CC' does not support `-c -o', so `make -j' may be unsafe)
+  if test no = "$hard_links"; then
+    AC_MSG_WARN('$CC' does not support '-c -o', so 'make -j' may be unsafe)
     need_locks=warn
   fi
 else
@@ -2588,8 +2841,8 @@
 _LT_DECL(, objdir, 0,
          The name of the directory that contains temporary libtool files)dnl
 m4_pattern_allow(LT_OBJDIR)dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  Define to the sub-directory in which libtool stores uninstalled libraries.)
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  Define to the sub-directory where libtool stores uninstalled libraries.)
 )# _LT_CHECK_OBJDIR
 
 
@@ -2601,15 +2854,15 @@
 _LT_TAGVAR(hardcode_action, $1)=
 if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
    test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
 
   # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
     # Linking always hardcodes the temporary library directory.
     _LT_TAGVAR(hardcode_action, $1)=relink
   else
@@ -2623,12 +2876,12 @@
 fi
 AC_MSG_RESULT($_LT_TAGVAR(hardcode_action, $1))
 
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -2652,7 +2905,7 @@
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
   darwin*)
-    if test -n "$STRIP" ; then
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       AC_MSG_RESULT(yes)
@@ -2670,6 +2923,47 @@
 )# _LT_CMD_STRIPLIB
 
 
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun(_LT_PREPARE_MUNGE_PATH_LIST,
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR:DIR:"
+#       string "DIR DIR" will be prepended to VARIABLE
+# ":DIR:DIR"
+#       string "DIR DIR" will be appended to VARIABLE
+# "DIRP:DIRP::DIRA:DIRA"
+#       string "DIRP DIRP" will be prepended to VARIABLE and string
+#       "DIRA DIRA" will be appended to VARIABLE
+# "DIR:DIR"
+#       VARIABLE will be replaced by "DIR DIR"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+)# _LT_PREPARE_PATH_LIST
+
+
 # _LT_SYS_DYNAMIC_LINKER(TAG)
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
@@ -2679,47 +2973,63 @@
 m4_require(_LT_FILEUTILS_DEFAULTS)dnl
 m4_require(_LT_DECL_OBJDUMP)dnl
 m4_require(_LT_DECL_SED)dnl
+m4_require(_LT_CHECK_SHELL_FEATURES)dnl
+m4_require(_LT_PREPARE_MUNGE_PATH_LIST)dnl
 AC_MSG_CHECKING(dynamic linker characteristics)
 m4_if($1,
 	, 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=$A-Za-z:$|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # and add multilib dir if necessary...
   lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
       test -d "$lt_sys_path" && \
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
   for (lt_i = NF; lt_i > 0; lt_i--) {
     if ($lt_i != "" && $lt_i != ".") {
       if ($lt_i == "..") {
         lt_count++;
       } else {
         if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
+          lt_foo = "/" $lt_i lt_foo;
         } else {
           lt_count--;
         }
@@ -2729,14 +3039,20 @@
   if (lt_foo != "") { lt_freqlt_foo++; }
   if (lt_freqlt_foo == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/$A-Za-z:$|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi)
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -2753,56 +3069,109 @@
 # flags to be left without arguments
 need_version=unknown
 
+AC_ARG_VAR(LT_SYS_LIBRARY_PATH,
+User-defined run-time library search path.)
+
 case $host_os in
 aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix4-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.01 | aix4.01.*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -2812,27 +3181,27 @@
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
 bsdi45*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -2844,16 +3213,17 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
@@ -2869,37 +3239,84 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+m4_if($1, ,
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api")
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';c-zC-Z:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
+        # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
       ;;
     esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext} $libname.lib'
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2909,8 +3326,8 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2920,18 +3337,14 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2939,25 +3352,26 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd123*) objformat=aout ;;
+    freebsd23.*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.01* | freebsdelf3.01*)
@@ -2976,13 +3390,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -2999,14 +3416,15 @@
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -3014,8 +3432,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
@@ -3024,20 +3442,22 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix3-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -3048,16 +3468,16 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
@@ -3076,8 +3496,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
@@ -3086,35 +3506,65 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
-    AS_IF( ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null,
-       shlibpath_overrides_runpath=yes))
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+  AC_CACHE_VAL(lt_cv_shlibpath_overrides_runpath,
+    lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
+      AS_IF( ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null,
+	 lt_cv_shlibpath_overrides_runpath=yes))
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    )
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -3144,12 +3594,12 @@
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -3158,8 +3608,8 @@
   ;;
 
 newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
@@ -3168,58 +3618,68 @@
   version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.89 | openbsd2.89.*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -3227,11 +3687,11 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -3241,20 +3701,20 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
@@ -3275,24 +3735,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -3307,19 +3767,19 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -3328,20 +3788,30 @@
   ;;
 esac
 AC_MSG_RESULT($dynamic_linker)
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
 _LT_DECL(, variables_saved_for_relink, 1,
     Variables whose values should be saved in libtool wrapper scripts and
     restored at link time)
@@ -3359,6 +3829,8 @@
     The last name is the one that the linker finds with -lNAME)
 _LT_DECL(, soname_spec, 1,
     The coded name of the library, if different from the real name)
+_LT_DECL(, install_override_mode, 1,
+    Permission mode override for installation of shared libraries)
 _LT_DECL(, postinstall_cmds, 2,
     Command to use after installation of a shared archive)
 _LT_DECL(, postuninstall_cmds, 2,
@@ -3372,39 +3844,41 @@
     Whether we should hardcode library paths into libraries)
 _LT_DECL(, sys_lib_search_path_spec, 2,
     Compile-time system search path for libraries)
-_LT_DECL(, sys_lib_dlsearch_path_spec, 2,
-    Run-time system search path for libraries)
+_LT_DECL(sys_lib_dlsearch_path_spec, configure_time_dlsearch_path, 2,
+    Detected run-time system search path for libraries)
+_LT_DECL(, configure_time_lt_sys_library_path, 2,
+    Explicit LT_SYS_LIBRARY_PATH set during ./configure time)
 )# _LT_SYS_DYNAMIC_LINKER
 
 
 # _LT_PATH_TOOL_PREFIX(TOOL)
 # --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
 AC_DEFUN(_LT_PATH_TOOL_PREFIX,
 m4_require(_LT_DECL_EGREP)dnl
 AC_MSG_CHECKING(for $1)
 AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 case $MAGIC_CMD in
 \\/* |  ?:\\/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 dnl $ac_dummy forces splitting on constant user-supplied paths.
 dnl POSIX.2 word splitting is done only on the output of word expansions,
 dnl not every word.  This closes a longstanding sh security hole.
   ac_dummy="m4_if($2, , $PATH, $2)"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
@@ -3427,11 +3901,11 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac)
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   AC_MSG_RESULT($MAGIC_CMD)
 else
@@ -3449,7 +3923,7 @@
 
 # _LT_PATH_MAGIC
 # --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
 m4_defun(_LT_PATH_MAGIC,
 _LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3471,20 +3945,21 @@
 AC_REQUIRE(AC_CANONICAL_BUILD)dnl
 m4_require(_LT_DECL_SED)dnl
 m4_require(_LT_DECL_EGREP)dnl
+m4_require(_LT_PROG_ECHO_BACKSLASH)dnl
 
 AC_ARG_WITH(gnu-ld,
     AS_HELP_STRING(--with-gnu-ld,
 	assume the C compiler uses GNU ld @<:@default=no@:>@),
-    test "$withval" = no || with_gnu_ld=yes,
+    test no = "$withval" || with_gnu_ld=yes,
     with_gnu_ld=no)dnl
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING(for ld used by $CC)
   case $host in
   *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
+    # gcc leaves a trailing carriage return, which upsets mingw
     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -3498,7 +3973,7 @@
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
-      test -z "$LD" && LD="$ac_prog"
+      test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -3509,37 +3984,37 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
   AC_MSG_CHECKING(for GNU ld)
 else
   AC_MSG_CHECKING(for non-GNU ld)
 fi
 AC_CACHE_VAL(lt_cv_path_LD,
 if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD=$ac_dir/$ac_prog
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+	test no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
+  IFS=$lt_save_ifs
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi)
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -3592,19 +4067,61 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
     ;;
 esac
-_LT_DECL(, reload_flag, 1, How to create reloadable object files)dnl
-_LT_DECL(, reload_cmds, 2)dnl
+_LT_TAGDECL(, reload_flag, 1, How to create reloadable object files)dnl
+_LT_TAGDECL(, reload_cmds, 2)dnl
 )# _LT_CMD_RELOAD
 
 
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun(_LT_PATH_DD,
+AC_CACHE_CHECK(for a working dd, ac_cv_path_lt_DD,
+printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK(lt_DD, dd,
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi)
+rm -f conftest.i conftest2.i conftest.out)
+)# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun(_LT_CMD_TRUNCATE,
+m4_require(_LT_PATH_DD)
+AC_CACHE_CHECK(how to truncate binary pipes, lt_cv_truncate_bin,
+printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q")
+_LT_DECL(lt_truncate_bin, lt_cv_truncate_bin, 1,
+  Command to truncate a binary pipe)
+)# _LT_CMD_TRUNCATE
+
+
 # _LT_CHECK_MAGIC_METHOD
 # ----------------------
 # how to check for library dependencies
@@ -3620,13 +4137,13 @@
 # Need to set the preceding variable on all platforms that support
 # interlibrary dependencies.
 # 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic regex' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
 
 case $host_os in
 aix4-9*)
@@ -3657,12 +4174,13 @@
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3688,7 +4206,7 @@
   fi
   ;;
 
-gnu*)
+haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3700,11 +4218,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - PA-RISC 0-9.0-9'
+    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF -0-90-9)(-bit)?( LMSB)? shared object( file)?, -* PA-RISC 0-9\.0-9'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9.0-9) shared library'
+    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9\.0-9) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -3725,8 +4243,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3748,8 +4266,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
     lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
@@ -3802,8 +4320,26 @@
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 )
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/\1\/\1\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3811,7 +4347,11 @@
 _LT_DECL(, deplibs_check_method, 1,
     Method to check whether dependent libraries are shared objects)
 _LT_DECL(, file_magic_cmd, 1,
-    Command to use when deplibs_check_method == "file_magic")
+    Command to use when deplibs_check_method = "file_magic")
+_LT_DECL(, file_magic_glob, 1,
+    How to find potential files when deplibs_check_method = "file_magic")
+_LT_DECL(, want_nocaseglob, 1,
+    Find potential files using nocaseglob when deplibs_check_method = "file_magic")
 )# _LT_CHECK_MAGIC_METHOD
 
 
@@ -3823,33 +4363,38 @@
 AC_CACHE_CHECK(for BSD- or MS-compatible name lister (nm), lt_cv_path_NM,
 if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  lt_cv_path_NM=$NM
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
+  lt_nm_to_check=${ac_tool_prefix}nm
   if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break
+	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break
+	    break 2
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3860,18 +4405,30 @@
 	esac
       fi
     done
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi)
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, "dumpbin -symbols" "link -dump -symbols", :)
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, dumpbin "link -dump", :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
   AC_SUBST(DUMPBIN)
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
@@ -3881,13 +4438,13 @@
 AC_CACHE_CHECK(the name lister ($NM) interface, lt_cv_nm_interface,
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
   cat conftest.out >&AS_MESSAGE_LOG_FD
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -3902,6 +4459,82 @@
 dnl AC_DEFUN(AM_PROG_NM, )
 dnl AC_DEFUN(AC_PROG_NM, )
 
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun(_LT_CHECK_SHAREDLIB_FROM_LINKLIB,
+m4_require(_LT_DECL_EGREP)
+m4_require(_LT_DECL_OBJDUMP)
+m4_require(_LT_DECL_DLLTOOL)
+AC_CACHE_CHECK(how to associate runtime and link libraries,
+lt_cv_sharedlib_from_linklib_cmd,
+lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+)
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL(, sharedlib_from_linklib_cmd, 1,
+    Command to associate shared and link libraries)
+)# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun(_LT_PATH_MANIFEST_TOOL,
+AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK(if $MANIFEST_TOOL is a manifest tool, lt_cv_path_mainfest_tool,
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*)
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL(, MANIFEST_TOOL, 1, Manifest tool)dnl
+)# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P(FILE)
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN(_LT_DLL_DEF_P,
+dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^	 *//'\'' dnl Strip leading whitespace
+    -e '\''/^$;.*$*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+)# _LT_DLL_DEF_P
+
 
 # LT_LIB_M
 # --------
@@ -3910,15 +4543,15 @@
 AC_REQUIRE(AC_CANONICAL_HOST)dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
   AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
   ;;
 esac
 AC_SUBST(LIBM)
@@ -3937,8 +4570,13 @@
 
 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
-if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
 
   _LT_COMPILER_OPTION(if $compiler supports -fno-rtti -fno-exceptions,
     lt_cv_prog_compiler_rtti_exceptions,
@@ -3955,6 +4593,7 @@
 m4_defun(_LT_CMD_GLOBAL_SYMBOLS,
 AC_REQUIRE(AC_CANONICAL_HOST)dnl
 AC_REQUIRE(AC_PROG_CC)dnl
+AC_REQUIRE(AC_PROG_AWK)dnl
 AC_REQUIRE(LT_PATH_NM)dnl
 AC_REQUIRE(LT_PATH_LD)dnl
 m4_require(_LT_DECL_SED)dnl
@@ -3983,7 +4622,7 @@
   symcode='ABCDGISTW'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='ABCDEGRST'
   fi
   ;;
@@ -4016,14 +4655,44 @@
   symcode='ABCDGIRSTW' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* $.*$$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* $lib.*$$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* $.*$$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* $.*$$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $^ *$ $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $^ *$$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $^ *$ $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $lib^ *$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $^ *$ $^ *$$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* $lib.*$$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -4041,24 +4710,29 @@
 
   # Write the raw and C identifiers.
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn2,2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
 "     {if(hidesection) next};"\
-"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a2, s)};"\
-"     s1~/^@?/{print s1, s1; next};"\
-"     s1~prfx {split(s1,t,\"@\"); print t1, substr(t1,length(prfx))}"\
+"     {f=\"D\"}; \$ 0~/.*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a2,s)};"\
+"     s1~/^@?/{print f,s1,s1; next};"\
+"     s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -4080,7 +4754,7 @@
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -4092,6 +4766,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -4103,7 +4789,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT@&t@_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -4111,7 +4797,7 @@
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
@@ -4129,15 +4815,15 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -4154,7 +4840,7 @@
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
+  if test yes = "$pipe_works"; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
@@ -4170,16 +4856,29 @@
   AC_MSG_RESULT(ok)
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '@FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
 _LT_DECL(global_symbol_pipe, lt_cv_sys_global_symbol_pipe, 1,
     Take the output of nm and produce a listing of raw symbols and C names)
 _LT_DECL(global_symbol_to_cdecl, lt_cv_sys_global_symbol_to_cdecl, 1,
     Transform the output of nm in a proper C declaration)
+_LT_DECL(global_symbol_to_import, lt_cv_sys_global_symbol_to_import, 1,
+    Transform the output of nm into a list of symbols to manually relocate)
 _LT_DECL(global_symbol_to_c_name_address,
     lt_cv_sys_global_symbol_to_c_name_address, 1,
     Transform the output of nm in a C name address pair)
 _LT_DECL(global_symbol_to_c_name_address_lib_prefix,
     lt_cv_sys_global_symbol_to_c_name_address_lib_prefix, 1,
     Transform the output of nm in a C name address pair when lib prefix is needed)
+_LT_DECL(nm_interface, lt_cv_nm_interface, 1,
+    The name lister interface)
+_LT_DECL(, nm_file_list_spec, 1,
+    Specify filename containing input files for $NM)
 ) # _LT_CMD_GLOBAL_SYMBOLS
 
 
@@ -4191,20 +4890,20 @@
 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 _LT_TAGVAR(lt_prog_compiler_static, $1)=
 
-AC_MSG_CHECKING(for $compiler option to produce PIC)
 m4_if($1, CXX, 
   # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
+  if test yes = "$GXX"; then
     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
     aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
 
     amigaos*)
@@ -4215,8 +4914,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -4232,6 +4931,11 @@
       # (--disable-auto-import) libraries
       m4_if($1, GCJ, ,
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -4242,6 +4946,11 @@
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
     interix3-9*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -4276,7 +4985,7 @@
     case $host_os in
       aix4-9*)
 	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	  # AIX 5 now supports IA64 processor
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	else
@@ -4291,6 +5000,12 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# 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_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -4311,14 +5026,14 @@
 	case $cc_basename in
 	  CC*)
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
 	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
 	  aCC*)
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
@@ -4347,7 +5062,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4355,7 +5070,7 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
 	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    # old Intel C++ for x86_64, which still supported -KPIC.
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4380,8 +5095,8 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
+	  xlc* | xlC* | bgxlcC* | mpixlcC*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -4443,7 +5158,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4500,17 +5215,18 @@
   fi
 ,
 
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; then
     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
 
     amigaos*)
@@ -4521,8 +5237,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -4539,6 +5255,11 @@
       # (--disable-auto-import) libraries
       m4_if($1, GCJ, ,
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -4547,6 +5268,12 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -4589,12 +5316,21 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
     aix*)
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       else
@@ -4602,11 +5338,30 @@
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # 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_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -4622,7 +5377,7 @@
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -4631,9 +5386,9 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4652,7 +5407,19 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4664,25 +5431,40 @@
         # All Alpha code is PIC.
         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+        *Intel*\ CF*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
 	esac
 	;;
@@ -4714,7 +5496,7 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
       *)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4734,7 +5516,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
@@ -4763,7 +5545,7 @@
   fi
 )
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     _LT_TAGVAR(lt_prog_compiler_pic, $1)=
     ;;
@@ -4771,9 +5553,11 @@
     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if($1,, -DPIC,m4_if($1,CXX, -DPIC,))"
     ;;
 esac
-AC_MSG_RESULT($_LT_TAGVAR(lt_prog_compiler_pic, $1))
-_LT_TAGDECL(wl, lt_prog_compiler_wl, 1,
-	How to pass a linker flag through the compiler)
+
+AC_CACHE_CHECK(for $compiler option to produce PIC,
+  _LT_TAGVAR(lt_cv_prog_compiler_pic, $1),
+  _LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1))
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4792,6 +5576,8 @@
 _LT_TAGDECL(pic_flag, lt_prog_compiler_pic, 1,
 	Additional compiler flags for building library objects)
 
+_LT_TAGDECL(wl, lt_prog_compiler_wl, 1,
+	How to pass a linker flag through the compiler)
 #
 # Check to make sure the static flag actually works.
 #
@@ -4812,6 +5598,7 @@
 m4_defun(_LT_LINKER_SHLIBS,
 AC_REQUIRE(LT_PATH_LD)dnl
 AC_REQUIRE(LT_PATH_NM)dnl
+m4_require(_LT_PATH_MANIFEST_TOOL)dnl
 m4_require(_LT_FILEUTILS_DEFAULTS)dnl
 m4_require(_LT_DECL_EGREP)dnl
 m4_require(_LT_DECL_SED)dnl
@@ -4820,30 +5607,44 @@
 AC_MSG_CHECKING(whether the $compiler linker ($LD) supports shared libraries)
 m4_if($1, CXX, 
   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
   case $host_os in
   aix4-9*)
     # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+    ;;
   cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;/^.* __nm__/s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
 , 
   runpath_var=
   _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4858,7 +5659,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4874,9 +5674,9 @@
   # included in the symbol list
   _LT_TAGVAR(include_expsyms, $1)=
   # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
+  # 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_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
   # 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
@@ -4892,7 +5692,7 @@
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -4900,33 +5700,59 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
     ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
+	  *\ $GNU\ Binutils$\ 2.2-9*) ;;
+	  *\ $GNU\ Binutils$\ 3-9*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    wlarc='$wl'
 
     # Set some defaults for GNU ld with shared library support. These
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       _LT_TAGVAR(whole_archive_flag_spec, $1)=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -4939,15 +5765,16 @@
     case $host_os in
     aix3-9*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -4957,7 +5784,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             _LT_TAGVAR(archive_expsym_cmds, $1)=''
         ;;
       m68k)
@@ -4973,7 +5800,7 @@
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4983,61 +5810,97 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
     interix3-9*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
+      if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -5048,39 +5911,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
-	xlcC*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xlcC* | bgxlcC* | mpixlcC*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
-        if test "x$supports_anon_versioning" = xyes; then
+        if test yes = "$supports_anon_versioning"; then
           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+            cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
-	xlf*)
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+              cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -5094,8 +5965,8 @@
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -5113,8 +5984,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -5126,7 +5997,7 @@
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -5141,9 +6012,9 @@
 	  # DT_RUNPATH tag from executables and libraries.  But doing so
 	  # requires that you compile everything twice, which is a pain.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    _LT_TAGVAR(ld_shlibs, $1)=no
 	  fi
@@ -5160,15 +6031,15 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
     esac
 
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
       runpath_var=
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
       _LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -5184,7 +6055,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5192,32 +6063,57 @@
       ;;
 
     aix4-9*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
-	no_entry_flag=""
+	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.23|aix4.23.*|aix5-9*)
 	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -5236,13 +6132,21 @@
       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
       _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
 
-      if test "$GCC" = yes; then
+      if test yes = "$GCC"; then
 	case $host_os in aix4.012|aix4.012.*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -5261,57 +6165,80 @@
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        _LT_SYS_MODULE_PATH_AIX($1)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
       else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 _LT_SYS_MODULE_PATH_AIX($1)
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -5320,7 +6247,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             _LT_TAGVAR(archive_expsym_cmds, $1)=''
         ;;
       m68k)
@@ -5340,20 +6267,65 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -5366,10 +6338,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5382,7 +6350,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5391,41 +6359,40 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(hardcode_direct, $1)=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5433,33 +6400,40 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	m4_if($1, , 
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION(if $CC understands -b,
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), -b,
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags',
+	    _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'),
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags')
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	case $host_cpu in
@@ -5470,7 +6444,7 @@
 	*)
 	  _LT_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -5481,28 +6455,54 @@
       ;;
 
     irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK(whether the $host_os linker accepts -exported_symbol,
+	  lt_cv_irix_exported_symbol,
+	  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   AC_LINK_IFELSE(
+	     AC_LANG_SOURCE(
+	        AC_LANG_CASE(C, int foo (void) { return 0; },
+			      C++, int foo (void) { return 0; },
+			      Fortran 77, 
+      subroutine foo
+      end,
+			      Fortran, 
+      subroutine foo
+      end)),
+	      lt_cv_irix_exported_symbol=yes,
+	      lt_cv_irix_exported_symbol=no)
+           LDFLAGS=$save_LDFLAGS)
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(inherit_rpath, $1)=yes
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -5517,7 +6517,7 @@
     newsos6)
       _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
@@ -5525,27 +6525,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 	else
-	  case $host_os in
-	   openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 	fi
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5556,33 +6548,53 @@
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5593,24 +6605,24 @@
 
     solaris*)
       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -5620,11 +6632,11 @@
       solaris2.0-5 | solaris2.0-5.*) ;;
       *)
 	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	fi
@@ -5634,10 +6646,10 @@
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -5686,43 +6698,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
+      # Note: We CANNOT use -z defs as we might desire, because we do not
       # link with -lc, and that would cause any symbols used from libc to
       # always be unresolved, which means just about no library would
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
       _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -5737,17 +6749,17 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
 	;;
       esac
     fi
   fi
 )
 AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 
 _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
 
@@ -5764,7 +6776,7 @@
   # Assume -lc should be added
   _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $_LT_TAGVAR(archive_cmds, $1) in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -5773,36 +6785,38 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING(whether -lc should be explicitly linked in)
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT($_LT_TAGVAR(archive_cmds_need_lc, $1))
+      AC_CACHE_CHECK(whether -lc should be explicitly linked in,
+	lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1),
+	$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	)
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)
       ;;
     esac
   fi
@@ -5839,18 +6853,15 @@
 _LT_TAGDECL(, hardcode_libdir_flag_spec, 1,
     Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist)
-_LT_TAGDECL(, hardcode_libdir_flag_spec_ld, 1,
-    If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist)
 _LT_TAGDECL(, hardcode_libdir_separator, 1,
     Whether we need a single "-rpath" flag with a separated argument)
 _LT_TAGDECL(, hardcode_direct, 0,
-    Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
     DIR into the resulting binary)
 _LT_TAGDECL(, hardcode_direct_absolute, 0,
-    Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
     DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
     library is relocated)
 _LT_TAGDECL(, hardcode_minus_L, 0,
     Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -5867,8 +6878,6 @@
     to runtime path list)
 _LT_TAGDECL(, link_all_deplibs, 0,
     Whether libtool must link a program against all its dependency libraries)
-_LT_TAGDECL(, fix_srcfile_path, 1,
-    Fix the shell variable $srcfile for the compiler)
 _LT_TAGDECL(, always_export_symbols, 0,
     Set to "yes" if exported symbols are required)
 _LT_TAGDECL(, export_symbols_cmds, 2,
@@ -5879,6 +6888,8 @@
     Symbols that must always be exported)
 _LT_TAGDECL(, prelink_cmds, 2,
     Commands necessary for linking programs (against libraries) with templates)
+_LT_TAGDECL(, postlink_cmds, 2,
+    Commands necessary for finishing linking programs)
 _LT_TAGDECL(, file_list_spec, 1,
     Specify filename containing input files)
 dnl FIXME: Not yet implemented
@@ -5891,10 +6902,10 @@
 # ------------------------
 # Ensure that the configuration variables for a C compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
 m4_defun(_LT_LANG_C_CONFIG,
 m4_require(_LT_DECL_EGREP)dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
 AC_LANG_PUSH(C)
 
 # Source file extension for C test sources.
@@ -5930,18 +6941,18 @@
   LT_SYS_DLOPEN_SELF
   _LT_CMD_STRIPLIB
 
-  # Report which library types will actually be built
+  # Report what library types will actually be built
   AC_MSG_CHECKING(if libtool supports shared libraries)
   AC_MSG_RESULT($can_build_shared)
 
   AC_MSG_CHECKING(whether to build shared libraries)
-  test "$can_build_shared" = "no" && enable_shared=no
+  test no = "$can_build_shared" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
   # are all built from PIC.
   case $host_os in
   aix3*)
-    test "$enable_shared" = yes && enable_static=no
+    test yes = "$enable_shared" && enable_static=no
     if test -n "$RANLIB"; then
       archive_cmds="$archive_cmds~\$RANLIB \$lib"
       postinstall_cmds='$RANLIB $lib'
@@ -5949,8 +6960,12 @@
     ;;
 
   aix4-9*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -5958,47 +6973,32 @@
 
   AC_MSG_CHECKING(whether to build static libraries)
   # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
+  test yes = "$enable_shared" || enable_static=yes
   AC_MSG_RESULT($enable_static)
 
   _LT_CONFIG($1)
 fi
 AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
 )# _LT_LANG_C_CONFIG
 
 
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun(_LT_PROG_CXX,
-
-pushdef(AC_MSG_ERROR, _lt_caught_CXX_error=yes)
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef(AC_MSG_ERROR)
-)# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(_LT_PROG_CXX, )
-
-
 # _LT_LANG_CXX_CONFIG(TAG)
 # --------------------------
 # Ensure that the configuration variables for a C++ compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
 m4_defun(_LT_LANG_CXX_CONFIG,
-AC_REQUIRE(_LT_PROG_CXX)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
 m4_require(_LT_DECL_EGREP)dnl
+m4_require(_LT_PATH_MANIFEST_TOOL)dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
 
 AC_LANG_PUSH(C++)
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -6010,7 +7010,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6020,6 +7019,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6035,7 +7036,7 @@
 # the CXX compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="int some_variable = 0;"
 
@@ -6051,6 +7052,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -6068,6 +7070,7 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME($compiler)
@@ -6075,35 +7078,35 @@
   if test -n "$compiler"; then
     # We don't want -fno-exception when compiling C++ code, so set the
     # no_builtin_flag separately
-    if test "$GXX" = yes; then
+    if test yes = "$GXX"; then
       _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
     else
       _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
     fi
 
-    if test "$GXX" = yes; then
+    if test yes = "$GXX"; then
       # Set up default GNU C++ configuration
 
       LT_PATH_LD
 
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 
         # If archive_cmds runs LD, not CC, wlarc should be empty
         # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
         #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
+        wlarc='$wl'
 
         # ancient GNU ld didn't support --whole-archive et. al.
         if eval "`$CC -print-prog-name=ld` --help 2>&1" |
 	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
         else
           _LT_TAGVAR(whole_archive_flag_spec, $1)=
         fi
@@ -6122,7 +7125,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -6139,18 +7142,30 @@
         _LT_TAGVAR(ld_shlibs, $1)=no
         ;;
       aix4-9*)
-        if test "$host_cpu" = ia64; then
+        if test ia64 = "$host_cpu"; then
           # On IA64, the linker does run time linking by default, so we don't
           # have to do anything special.
           aix_use_runtimelinking=no
           exp_sym_flag='-Bexport'
-          no_entry_flag=""
+          no_entry_flag=
         else
           aix_use_runtimelinking=no
 
           # Test if we are trying to use run time linking or normal
           # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
           case $host_os in aix4.23|aix4.23.*|aix5-9*)
 	    for ld_flag in $LDFLAGS; do
 	      case $ld_flag in
@@ -6160,6 +7175,13 @@
 	        ;;
 	      esac
 	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
 	    ;;
           esac
 
@@ -6178,13 +7200,21 @@
         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
         _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
 
-        if test "$GXX" = yes; then
+        if test yes = "$GXX"; then
           case $host_os in aix4.012|aix4.012.*)
           # We only want to do this on AIX 4.2 and lower, the check
           # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -6202,59 +7232,84 @@
 	  fi
           esac
           shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
 	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
         else
           # not using gcc
-          if test "$host_cpu" = ia64; then
+          if test ia64 = "$host_cpu"; then
 	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	  # chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
           else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
 	    else
-	      shared_flag='${wl}-bM:SRE'
+	      shared_flag='$wl-bM:SRE'
 	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
           fi
         fi
 
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
         # It seems that -bexpall does not export symbols beginning with
         # underscore (_), so it is better to generate a list of symbols to
 	# export.
         _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
           # Warning - without using the other runtime loading flags (-brtl),
           # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          _LT_SYS_MODULE_PATH_AIX
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+          _LT_SYS_MODULE_PATH_AIX($1)
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
         else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+          if test ia64 = "$host_cpu"; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    _LT_SYS_MODULE_PATH_AIX($1)
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
           fi
         fi
         ;;
@@ -6264,7 +7319,7 @@
 	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6280,32 +7335,108 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
 
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
       dgux*)
         case $cc_basename in
           ec++*)
@@ -6324,7 +7455,7 @@
         esac
         ;;
 
-      freebsd12*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6340,13 +7471,15 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
         ;;
 
       hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
         _LT_TAGVAR(hardcode_direct, $1)=yes
         _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 				             # but as the default
@@ -6358,7 +7491,7 @@
             _LT_TAGVAR(ld_shlibs, $1)=no
             ;;
           aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             # Commands to make compiler produce verbose output that lists
             # what "hidden" libraries, object files and flags are used when
             # linking a shared library.
@@ -6367,11 +7500,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6381,15 +7514,15 @@
         ;;
 
       hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        if test no = "$with_gnu_ld"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
           case $host_cpu in
             hppa*64*|ia64*)
               ;;
             *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
               ;;
           esac
         fi
@@ -6415,13 +7548,13 @@
           aCC*)
 	    case $host_cpu in
 	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	    esac
 	    # Commands to make compiler produce verbose output that lists
@@ -6432,20 +7565,20 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
 	        case $host_cpu in
 	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -6460,22 +7593,22 @@
       interix3-9*)
 	_LT_TAGVAR(hardcode_direct, $1)=no
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 	# Instead, shared libraries are loaded at an image base (0x10000000 by
 	# default) and relocated if they conflict, which is a slow very memory
 	# consuming and fragmenting process.  To avoid this, we pick a random,
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
       irix5* | irix6*)
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -6484,22 +7617,22 @@
 	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
 	    ;;
           *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 	    ;;
         esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6507,8 +7640,8 @@
 	    # KCC will only create a shared library if the output file
 	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
 	    # linking a shared library.
@@ -6517,10 +7650,10 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -6534,59 +7667,59 @@
 	    # earlier do not add the objects themselves.
 	    case `$CC -V 2>&1` in
 	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	      *)  # Version 8.0 or newer
 	        tmp_idyn=
 	        case $host_cpu in
 		  ia64*) tmp_idyn=' -i_dynamic';;
 		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	    esac
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 	    ;;
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ 1-5* | *pgcpp\ 1-5*)
+	    *pgCC\ 1-5.* | *pgcpp\ 1-5.*)
 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 will use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	      ;;
 	    esac
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
 
 	    runpath_var=LD_RUN_PATH
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6600,18 +7733,18 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	    ;;
-	  xl*)
+	  xl* | mpixl* | bgxl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+                cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	    fi
 	    ;;
 	  *)
@@ -6619,16 +7752,16 @@
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='echo'
+	      output_verbose_link_cmd='func_echo_all'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6680,24 +7813,19 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
 	;;
 
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
+      openbsd* | bitrig*)
 	if test -f /usr/libexec/ld.so; then
 	  _LT_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=echo
+	  output_verbose_link_cmd=func_echo_all
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6711,9 +7839,9 @@
 	    # KCC will only create a shared library if the output file
 	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	    # Archives containing C++ object files must be created using
@@ -6731,17 +7859,17 @@
           cxx*)
 	    case $host in
 	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 		;;
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
 	    esac
@@ -6756,27 +7884,27 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
 	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	      esac
 
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -6812,13 +7940,13 @@
 
       solaris*)
         case $cc_basename in
-          CC*)
+          CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6826,14 +7954,14 @@
 	      solaris2.0-5 | solaris2.0-5.*) ;;
 	      *)
 		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
+		# but understands '-z linker_flag'.
 	        # Supported since Solaris 2.6 (maybe 2.5.1?)
 		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	        ;;
 	    esac
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 
-	    output_verbose_link_cmd='echo'
+	    output_verbose_link_cmd='func_echo_all'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6843,42 +7971,42 @@
 	    ;;
           gcx*)
 	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 
 	    # The C++ compiler must be used to create the archive.
 	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 	    ;;
           *)
 	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
 	      case $host_os in
 		solaris2.0-5 | solaris2.0-5.*) ;;
 		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 		  ;;
 	      esac
 	    fi
@@ -6887,48 +8015,52 @@
         ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       runpath_var='LD_RUN_PATH'
 
       case $cc_basename in
         CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
       esac
       ;;
 
       sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
+	# Note: We CANNOT use -z defs as we might desire, because we do not
 	# link with -lc, and that would cause any symbols used from libc to
 	# always be unresolved, which means just about no library would
 	# ever link correctly.  If we're not using GNU ld we use -z text
 	# though, which does catch some bad symbols but isn't as heavy-handed
 	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
 	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
 	runpath_var='LD_RUN_PATH'
 
 	case $cc_basename in
           CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
 	    ;;
 	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    ;;
 	esac
       ;;
@@ -6959,10 +8091,10 @@
     esac
 
     AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -6980,6 +8112,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -6988,12 +8121,36 @@
   lt_cv_path_LD=$lt_save_path_LD
   lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
   lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
 
 AC_LANG_POP
 )# _LT_LANG_CXX_CONFIG
 
 
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun(_LT_FUNC_STRIPNAME_CNF,dnl
+AC_REQUIRE(_LT_DECL_SED)
+AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)
+func_stripname_cnf ()
+{
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+  esac
+} # func_stripname_cnf
+)# _LT_FUNC_STRIPNAME_CNF
+
+
 # _LT_SYS_HIDDEN_LIBDEPS(TAGNAME)
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -7002,6 +8159,7 @@
 # objects, libraries and library flags.
 m4_defun(_LT_SYS_HIDDEN_LIBDEPS,
 m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+AC_REQUIRE(_LT_FUNC_STRIPNAME_CNF)dnl
 # Dependencies to place before and after the object being linked:
 _LT_TAGVAR(predep_objects, $1)=
 _LT_TAGVAR(postdep_objects, $1)=
@@ -7051,7 +8209,20 @@
   }
 };
 _LT_EOF
+, $1, GO, cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 )
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
 dnl Parse the compiler output and extract the necessary
 dnl objects, libraries and library flags.
 if AC_TRY_EVAL(ac_compile); then
@@ -7063,29 +8234,38 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case $prev$p in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
        # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
 	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
 	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
 	   fi
 	   ;;
 	 # The "-l" case would never come before the object being
@@ -7093,13 +8273,15 @@
 	 esac
        else
 	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
 	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -7108,15 +8290,15 @@
 	 continue
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
+       if test no = "$pre_test_object_deps_done"; then
 	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
+	   _LT_TAGVAR(predep_objects, $1)=$p
 	 else
 	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
 	 fi
        else
 	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	   _LT_TAGVAR(postdep_objects, $1)=$p
 	 else
 	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
 	 fi
@@ -7135,6 +8317,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 m4_if($1, CXX,
@@ -7146,51 +8329,6 @@
   _LT_TAGVAR(postdep_objects,$1)=
   _LT_TAGVAR(postdeps,$1)=
   ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
 esac
 )
 
@@ -7199,7 +8337,7 @@
 esac
  _LT_TAGVAR(compiler_lib_search_dirs, $1)=
 if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 fi
 _LT_TAGDECL(, compiler_lib_search_dirs, 1,
     The directories searched by this compiler when creating a shared library)
@@ -7215,32 +8353,16 @@
 )# _LT_SYS_HIDDEN_LIBDEPS
 
 
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun(_LT_PROG_F77,
-
-pushdef(AC_MSG_ERROR, _lt_disable_F77=yes)
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef(AC_MSG_ERROR)
-)# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(_LT_PROG_F77, )
-
-
 # _LT_LANG_F77_CONFIG(TAG)
 # --------------------------
 # Ensure that the configuration variables for a Fortran 77 compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun(_LT_LANG_F77_CONFIG,
-AC_REQUIRE(_LT_PROG_F77)dnl
-AC_LANG_PUSH(Fortran 77)
+AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7250,7 +8372,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7259,6 +8380,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7274,7 +8397,7 @@
 # the F77 compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -7296,9 +8419,11 @@
   _LT_LINKER_BOILERPLATE
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME($compiler)
@@ -7308,21 +8433,25 @@
     AC_MSG_RESULT($can_build_shared)
 
     AC_MSG_CHECKING(whether to build shared libraries)
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && enable_shared=no
 
     # On AIX, shared libraries and static libraries use the same namespace, and
     # are all built from PIC.
     case $host_os in
       aix3*)
-        test "$enable_shared" = yes && enable_static=no
+        test yes = "$enable_shared" && enable_static=no
         if test -n "$RANLIB"; then
           archive_cmds="$archive_cmds~\$RANLIB \$lib"
           postinstall_cmds='$RANLIB $lib'
         fi
         ;;
       aix4-9*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -7330,11 +8459,11 @@
 
     AC_MSG_CHECKING(whether to build static libraries)
     # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
+    test yes = "$enable_shared" || enable_static=yes
     AC_MSG_RESULT($enable_static)
 
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -7351,39 +8480,25 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
 
 AC_LANG_POP
 )# _LT_LANG_F77_CONFIG
 
 
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun(_LT_PROG_FC,
-
-pushdef(AC_MSG_ERROR, _lt_disable_FC=yes)
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef(AC_MSG_ERROR)
-)# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(_LT_PROG_FC, )
-
-
 # _LT_LANG_FC_CONFIG(TAG)
 # -------------------------
 # Ensure that the configuration variables for a Fortran compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun(_LT_LANG_FC_CONFIG,
-AC_REQUIRE(_LT_PROG_FC)dnl
-AC_LANG_PUSH(Fortran)
+AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7393,7 +8508,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7402,6 +8516,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7417,7 +8533,7 @@
 # the FC compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -7439,9 +8555,11 @@
   _LT_LINKER_BOILERPLATE
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
@@ -7453,21 +8571,25 @@
     AC_MSG_RESULT($can_build_shared)
 
     AC_MSG_CHECKING(whether to build shared libraries)
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && enable_shared=no
 
     # On AIX, shared libraries and static libraries use the same namespace, and
     # are all built from PIC.
     case $host_os in
       aix3*)
-        test "$enable_shared" = yes && enable_static=no
+        test yes = "$enable_shared" && enable_static=no
         if test -n "$RANLIB"; then
           archive_cmds="$archive_cmds~\$RANLIB \$lib"
           postinstall_cmds='$RANLIB $lib'
         fi
         ;;
       aix4-9*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -7475,11 +8597,11 @@
 
     AC_MSG_CHECKING(whether to build static libraries)
     # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
+    test yes = "$enable_shared" || enable_static=yes
     AC_MSG_RESULT($enable_static)
 
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -7497,8 +8619,9 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
 
 AC_LANG_POP
 )# _LT_LANG_FC_CONFIG
@@ -7508,7 +8631,7 @@
 # --------------------------
 # Ensure that the configuration variables for the GNU Java Compiler compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun(_LT_LANG_GCJ_CONFIG,
 AC_REQUIRE(LT_PROG_GCJ)dnl
 AC_LANG_SAVE
@@ -7534,19 +8657,23 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=yes
 CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
 _LT_CC_BASENAME($compiler)
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 
 if test -n "$compiler"; then
   _LT_COMPILER_NO_RTTI($1)
@@ -7562,15 +8689,83 @@
 AC_LANG_RESTORE
 
 GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 )# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG(TAG)
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun(_LT_LANG_GO_CONFIG,
+AC_REQUIRE(LT_PROG_GO)dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME($compiler)
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+)# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG(TAG)
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun(_LT_LANG_RC_CONFIG,
 AC_REQUIRE(LT_PROG_RC)dnl
 AC_LANG_SAVE
@@ -7586,7 +8781,7 @@
 lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_TAG_COMPILER
@@ -7596,10 +8791,12 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
+CFLAGS=
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME($compiler)
@@ -7612,7 +8809,8 @@
 
 GCC=$lt_save_GCC
 AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 )# _LT_LANG_RC_CONFIG
 
 
@@ -7622,7 +8820,7 @@
 m4_ifdef(AC_PROG_GCJ, AC_PROG_GCJ,
   m4_ifdef(AM_PROG_GCJ, AM_PROG_GCJ,
     AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
       AC_SUBST(GCJFLAGS)))dnl
 )
 
@@ -7632,6 +8830,13 @@
 dnl AC_DEFUN(LT_AC_PROG_GCJ, )
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN(LT_PROG_GO,
+AC_CHECK_TOOL(GOC, gccgo,)
+)
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN(LT_PROG_RC,
@@ -7671,6 +8876,15 @@
 AC_SUBST(OBJDUMP)
 )
 
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun(_LT_DECL_DLLTOOL,
+AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL(, DLLTOOL, 1, DLL creation program)
+AC_SUBST(DLLTOOL)
+)
 
 # _LT_DECL_SED
 # ------------
@@ -7715,7 +8929,7 @@
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
+  test ! -f "$lt_ac_sed" && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7732,9 +8946,9 @@
     $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
     cmp -s conftest.out conftest.nl || break
     # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
+    test 10 -lt "$lt_ac_count" && break
     lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
       lt_ac_max=$lt_ac_count
       lt_cv_path_SED=$lt_ac_sed
     fi
@@ -7758,27 +8972,7 @@
 # Find out whether the shell is Bourne or XSI compatible,
 # or has some other useful features.
 m4_defun(_LT_CHECK_SHELL_FEATURES,
-AC_MSG_CHECKING(whether the shell understands some XSI constructs)
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT($xsi_shell)
-_LT_CONFIG_LIBTOOL_INIT(xsi_shell='$xsi_shell')
-
-AC_MSG_CHECKING(whether the shell understands "+=")
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT($lt_shell_append)
-_LT_CONFIG_LIBTOOL_INIT(lt_shell_append='$lt_shell_append')
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
   lt_unset=false
@@ -7802,222 +8996,84 @@
 )# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun(_LT_PROG_XSI_SHELLFNS,
-case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun(_LT_PATH_CONVERSION_FUNCTIONS,
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+AC_REQUIRE(AC_CANONICAL_BUILD)dnl
+AC_MSG_CHECKING(how to convert $build file names to $host format)
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
     ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^$-^=*$=.*/\1/;q'
-my_sed_long_arg='1s/^-^=*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.^.*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
     ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
     ;;
-  esac
+esac
 )
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT($lt_cv_to_host_file_cmd)
+_LT_DECL(to_host_file_cmd, lt_cv_to_host_file_cmd,
+         0, convert $build file names to $host format)dnl
+
+AC_MSG_CHECKING(how to convert $build file names to toolchain format)
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+)
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT($lt_cv_to_tool_file_cmd)
+_LT_DECL(to_tool_file_cmd, lt_cv_to_tool_file_cmd,
+         0, convert $build files to toolchain format)dnl
+)# _LT_PATH_CONVERSION_FUNCTIONS
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltoptions.m4
+# serial 8 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN(LTOPTIONS_VERSION, m4_if(1))
@@ -8038,7 +9094,7 @@
 m4_define(_LT_MANGLE_OPTION($1, $2))dnl
 m4_ifdef(_LT_MANGLE_DEFUN($1, $2),
         _LT_MANGLE_DEFUN($1, $2),
-    m4_warning(Unknown $1 option `$2'))dnl
+    m4_warning(Unknown $1 option '$2'))dnl
 )
 
 
@@ -8084,13 +9140,15 @@
   dnl
   dnl If no reference was made to various pairs of opposing options, then
   dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
   dnl archives by default:
   _LT_UNLESS_OPTIONS(LT_INIT, shared disable-shared, _LT_ENABLE_SHARED)
   _LT_UNLESS_OPTIONS(LT_INIT, static disable-static, _LT_ENABLE_STATIC)
   _LT_UNLESS_OPTIONS(LT_INIT, pic-only no-pic, _LT_WITH_PIC)
   _LT_UNLESS_OPTIONS(LT_INIT, fast-install disable-fast-install,
-  		   _LT_ENABLE_FAST_INSTALL)
+		   _LT_ENABLE_FAST_INSTALL)
+  _LT_UNLESS_OPTIONS(LT_INIT, aix-soname=aix aix-soname=both aix-soname=svr4,
+		   _LT_WITH_AIX_SONAME(aix))
   )
 )# _LT_SET_OPTIONS
 
@@ -8118,7 +9176,7 @@
 _LT_SET_OPTION(LT_INIT, dlopen)
 AC_DIAGNOSE(obsolete,
 $0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.)
+put the 'dlopen' option into LT_INIT's first parameter.)
 )
 
 dnl aclocal-1.4 backwards compatibility:
@@ -8132,7 +9190,7 @@
 enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -8140,13 +9198,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL(, AS,      0, Assembler program)dnl
+_LT_DECL(, AS,      1, Assembler program)dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL(, DLLTOOL, 0, DLL creation program)dnl
+_LT_DECL(, DLLTOOL, 1, DLL creation program)dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL(, OBJDUMP, 0, Object dumper program)dnl
+_LT_DECL(, OBJDUMP, 1, Object dumper program)dnl
 )# win32-dll
 
 AU_DEFUN(AC_LIBTOOL_WIN32_DLL,
@@ -8154,7 +9212,7 @@
 _LT_SET_OPTION(LT_INIT, win32-dll)
 AC_DIAGNOSE(obsolete,
 $0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.)
+put the 'win32-dll' option into LT_INIT's first parameter.)
 )
 
 dnl aclocal-1.4 backwards compatibility:
@@ -8163,9 +9221,9 @@
 
 # _LT_ENABLE_SHARED(DEFAULT)
 # ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define(_LT_ENABLE_SHARED,
 m4_define(_LT_ENABLE_SHARED_DEFAULT, m4_if($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
@@ -8178,14 +9236,14 @@
     *)
       enable_shared=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac,
     enable_shared=_LT_ENABLE_SHARED_DEFAULT)
@@ -8217,9 +9275,9 @@
 
 # _LT_ENABLE_STATIC(DEFAULT)
 # ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define(_LT_ENABLE_STATIC,
 m4_define(_LT_ENABLE_STATIC_DEFAULT, m4_if($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
@@ -8232,14 +9290,14 @@
     *)
      enable_static=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac,
     enable_static=_LT_ENABLE_STATIC_DEFAULT)
@@ -8271,9 +9329,9 @@
 
 # _LT_ENABLE_FAST_INSTALL(DEFAULT)
 # ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define(_LT_ENABLE_FAST_INSTALL,
 m4_define(_LT_ENABLE_FAST_INSTALL_DEFAULT, m4_if($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
@@ -8286,14 +9344,14 @@
     *)
       enable_fast_install=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac,
     enable_fast_install=_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -8310,14 +9368,14 @@
 _LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)fast-install)
 AC_DIAGNOSE(obsolete,
 $0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.)
+the 'fast-install' option into LT_INIT's first parameter.)
 )
 
 AU_DEFUN(AC_DISABLE_FAST_INSTALL,
 _LT_SET_OPTION(LT_INIT, disable-fast-install)
 AC_DIAGNOSE(obsolete,
 $0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.)
+the 'disable-fast-install' option into LT_INIT's first parameter.)
 )
 
 dnl aclocal-1.4 backwards compatibility:
@@ -8325,19 +9383,85 @@
 dnl AC_DEFUN(AM_DISABLE_FAST_INSTALL, )
 
 
+# _LT_WITH_AIX_SONAME(DEFAULT)
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define(_LT_WITH_AIX_SONAME,
+m4_define(_LT_WITH_AIX_SONAME_DEFAULT, m4_if($1, svr4, svr4, m4_if($1, both, both, aix)))dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix5-9*,yes)
+  AC_MSG_CHECKING(which variant of shared library versioning to provide)
+  AC_ARG_WITH(aix-soname,
+    AS_HELP_STRING(--with-aix-soname=aix|svr4|both,
+      shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=_LT_WITH_AIX_SONAME_DEFAULT@:>@.),
+    case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR(Unknown argument to --with-aix-soname)
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname,
+    AC_CACHE_VAL(lt_cv_with_aix_soname,
+      lt_cv_with_aix_soname=_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname)
+  AC_MSG_RESULT($with_aix_soname)
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL(, shared_archive_member_spec, 0,
+    Shared archive member basename, for filename based shared library versioning on AIX)dnl
+)# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE(LT_INIT, aix-soname=aix, _LT_WITH_AIX_SONAME(aix))
+LT_OPTION_DEFINE(LT_INIT, aix-soname=both, _LT_WITH_AIX_SONAME(both))
+LT_OPTION_DEFINE(LT_INIT, aix-soname=svr4, _LT_WITH_AIX_SONAME(svr4))
+
+
 # _LT_WITH_PIC(MODE)
 # --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
 # LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
 m4_define(_LT_WITH_PIC,
 AC_ARG_WITH(pic,
-    AS_HELP_STRING(--with-pic,
+    AS_HELP_STRING(--with-pic@<:@=PKGS@:>@,
 	try to use only PIC/non-PIC objects @<:@default=use both@:>@),
-    pic_mode="$withval",
-    pic_mode=default)
-
-test -z "$pic_mode" && pic_mode=m4_default($1, default)
+    lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac,
+    pic_mode=m4_default($1, default))
 
 _LT_DECL(, pic_mode, 0, What type of objects to build)dnl
 )# _LT_WITH_PIC
@@ -8350,7 +9474,7 @@
 _LT_SET_OPTION(LT_INIT, pic-only)
 AC_DIAGNOSE(obsolete,
 $0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.)
+put the 'pic-only' option into LT_INIT's first parameter.)
 )
 
 dnl aclocal-1.4 backwards compatibility:
@@ -8373,7 +9497,8 @@
 
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -8406,7 +9531,7 @@
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
 m4_define(lt_car, $1)
 m4_define(lt_cdr,
 m4_if($#, 0, m4_fatal($0: cannot be called without arguments),
@@ -8417,7 +9542,7 @@
 
 # lt_append(MACRO-NAME, STRING, SEPARATOR)
 # ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
 # Note that neither SEPARATOR nor STRING are expanded; they are appended
 # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 # No SEPARATOR is output if MACRO-NAME was previously undefined (different
@@ -8497,42 +9622,43 @@
 
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# Generated from ltversion.in.
+# @configure_input@
 
-# serial 3017 ltversion.m4
+# serial 4179 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define(LT_PACKAGE_VERSION, 2.2.6b)
-m4_define(LT_PACKAGE_REVISION, 1.3017)
+m4_define(LT_PACKAGE_VERSION, 2.4.6)
+m4_define(LT_PACKAGE_REVISION, 2.4.6)
 
 AC_DEFUN(LTVERSION_VERSION,
-macro_version='2.2.6b'
-macro_revision='1.3017'
+macro_version='2.4.6'
+macro_revision='2.4.6'
 _LT_DECL(, macro_version, 0, Which release of libtool.m4 was used?)
 _LT_DECL(, macro_revision, 0)
 )
 
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
 # which have later been changed to m4_define as they aren't part of the
 # exported API, or moved to Autoconf or Automake where they belong.
 #
@@ -8546,7 +9672,7 @@
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
@@ -8598,7 +9724,6 @@
 m4_ifndef(_LT_AC_LANG_CXX,		AC_DEFUN(_LT_AC_LANG_CXX))
 m4_ifndef(_LT_AC_LANG_F77,		AC_DEFUN(_LT_AC_LANG_F77))
 m4_ifndef(_LT_AC_LANG_GCJ,		AC_DEFUN(_LT_AC_LANG_GCJ))
-m4_ifndef(AC_LIBTOOL_RC,		AC_DEFUN(AC_LIBTOOL_RC))
 m4_ifndef(AC_LIBTOOL_LANG_C_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_C_CONFIG))
 m4_ifndef(_LT_AC_LANG_C_CONFIG,	AC_DEFUN(_LT_AC_LANG_C_CONFIG))
 m4_ifndef(AC_LIBTOOL_LANG_CXX_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_CXX_CONFIG))
@@ -8611,21 +9736,28 @@
 m4_ifndef(_LT_AC_LANG_RC_CONFIG,	AC_DEFUN(_LT_AC_LANG_RC_CONFIG))
 m4_ifndef(AC_LIBTOOL_CONFIG,		AC_DEFUN(AC_LIBTOOL_CONFIG))
 m4_ifndef(_LT_AC_FILE_LTDLL_C,	AC_DEFUN(_LT_AC_FILE_LTDLL_C))
+m4_ifndef(_LT_REQUIRED_DARWIN_CHECKS,	AC_DEFUN(_LT_REQUIRED_DARWIN_CHECKS))
+m4_ifndef(_LT_AC_PROG_CXXCPP,		AC_DEFUN(_LT_AC_PROG_CXXCPP))
+m4_ifndef(_LT_PREPARE_SED_QUOTE_VARS,	AC_DEFUN(_LT_PREPARE_SED_QUOTE_VARS))
+m4_ifndef(_LT_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_PROG_ECHO_BACKSLASH))
+m4_ifndef(_LT_PROG_F77,		AC_DEFUN(_LT_PROG_F77))
+m4_ifndef(_LT_PROG_FC,		AC_DEFUN(_LT_PROG_FC))
+m4_ifndef(_LT_PROG_CXX,		AC_DEFUN(_LT_PROG_CXX))
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -8645,35 +9777,67 @@
   AC_SUBST(USE_NLS)
 )
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG(MIN-VERSION)
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef(PKG_PREREQ,
+dnl     m4_fatal(must install pkg-config 0.29 or later before running autoconf/autogen))
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun(PKG_PREREQ,
+m4_define(PKG_MACROS_VERSION, 0.29.1)
+m4_if(m4_version_compare(PKG_MACROS_VERSION, $1), -1,
+    m4_fatal(pkg.m4 version $1 or higher is required but PKG_MACROS_VERSION found))
+)dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG(MIN-VERSION)
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN(PKG_PROG_PKG_CONFIG,
 m4_pattern_forbid(^_?PKG_A-Z_+$)
-m4_pattern_allow(^PKG_CONFIG(_PATH)?$)
+m4_pattern_allow(^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$)
+m4_pattern_allow(^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$)
 AC_ARG_VAR(PKG_CONFIG, path to pkg-config utility)
 AC_ARG_VAR(PKG_CONFIG_PATH, directories to add to pkg-config's search path)
 AC_ARG_VAR(PKG_CONFIG_LIBDIR, path overriding pkg-config's built-in search path)
@@ -8691,18 +9855,19 @@
 		PKG_CONFIG=""
 	fi
 fidnl
-)# PKG_PROG_PKG_CONFIG
+)dnl PKG_PROG_PKG_CONFIG
 
-# PKG_CHECK_EXISTS(MODULES, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN(PKG_CHECK_EXISTS,
 AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
 if test -n "$PKG_CONFIG" && \
@@ -8712,22 +9877,26 @@
   $3)dnl
 fi)
 
-# _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
-# ---------------------------------------------
+dnl _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define(_PKG_CONFIG,
 if test -n "$$1"; then
     pkg_cv_$1="$$1"
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS($3,
-                     pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`,
+                     pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ,
 		     pkg_failed=yes)
  else
     pkg_failed=untried
 fidnl
-)# _PKG_CONFIG
+)dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN(_PKG_SHORT_ERRORS_SUPPORTED,
 AC_REQUIRE(PKG_PROG_PKG_CONFIG)
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -8735,19 +9904,17 @@
 else
         _pkg_short_errors_supported=no
 fidnl
-)# _PKG_SHORT_ERRORS_SUPPORTED
+)dnl _PKG_SHORT_ERRORS_SUPPORTED
 
 
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
-# ACTION-IF-NOT-FOUND)
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
+dnl   ACTION-IF-NOT-FOUND)
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN(PKG_CHECK_MODULES,
 AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
 AC_ARG_VAR($1_CFLAGS, C compiler flags for $1, overriding pkg-config)dnl
@@ -8767,9 +9934,9 @@
    	AC_MSG_RESULT(no)
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
         else 
-	        $1_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -8782,7 +9949,7 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT)dnl
+_PKG_TEXT)dnl
         )
 elif test $pkg_failed = untried; then
      	AC_MSG_RESULT(no)
@@ -8793,7 +9960,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
         )
 else
 	$1_CFLAGS=$pkg_cv_$1_CFLAGS
@@ -8801,9 +9968,92 @@
         AC_MSG_RESULT(yes)
 	$3
 fidnl
-)# PKG_CHECK_MODULES
+)dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
+dnl   ACTION-IF-NOT-FOUND)
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN(PKG_CHECK_MODULES_STATIC,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIGdnl
+)dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR(DIRECTORY)
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN(PKG_INSTALLDIR,
+m4_pushdef(pkg_default, m4_default($1, '${libdir}/pkgconfig'))
+m4_pushdef(pkg_description,
+    pkg-config installation directory @<:@pkg_default@:>@)
+AC_ARG_WITH(pkgconfigdir,
+    AS_HELP_STRING(--with-pkgconfigdir, pkg_description),,
+    with_pkgconfigdir=pkg_default)
+AC_SUBST(pkgconfigdir, $with_pkgconfigdir)
+m4_popdef(pkg_default)
+m4_popdef(pkg_description)
+)dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR(DIRECTORY)
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN(PKG_NOARCH_INSTALLDIR,
+m4_pushdef(pkg_default, m4_default($1, '${datadir}/pkgconfig'))
+m4_pushdef(pkg_description,
+    pkg-config arch-independent installation directory @<:@pkg_default@:>@)
+AC_ARG_WITH(noarch-pkgconfigdir,
+    AS_HELP_STRING(--with-noarch-pkgconfigdir, pkg_description),,
+    with_noarch_pkgconfigdir=pkg_default)
+AC_SUBST(noarch_pkgconfigdir, $with_noarch_pkgconfigdir)
+m4_popdef(pkg_default)
+m4_popdef(pkg_description)
+)dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN(PKG_CHECK_VAR,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
+AC_ARG_VAR($1, value of $3 for $2, overriding pkg-config)dnl
+
+_PKG_CONFIG($1, variable="$3", $2)
+AS_VAR_COPY($1, pkg_cv_$1)
+
+AS_VAR_IF($1, "", $5, $4)dnl
+)dnl PKG_CHECK_VAR
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8815,10 +10065,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.11'
+am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.11.1, ,
+m4_if($1, 1.15.1, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -8834,22 +10084,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.11.1)dnl
+AM_AUTOMAKE_VERSION(1.15.1)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -8868,7 +10118,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -8886,53 +10136,26 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN(AM_AUX_DIR_EXPAND,
-dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ(2.50)dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-)
-
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# This was merged into AC_PROG_CC in Autoconf.
-
-AU_DEFUN(AM_PROG_CC_STDC,
-AC_PROG_CC
-AC_DIAGNOSE(obsolete, $0:
-	your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
-	`ac_cv_prog_cc_stdc'.  Remove this warning and the assignment when
-	you adjust the code.  You can also remove the above call to
-	AC_PROG_CC if you already called it elsewhere.)
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 )
-AU_DEFUN(fp_PROG_CC_STDC)
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN(AM_CONDITIONAL,
-AC_PREREQ(2.52)dnl
- ifelse($1, TRUE,  AC_FATAL($0: invalid condition: $1),
-	$1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
+AC_PREREQ(2.52)dnl
+ m4_if($1, TRUE,  AC_FATAL($0: invalid condition: $1),
+       $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
 AC_SUBST($1_TRUE)dnl
 AC_SUBST($1_FALSE)dnl
 _AM_SUBST_NOTMAKE($1_TRUE)dnl
@@ -8951,16 +10174,14 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -8970,7 +10191,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -8983,12 +10204,13 @@
 AC_REQUIRE(AM_MAKE_INCLUDE)dnl
 AC_REQUIRE(AM_DEP_TRACK)dnl
 
-ifelse($1, CC,   depcc="$CC"   am_compiler_list=,
-       $1, CXX,  depcc="$CXX"  am_compiler_list=,
-       $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
-       $1, UPC,  depcc="$UPC"  am_compiler_list=,
-       $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
-                   depcc="$$1"   am_compiler_list=)
+m4_if($1, CC,   depcc="$CC"   am_compiler_list=,
+      $1, CXX,  depcc="$CXX"  am_compiler_list=,
+      $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
+      $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc',
+      $1, UPC,  depcc="$UPC"  am_compiler_list=,
+      $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
+                    depcc="$$1"   am_compiler_list=)
 
 AC_CACHE_CHECK(dependency style of $depcc,
                am_cv_$1_dependencies_compiler_type,
@@ -8996,8 +10218,9 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -9036,16 +10259,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -9054,16 +10277,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -9111,7 +10334,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN(AM_SET_DEPDIR,
 AC_REQUIRE(AM_SET_LEADING_DOT)dnl
 AC_SUBST(DEPDIR, "${am__leading_dot}deps")dnl
@@ -9121,34 +10344,39 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN(AM_DEP_TRACK,
-AC_ARG_ENABLE(dependency-tracking,
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors)
+AC_ARG_ENABLE(dependency-tracking, dnl
+AS_HELP_STRING(
+  --enable-dependency-tracking,
+  do not reject slow dependency extractors)
+AS_HELP_STRING(
+  --disable-dependency-tracking,
+  speeds up one-time build))
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
 AC_SUBST(AMDEPBACKSLASH)dnl
 _AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl
+AC_SUBST(am__nodep)dnl
+_AM_SUBST_NOTMAKE(am__nodep)dnl
 )
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN(_AM_OUTPUT_DEPENDENCY_COMMANDS,
 {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -9161,7 +10389,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -9173,21 +10401,19 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME("$file")`
@@ -9205,7 +10431,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,
 AC_CONFIG_COMMANDS(depfiles,
@@ -9215,18 +10441,21 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define(AC_PROG_CC,
+m4_defn(AC_PROG_CC)
+_AM_PROG_CC_C_O
+)
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, NO-DEFINE)
 # AM_INIT_AUTOMAKE(OPTIONS)
 # -----------------------------------------------
@@ -9239,7 +10468,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN(AM_INIT_AUTOMAKE,
-AC_PREREQ(2.62)dnl
+AC_PREREQ(2.65)dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
@@ -9268,33 +10497,42 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval($2,
-m4_ifval($3, _AM_SET_OPTION(no-define))dnl
+AC_DIAGNOSE(obsolete,
+             $0: two- and three-arguments forms are deprecated.)
+m4_ifval($3, _AM_SET_OPTION(no-define))dnl
  AC_SUBST(PACKAGE, $1)dnl
  AC_SUBST(VERSION, $2),
 _AM_SET_OPTIONS($1)dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef(AC_PACKAGE_NAME, 1)m4_ifdef(AC_PACKAGE_VERSION, 1), 11,,
+m4_if(
+  m4_ifdef(AC_PACKAGE_NAME, ok):m4_ifdef(AC_PACKAGE_VERSION, ok),
+  ok:ok,,
   m4_fatal(AC_INIT should be called with package and version arguments))dnl
  AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
  AC_SUBST(VERSION, 'AC_PACKAGE_VERSION'))dnl
 
 _AM_IF_OPTION(no-define,,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", Name of package)
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", Version number of package))dnl
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", Name of package)
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", Version number of package))dnl
 
 # Some tools Automake needs.
 AC_REQUIRE(AM_SANITY_CHECK)dnl
 AC_REQUIRE(AC_ARG_PROGRAM)dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
 AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
 AC_REQUIRE(AM_PROG_INSTALL_STRIP)dnl
-AC_REQUIRE(AM_PROG_MKDIR_P)dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+AC_REQUIRE(AC_PROG_MKDIR_P)dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST(mkdir_p, '$(MKDIR_P)')
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE(AC_PROG_AWK)dnl
 AC_REQUIRE(AC_PROG_MAKE_SET)dnl
 AC_REQUIRE(AM_SET_LEADING_DOT)dnl
@@ -9303,34 +10541,82 @@
 			     _AM_PROG_TAR(v7)))
 _AM_IF_OPTION(no-dependencies,,
 AC_PROVIDE_IFELSE(AC_PROG_CC,
-		  _AM_DEPENDENCIES(CC),
-		  define(AC_PROG_CC,
-			  defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
+		  _AM_DEPENDENCIES(CC),
+		  m4_define(AC_PROG_CC,
+			     m4_defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
 AC_PROVIDE_IFELSE(AC_PROG_CXX,
-		  _AM_DEPENDENCIES(CXX),
-		  define(AC_PROG_CXX,
-			  defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
+		  _AM_DEPENDENCIES(CXX),
+		  m4_define(AC_PROG_CXX,
+			     m4_defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
 AC_PROVIDE_IFELSE(AC_PROG_OBJC,
-		  _AM_DEPENDENCIES(OBJC),
-		  define(AC_PROG_OBJC,
-			  defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
-)
-_AM_IF_OPTION(silent-rules, AC_REQUIRE(AM_SILENT_RULES))dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+		  _AM_DEPENDENCIES(OBJC),
+		  m4_define(AC_PROG_OBJC,
+			     m4_defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
+AC_PROVIDE_IFELSE(AC_PROG_OBJCXX,
+		  _AM_DEPENDENCIES(OBJCXX),
+		  m4_define(AC_PROG_OBJCXX,
+			     m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
+)
+AC_REQUIRE(AM_SILENT_RULES)dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 m4_provide_if(_AM_COMPILER_EXEEXT,
   AM_CONDITIONAL(am__EXEEXT, test -n "$EXEEXT")))dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR(Your 'rm' program is bad, sorry.)
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 )
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define(_AC_COMPILER_EXEEXT,
 m4_defn(_AC_COMPILER_EXEEXT)m4_provide(_AM_COMPILER_EXEEXT))
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -9352,7 +10638,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9363,7 +10649,7 @@
 # Define $install_sh.
 AC_DEFUN(AM_PROG_INSTALL_SH,
 AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -9371,16 +10657,14 @@
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh))
+AC_SUBST(install_sh))
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN(AM_SET_LEADING_DOT,
@@ -9397,20 +10681,17 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_MAINTAINER_MODE(DEFAULT-MODE)
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN(AM_MAINTAINER_MODE,
 m4_case(m4_default($1, disable),
@@ -9418,13 +10699,14 @@
        disable, m4_define(am_maintainer_other, enable),
        m4_define(am_maintainer_other, enable)
         m4_warn(syntax, unexpected argument to AM@&t@_MAINTAINER_MODE: $1))
-AC_MSG_CHECKING(whether to am_maintainer_other maintainer-specific portions of Makefiles)
+AC_MSG_CHECKING(whether to enable maintainer-specific portions of Makefiles)
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE(maintainer-mode,
-  --am_maintainer_other-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer,
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=m4_if(am_maintainer_other, enable, no, yes))
+    AS_HELP_STRING(--am_maintainer_other-maintainer-mode,
+      am_maintainer_other make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer),
+    USE_MAINTAINER_MODE=$enableval,
+    USE_MAINTAINER_MODE=m4_if(am_maintainer_other, enable, no, yes))
   AC_MSG_RESULT($USE_MAINTAINER_MODE)
   AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
   MAINT=$MAINTAINER_MODE_TRUE
@@ -9432,18 +10714,14 @@
 
 )
 
-AU_DEFUN(jm_MAINTAINER_MODE, AM_MAINTAINER_MODE)
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -9461,7 +10739,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -9488,15 +10766,12 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN(AM_MISSING_PROG,
@@ -9504,11 +10779,10 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1))
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN(AM_MISSING_HAS_RUN,
 AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
 AC_REQUIRE_AUX_FILE(missing)dnl
@@ -9521,63 +10795,64 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN(`missing' script is too old or missing)
+  AC_MSG_WARN('missing' script is too old or missing)
 fi
 )
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#  -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN(AM_PROG_MKDIR_P,
-AC_PREREQ(2.60)dnl
-AC_REQUIRE(AC_PROG_MKDIR_P)dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST(mkdir_p, "$MKDIR_P")dnl
-case $mkdir_p in
-  \\/$* | ?:\\/*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-)
+AC_DEFUN(AM_CONFIG_HEADER,
+AC_DIAGNOSE(obsolete,
+'$0': this macro is obsolete.
+You should use the 'AC_CONFIG_HEADERS' macro instead.)dnl
+AC_CONFIG_HEADERS($@))
+
+AC_DEFUN(AM_PROG_CC_STDC,
+AC_PROG_CC
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_DIAGNOSE(obsolete,
+'$0': this macro is obsolete.
+You should simply use the 'AC_PROG_CC' macro instead.
+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+but upon 'ac_cv_prog_cc_stdc'.))
+
+AC_DEFUN(AM_C_PROTOTYPES,
+         AC_FATAL(automatic de-ANSI-fication support has been removed))
+AU_DEFUN(fp_C_PROTOTYPES, AM_C_PROTOTYPES)
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN(_AM_MANGLE_OPTION,
 _AM_OPTION_m4_bpatsubst($1, ^a-zA-Z0-9_, _))
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN(_AM_SET_OPTION,
-m4_define(_AM_MANGLE_OPTION($1), 1))
+m4_define(_AM_MANGLE_OPTION($1), 1))
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN(_AM_SET_OPTIONS,
 m4_foreach_w(_AM_Option, $1, _AM_SET_OPTION(_AM_Option)))
@@ -9588,24 +10863,82 @@
 AC_DEFUN(_AM_IF_OPTION,
 m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN(_AM_PROG_CC_C_O,
+AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
+AC_REQUIRE_AUX_FILE(compile)dnl
+AC_LANG_PUSH(C)dnl
+AC_CACHE_CHECK(
+  whether $CC understands -c and -o together,
+  am_cv_prog_cc_c_o,
+  AC_LANG_CONFTEST(AC_LANG_PROGRAM())
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG($CC -c conftest.$ac_ext -o conftest2.$ac_objext) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i)
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP(C))
+
+# For backward compatibility.
+AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
+
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN(AM_RUN_LOG,
+{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); })
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN(AM_SANITY_CHECK,
 AC_MSG_CHECKING(whether build environment is sane)
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -9616,32 +10949,40 @@
 esac
 case $srcdir in
   *\\\"\#\$\&\'\`$am_lf\ \	*)
-    AC_MSG_ERROR(unsafe srcdir value: `$srcdir');;
+    AC_MSG_ERROR(unsafe srcdir value: '$srcdir');;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR(ls -t appears to fail.  Make sure there is not a broken
-alias in your environment)
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR(ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment)
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -9651,36 +10992,85 @@
    AC_MSG_ERROR(newly created file is older than distributed files!
 Check your system clock)
 fi
-AC_MSG_RESULT(yes))
+AC_MSG_RESULT(yes)
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  AC_MSG_CHECKING(that generated files are newer than configure)
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT(done))
+rm -f conftest.file
+)
 
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_SILENT_RULES(DEFAULT)
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN(AM_SILENT_RULES,
-AC_ARG_ENABLE(silent-rules,
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0'))
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if($1, yes, 0, 1);;
+AC_ARG_ENABLE(silent-rules, dnl
+AS_HELP_STRING(
+  --enable-silent-rules,
+  less verbose build output (undo: "make V=1"))
+AS_HELP_STRING(
+  --disable-silent-rules,
+  verbose build output (undo: "make V=0"))dnl
+)
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if($1, yes, 0, 1);;
 esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK(whether $am_make supports nested variables,
+   am_cv_make_support_nested_variables,
+   if AS_ECHO('TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit') | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi)
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST(AM_V)dnl
+AM_SUBST_NOTMAKE(AM_V)dnl
+AC_SUBST(AM_DEFAULT_V)dnl
+AM_SUBST_NOTMAKE(AM_DEFAULT_V)dnl
 AC_SUBST(AM_DEFAULT_VERBOSITY)dnl
 AM_BACKSLASH='\'
 AC_SUBST(AM_BACKSLASH)dnl
 _AM_SUBST_NOTMAKE(AM_BACKSLASH)dnl
 )
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9688,34 +11078,32 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN(AM_PROG_INSTALL_STRIP,
 AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL(STRIP, strip, :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST(INSTALL_STRIP_PROGRAM))
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -9723,24 +11111,22 @@
 AC_DEFUN(_AM_SUBST_NOTMAKE)
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN(AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($@))
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -9750,75 +11136,114 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN(_AM_PROG_TAR,
-# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG(AMTAR, tar)
-m4_if($1, v7,
-     am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -',
-     m4_case($1, ustar,, pax,,
-              m4_fatal(Unknown tar format))
-AC_MSG_CHECKING(how to create a $1 tar archive)
-# Loop over all known methods to create a tar archive until one works.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST(AMTAR, '$${TAR-tar}')
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if($1, ustar, plaintar) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG($_am_tar --version) && break
-    done
-    am__tar="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if($1, v7,
+  am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -',
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG(tardir=conftest.dir && eval $am__tar_ >conftest.tar)
+  m4_case($1,
+    ustar,
+     # The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING(whether UID '$am_uid' is supported by ustar format)
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT(yes)
+      else
+         AC_MSG_RESULT(no)
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING(whether GID '$am_gid' is supported by ustar format)
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT(yes)
+      else
+        AC_MSG_RESULT(no)
+        _am_tools=none
+      fi,
+
+  pax,
+    ,
+
+  m4_fatal(Unknown tar format))
+
+  AC_MSG_CHECKING(how to create a $1 tar archive)
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG($_am_tar --version) && break
+      done
+      am__tar="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG(tardir=conftest.dir && eval $am__tar_ >conftest.tar)
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG($am__untar <conftest.tar)
+      AM_RUN_LOG(cat conftest.dir/file)
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG($am__untar <conftest.tar)
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL(am_cv_prog_tar_$1, am_cv_prog_tar_$1=$_am_tool)
-AC_MSG_RESULT($am_cv_prog_tar_$1))
+  AC_CACHE_VAL(am_cv_prog_tar_$1, am_cv_prog_tar_$1=$_am_tool)
+  AC_MSG_RESULT($am_cv_prog_tar_$1))
+
 AC_SUBST(am__tar)
 AC_SUBST(am__untar)
 ) # _AM_PROG_TAR

imagination-3.4.tar.bz2/compile Added

@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /!/*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.oObBjJ)
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.cC++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.oO)
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile --help --version PROGRAM ARGS
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | */\\cl | cl.exe | */\\cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*\\/||; s|^a-zA-Z:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '/\\:.-' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|/\\:.-|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

imagination-3.0.tar.bz2/config.guess -> imagination-3.4.tar.bz2/config.guess Changed

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2018-02-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+#
+# Please send patches to <config-patches@gnu.org>.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -45,7 +39,7 @@
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -56,8 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2018 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."
@@ -114,9 +107,9 @@
 dummy=$tmp/dummy ;
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
+ ,,)    echo "int x;" > "$dummy.c" ;
 	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
@@ -139,12 +132,40 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "$UNAME_SYSTEM" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval "$set_cc_for_build"
+	cat <<-EOF > "$dummy.c"
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+	# If ldd exists, use it to detect musl libc.
+	if command -v ldd >/dev/null && \
+		ldd --version 2>&1 | grep -q ^musl
+	then
+	    LIBC=musl
+	fi
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -154,23 +175,33 @@
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    "/sbin/$sysctl" 2>/dev/null || \
+	    "/usr/sbin/$sysctl" 2>/dev/null || \
+	    echo unknown)`
+	case "$UNAME_MACHINE_ARCH" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	    earmv*)
+		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv0-9$.*$,\1,'`
+		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'`
+		machine="${arch}${endian}"-unknown
+		;;
+	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
+	# to ELF recently (or will in the future) and ABI.
+	case "$UNAME_MACHINE_ARCH" in
+	    earm*)
+		os=netbsdelf
+		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
+		eval "$set_cc_for_build"
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -180,7 +211,14 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
+		;;
+	esac
+	# Determine ABI tags.
+	case "$UNAME_MACHINE_ARCH" in
+	    earm*)
+		expr='s/^earmv0-9/-eabi/;s/eb$//'
+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
 		;;
 	esac
 	# The OS release
@@ -188,42 +226,62 @@
 	# thus, need a distinct triplet. However, they do not need
 	# kernel version information, so it can be replaced with a
 	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
+	case "$UNAME_VERSION" in
 	    Debian*)
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/-_.*/\./'`
+		release=`echo "$UNAME_RELEASE" | sed -e 's/-_.*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "$machine-${os}${release}${abi}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
 	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+	exit ;;
+    *:MidnightBSD:*:*)
+	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
 	exit ;;
     *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
 	exit ;;
     *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
 	exit ;;
     *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+	exit ;;
+    *:Sortix:*:*)
+	echo "$UNAME_MACHINE"-unknown-sortix
 	exit ;;
+    *:Redox:*:*)
+	echo "$UNAME_MACHINE"-unknown-redox
+	exit ;;
+    mips:OSF1:*.*)
+        echo mips-dec-osf1
+        exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -233,60 +291,54 @@
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^PVTX//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
+	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^PVTX//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit ;;
     *:AamigaOoSs:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
+	echo "$UNAME_MACHINE"-unknown-amigaos
 	exit ;;
     *:MmorphOoSs:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
+	echo "$UNAME_MACHINE"-unknown-morphos
 	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
@@ -295,12 +347,12 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
+	echo arm-acorn-riscix"$UNAME_RELEASE"
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -324,20 +376,39 @@
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`"
+	exit ;;
     sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
+	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
+	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`"
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux"$UNAME_RELEASE"
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
+	eval "$set_cc_for_build"
+	SUN_ARCH=i386
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if  "$CC_FOR_BUILD" != no_compiler_found ; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH=x86_64
+	    fi
+	fi
+	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
+	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
 	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
@@ -346,25 +417,25 @@
 		;;
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
 	exit ;;
     sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
+	echo m68k-sun-sunos"$UNAME_RELEASE"
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
+		echo m68k-sun-sunos"$UNAME_RELEASE"
 		;;
 	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
+		echo sparc-sun-sunos"$UNAME_RELEASE"
 		;;
 	esac
 	exit ;;
     aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
+	echo sparc-auspex-sunos"$UNAME_RELEASE"
 	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
@@ -375,44 +446,44 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint"$UNAME_RELEASE"
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint"$UNAME_RELEASE"
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint"$UNAME_RELEASE"
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint"$UNAME_RELEASE"
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint"$UNAME_RELEASE"
+	exit ;;
     m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
+	echo m68k-apple-machten"$UNAME_RELEASE"
 	exit ;;
     powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
+	echo powerpc-apple-machten"$UNAME_RELEASE"
 	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit ;;
     RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
+	echo mips-dec-ultrix"$UNAME_RELEASE"
 	exit ;;
     VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
+	echo vax-dec-ultrix"$UNAME_RELEASE"
 	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
+	echo clipper-intergraph-clix"$UNAME_RELEASE"
 	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	eval "$set_cc_for_build"
+	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv) {
@@ -421,23 +492,23 @@
 #endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv1); exit (0);
+	  printf ("mips-mips-riscos%ssysv\\n", argv1); exit (0);
 	#endif
 	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv1); exit (0);
+	  printf ("mips-mips-riscos%ssvr4\\n", argv1); exit (0);
 	#endif
 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv1); exit (0);
+	  printf ("mips-mips-riscos%sbsd\\n", argv1); exit (0);
 	#endif
 	#endif
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$0-9*$.*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$0-9*$.*/\1/p'` &&
+	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
 	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
+	echo mips-mips-riscos"$UNAME_RELEASE"
 	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
@@ -461,21 +532,21 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if  $UNAME_PROCESSOR = mc88100  ||  $UNAME_PROCESSOR = mc88110 
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if  "$UNAME_PROCESSOR" = mc88100  ||  "$UNAME_PROCESSOR" = mc88110 
 	then
-	    if  ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx  || \
-	        ${TARGET_BINARY_INTERFACE}x = x 
+	    if  "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx  || \
+	        "$TARGET_BINARY_INTERFACE"x = x 
 	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
+		echo m88k-dg-dgux"$UNAME_RELEASE"
 	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
 	    fi
 	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
+	    echo i586-dg-dgux"$UNAME_RELEASE"
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -490,7 +561,7 @@
 	echo m68k-tektronix-bsd
 	exit ;;
     *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
 	exit ;;
     ????????:AIX?:12.1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
@@ -502,14 +573,14 @@
 	if  -x /usr/bin/oslevel  ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
 	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
 	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
+		eval "$set_cc_for_build"
+		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
 		main()
@@ -520,7 +591,7 @@
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
 		then
 			echo "$SYSTEM_NAME"
 		else
@@ -532,28 +603,29 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:456)
+    *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
 	fi
-	if  -x /usr/bin/oslevel  ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if  -x /usr/bin/lslpp  ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/0-9*$/0/`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
 	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
 	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
 	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
 	echo romp-ibm-bsd4.4
 	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
 	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
@@ -568,67 +640,67 @@
 	echo m68k-hp-bsd4.4
 	exit ;;
     9000/34678??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/^.*.0B*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/34?? )         HP_ARCH=m68k ;;
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/^.*.0B*//'`
+	case "$UNAME_MACHINE" in
+	    9000/31?)            HP_ARCH=m68000 ;;
+	    9000/34??)         HP_ARCH=m68k ;;
 	    9000/6780-90-9)
 		if  -x /usr/bin/getconf ; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "$sc_cpu_version" in
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "$sc_kernel_bits" in
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
+			esac ;;
+		    esac
 		fi
-		if  "${HP_ARCH}" = "" ; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		if  "$HP_ARCH" = "" ; then
+		    eval "$set_cc_for_build"
+		    sed 's/^		//' << EOF > "$dummy.c"
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if  ${HP_ARCH} = "hppa2.0w" 
+	if  "$HP_ARCH" = hppa2.0w 
 	then
-	    eval $set_cc_for_build
+	    eval "$set_cc_for_build"
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -639,23 +711,23 @@
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
 	exit ;;
     ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/^.*.0B*//'`
-	echo ia64-hp-hpux${HPUX_REV}
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/^.*.0B*//'`
+	echo ia64-hp-hpux"$HPUX_REV"
 	exit ;;
     3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	eval "$set_cc_for_build"
+	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
 	main ()
@@ -680,11 +752,11 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
 		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
 	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:* )
+    9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:*)
 	echo hppa1.1-hp-bsd
 	exit ;;
     9000/8??:4.3bsd:*:*)
@@ -693,7 +765,7 @@
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit ;;
-    hp7??:OSF1:*:* | hp8?79:OSF1:*:* )
+    hp7??:OSF1:*:* | hp8?79:OSF1:*:*)
 	echo hppa1.1-hp-osf
 	exit ;;
     hp8??:OSF1:*:*)
@@ -701,9 +773,9 @@
 	exit ;;
     i*86:OSF1:*:*)
 	if  -x /usr/sbin/sysversion  ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	    echo "$UNAME_MACHINE"-unknown-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
+	    echo "$UNAME_MACHINE"-unknown-osf1
 	fi
 	exit ;;
     parisc*:Lites*:*:*)
@@ -711,325 +783,278 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
+	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
 	exit ;;
     CRAY*A-Z90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
 	| sed -e 's/CRAY.*$A-Z90$/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.^.*$/.X/'
 	exit ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
+	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
 	exit ;;
     CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
+	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
 	exit ;;
     CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
+	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
 	exit ;;
     *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
+	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
 	exit ;;
     F3001:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
 	exit ;;
     sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	echo sparc-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
     *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case "$UNAME_PROCESSOR" in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
+	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`"
 	exit ;;
     i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
+	echo "$UNAME_MACHINE"-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo "$UNAME_MACHINE"-pc-mingw64
 	exit ;;
     *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
+	echo "$UNAME_MACHINE"-pc-mingw32
 	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+    *:MSYS*:*)
+	echo "$UNAME_MACHINE"-pc-msys
 	exit ;;
     i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
+	echo "$UNAME_MACHINE"-pc-pw32
 	exit ;;
-    *:Interix*:3456*)
-    	case ${UNAME_MACHINE} in
+    *:Interix*:*)
+	case "$UNAME_MACHINE" in
 	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
+		echo i586-pc-interix"$UNAME_RELEASE"
 		exit ;;
-	    EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix"$UNAME_RELEASE"
 		exit ;;
 	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
+		echo ia64-unknown-interix"$UNAME_RELEASE"
 		exit ;;
 	esac ;;
-    34586:Windows_95:* | 34586:Windows_98:* | 34586:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
     i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
+	echo "$UNAME_MACHINE"-pc-uwin
 	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
     prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
+	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,-/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo "`echo "$UNAME_MACHINE"|sed -e 's,-/.*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^^/*/,,' | tr 'A-Z' 'a-z'``echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`-gnu
+	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^^/*/,,' | tr ":upper:" ":lower:"``echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`-$LIBC"
 	exit ;;
     i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
+	echo "$UNAME_MACHINE"-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     arm*:Linux:*:*)
-	eval $set_cc_for_build
+	eval "$set_cc_for_build"
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+	    else
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+	exit ;;
+    e2k:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    hexagon:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    i*86:Linux:*:*)
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    k1om:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval "$set_cc_for_build"
+	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
 	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+    mips64el:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-"$LIBC"
 	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-"$LIBC"
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-"$LIBC"
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu^a-z*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+	  *)    echo hppa-unknown-linux-"$LIBC" ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-"$LIBC"
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-"$LIBC"
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-"$LIBC"
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-"$LIBC"
+	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    tile*:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	if objdump -f /bin/sh | grep -q elf32-x86-64; then
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+	else
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	fi
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/ 	 	*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1037,54 +1062,54 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
 	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
+	echo "$UNAME_MACHINE"-pc-os2-emx
 	exit ;;
     i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
+	echo "$UNAME_MACHINE"-unknown-stop
 	exit ;;
     i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
+	echo "$UNAME_MACHINE"-unknown-atheos
 	exit ;;
     i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
+	echo "$UNAME_MACHINE"-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.02*:*)
+	echo i386-unknown-lynxos"$UNAME_RELEASE"
 	exit ;;
     i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	echo "$UNAME_MACHINE"-pc-msdosdjgpp
 	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+    i*86:*:4.*:*)
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
 	fi
 	exit ;;
     i*86:*:5:678*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
 	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1094,17 +1119,20 @@
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
 	else
-		echo ${UNAME_MACHINE}-pc-sysv32
+		echo "$UNAME_MACHINE"-pc-sysv32
 	fi
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configure will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1113,9 +1141,9 @@
 	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
 	fi
 	exit ;;
     mini*:CTIX:SYS*5:*)
@@ -1135,29 +1163,39 @@
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/^ * ^ * $0-90-9$.*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     334??:*:4.0:* | 334??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/^ * ^ * $0-90-9$.*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	echo m68k-unknown-lynxos"$UNAME_RELEASE"
 	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit ;;
     TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	echo sparc-unknown-lynxos"$UNAME_RELEASE"
 	exit ;;
     rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.02*:*)
+	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
 	exit ;;
     SMBES:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
+	echo mips-dde-sysv"$UNAME_RELEASE"
 	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
@@ -1168,15 +1206,15 @@
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
+		echo "$UNAME_MACHINE"-sni-sysv4
 	else
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1188,25 +1226,25 @@
 	exit ;;
     i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
+	echo "$UNAME_MACHINE"-stratus-vos
 	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
 	exit ;;
     mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
+	echo m68k-apple-aux"$UNAME_RELEASE"
 	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
 	exit ;;
     R34000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if  -d /usr/nec ; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv"$UNAME_RELEASE"
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv"$UNAME_RELEASE"
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1216,53 +1254,100 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
+	echo sx4-nec-superux"$UNAME_RELEASE"
 	exit ;;
     SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
+	echo sx5-nec-superux"$UNAME_RELEASE"
 	exit ;;
     SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
+	echo sx6-nec-superux"$UNAME_RELEASE"
 	exit ;;
     SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
+	echo sx7-nec-superux"$UNAME_RELEASE"
 	exit ;;
     SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
+	echo sx8-nec-superux"$UNAME_RELEASE"
 	exit ;;
     SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
+	echo sx8r-nec-superux"$UNAME_RELEASE"
+	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux"$UNAME_RELEASE"
 	exit ;;
     Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
 	exit ;;
     *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	eval "$set_cc_for_build"
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+	    if  "$CC_FOR_BUILD" != no_compiler_found ; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_PPC >/dev/null
+		then
+		    UNAME_PROCESSOR=powerpc
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
 	exit ;;
     *:procnto*:*:* | *:QNX:0123456789*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
 	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
+    NEO-*:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
+    NSR-*:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
+    NSV-*:NONSTOP_KERNEL:*:*)
+	echo nsv-tandem-nsk"$UNAME_RELEASE"
 	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
+    NSX-*:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk"$UNAME_RELEASE"
 	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
@@ -1271,18 +1356,18 @@
 	echo bs2000-siemens-sysv
 	exit ;;
     DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
 	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
 	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
+	echo "$UNAME_MACHINE"-unknown-plan9
 	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
@@ -1303,14 +1388,14 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux"$UNAME_RELEASE"
 	exit ;;
     *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`
+	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`"
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "$UNAME_MACHINE" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
 	    V*) echo vax-dec-vms ; exit ;;
@@ -1319,179 +1404,48 @@
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
 	exit ;;
     i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
+	echo "$UNAME_MACHINE"-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo "$UNAME_MACHINE"-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo "$UNAME_MACHINE"-unknown-esx
+	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
 	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+echo "$0: unable to guess system type" >&2
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach $0-9*$.*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+    mips:Linux | mips64:Linux)
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
 
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
 EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if  -x /usr/convex/getsysinfo 
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
+	;;
+esac
 
 cat >&2 <<EOF
-$0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
@@ -1510,16 +1464,16 @@
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
 EOF
 
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

imagination-3.0.tar.bz2/config.sub -> imagination-3.4.tar.bz2/config.sub Changed

imagination-3.0.tar.bz2/configure -> imagination-3.4.tar.bz2/configure Changed

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for imagination 3.0.
+# Generated by GNU Autoconf 2.69 for imagination 3.4.
 #
-# Report bugs to <http://sourceforge.net/tracker/?group_id=244319&atid=1125540>.
+# Report bugs to <https://sourceforge.net/p/imagination/bugs/>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +89,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *\\/* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -135,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -168,12 +192,21 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -213,14 +246,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -231,11 +275,10 @@
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: http://sourceforge.net/tracker/?group_id=244319&atid=1125540
-$0: about your system, including any error possibly output
-$0: before this message. Then install a modern shell, or
-$0: manually run the script under such a shell if you do
-$0: have one."
+$0: https://sourceforge.net/p/imagination/bugs/ about your
+$0: system, including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -324,6 +367,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -445,6 +496,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $0, causing all sort of problems
   # (the dirname of $0 is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -479,16 +534,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -500,28 +555,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
@@ -529,155 +564,8 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
 
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -702,9 +590,9 @@
 # Identity of this package.
 PACKAGE_NAME='imagination'
 PACKAGE_TARNAME='imagination'
-PACKAGE_VERSION='3.0'
-PACKAGE_STRING='imagination 3.0'
-PACKAGE_BUGREPORT='http://sourceforge.net/tracker/?group_id=244319&atid=1125540'
+PACKAGE_VERSION='3.4'
+PACKAGE_STRING='imagination 3.4'
+PACKAGE_BUGREPORT='https://sourceforge.net/p/imagination/bugs/'
 PACKAGE_URL=''
 
 ac_unique_file="src/imagination.h"
@@ -756,9 +644,11 @@
 INTLLIBS
 INSTOBJEXT
 GMOFILES
+DATADIRNAME
 CATOBJEXT
 CATALOGS
 MSGFMT_OPTS
+INTL_MACOSX_LIBS
 ENABLE_XSLTPROC_FALSE
 ENABLE_XSLTPROC_TRUE
 XSLTPROC
@@ -772,14 +662,17 @@
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
 RANLIB
+ac_ct_AR
 AR
+DLLTOOL
 OBJDUMP
 NM
 ac_ct_DUMPBIN
@@ -796,7 +689,6 @@
 build_cpu
 build
 LIBTOOL
-DATADIRNAME
 ALL_LINGUAS
 INTLTOOL_PERL
 GMSGFMT
@@ -822,6 +714,12 @@
 INTLTOOL_KEYS_RULE
 INTLTOOL_DIRECTORY_RULE
 INTLTOOL_DESKTOP_RULE
+intltool__v_merge_options_0
+intltool__v_merge_options_
+INTLTOOL_V_MERGE_OPTIONS
+INTLTOOL__v_MERGE_0
+INTLTOOL__v_MERGE_
+INTLTOOL_V_MERGE
 INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
@@ -833,6 +731,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -851,6 +750,8 @@
 MAINTAINER_MODE_TRUE
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -893,6 +794,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -923,7 +825,9 @@
 enable_shared
 with_pic
 enable_fast_install
+with_aix_soname
 with_gnu_ld
+with_sysroot
 enable_libtool_lock
 '
       ac_precious_vars='build_alias
@@ -935,6 +839,7 @@
 LIBS
 CPPFLAGS
 CPP
+LT_SYS_LIBRARY_PATH
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -982,6 +887,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1234,6 +1140,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1348,7 +1263,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1371,7 +1286,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1399,8 +1314,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1486,7 +1399,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures imagination 3.0 to adapt to many kinds of systems.
+\`configure' configures imagination 3.4 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1526,6 +1439,7 @@
   --sysconfdir=DIR        read-only single-machine data PREFIX/etc
   --sharedstatedir=DIR    modifiable architecture-independent data PREFIX/com
   --localstatedir=DIR     modifiable single-machine data PREFIX/var
+  --runstatedir=DIR       modifiable per-process data LOCALSTATEDIR/run
   --libdir=DIR            object code libraries EPREFIX/lib
   --includedir=DIR        C header files PREFIX/include
   --oldincludedir=DIR     C header files for non-gcc /usr/include
@@ -1556,7 +1470,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of imagination 3.0:";;
+     short | recursive ) echo "Configuration of imagination 3.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1564,12 +1478,15 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE=ARG  include FEATURE ARG=yes
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --disable-nls           do not use Native Language Support
   --enable-static=PKGS  build static libraries default=no
   --enable-shared=PKGS  build shared libraries default=yes
@@ -1580,9 +1497,14 @@
 Optional Packages:
   --with-PACKAGE=ARG    use PACKAGE ARG=yes
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects default=use
+  --with-pic=PKGS       try to use only PIC/non-PIC objects default=use
                           both
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, default=aix.
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-sysroot=DIR    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
 
 Some influential environment variables:
   CC          C compiler command
@@ -1593,6 +1515,8 @@
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -1612,7 +1536,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <http://sourceforge.net/tracker/?group_id=244319&atid=1125540>.
+Report bugs to <https://sourceforge.net/p/imagination/bugs/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1675,10 +1599,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-imagination configure 3.0
-generated by GNU Autoconf 2.67
+imagination configure 3.4
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1722,7 +1646,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1754,7 +1678,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1768,7 +1692,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1805,7 +1729,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1847,11 +1771,42 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -1860,7 +1815,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1915,41 +1870,10 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -1958,10 +1882,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2020,15 +1944,15 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## --------------------------------------------------------------------------- ##
-## Report this to http://sourceforge.net/tracker/?group_id=244319&atid=1125540 ##
-## --------------------------------------------------------------------------- ##"
+( $as_echo "## ---------------------------------------------------------- ##
+## Report this to https://sourceforge.net/p/imagination/bugs/ ##
+## ---------------------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2037,15 +1961,15 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by imagination $as_me 3.0, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+It was created by imagination $as_me 3.4, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2303,7 +2227,7 @@
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2393,7 +2317,7 @@
 
 
 
-am__api_version='1.11'
+am__api_version='1.15'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2441,7 +2365,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2461,7 +2385,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2519,45 +2443,50 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *\\\"\#\$\&\'\`$am_lf*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *\\\"\#\$\&\'\`$am_lf\ \	*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2569,6 +2498,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2579,8 +2518,8 @@
 ac_script='s/\\$/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2591,15 +2530,15 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2608,17 +2547,17 @@
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2630,7 +2569,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2658,7 +2597,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2670,7 +2609,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2711,7 +2650,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2721,7 +2660,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2750,19 +2689,13 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  \\/$* | ?:\\/*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2774,7 +2707,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2802,7 +2735,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2838,6 +2771,45 @@
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -2860,7 +2832,7 @@
 
 # Define the identity of the package.
  PACKAGE='imagination'
- VERSION='3.0'
+ VERSION='3.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2888,17 +2860,70 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 
 # Enable silent rules if supported
@@ -2907,11 +2932,38 @@
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 
@@ -2958,7 +3010,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -2991,6 +3043,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3011,7 +3064,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3023,7 +3076,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3051,7 +3104,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3063,7 +3116,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3104,7 +3157,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3116,7 +3169,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3144,7 +3197,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3157,7 +3210,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3203,7 +3256,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3215,7 +3268,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3247,7 +3300,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3259,7 +3312,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3302,7 +3355,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3417,7 +3470,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3460,7 +3513,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3519,7 +3572,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3530,7 +3583,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3571,7 +3624,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3581,7 +3634,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3618,7 +3671,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3696,7 +3749,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3705,8 +3758,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3791,19 +3843,79 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3837,16 +3949,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -3855,16 +3967,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -3921,7 +4033,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -3955,11 +4067,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then :
+  if ${ac_cv_search_strerror+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
 
 else
   ac_cv_search_strerror=no
@@ -3985,7 +4097,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3997,7 +4109,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4025,7 +4137,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4037,7 +4149,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4078,7 +4190,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4090,7 +4202,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4118,7 +4230,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4131,7 +4243,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4177,7 +4289,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4189,7 +4301,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4221,7 +4333,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4233,7 +4345,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4276,7 +4388,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4305,7 +4417,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4342,7 +4454,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4420,7 +4532,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4429,8 +4541,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4515,19 +4626,79 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4561,16 +4732,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4579,16 +4750,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4652,7 +4823,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4664,7 +4835,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4692,7 +4863,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4704,7 +4875,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4745,7 +4916,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4757,7 +4928,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4785,7 +4956,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4798,7 +4969,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4844,7 +5015,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4856,7 +5027,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4888,7 +5059,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4900,7 +5071,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4943,7 +5114,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4972,7 +5143,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5009,7 +5180,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -5087,7 +5258,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -5096,8 +5267,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5182,19 +5352,79 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -5228,16 +5458,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -5246,16 +5476,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -5309,7 +5539,6 @@
 fi
 
 
-
 am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 
 ac_ext=c
@@ -5324,7 +5553,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -5440,7 +5669,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5452,7 +5681,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -5466,7 +5695,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -5515,7 +5744,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5532,7 +5761,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5582,7 +5811,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5729,14 +5958,12 @@
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n ""; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5
 $as_echo_n "checking for intltool >= ... " >&6; }
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
@@ -5747,7 +5974,7 @@
 set dummy intltool-update; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_UPDATE in
@@ -5761,7 +5988,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5787,7 +6014,7 @@
 set dummy intltool-merge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_MERGE in
@@ -5801,7 +6028,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5827,7 +6054,7 @@
 set dummy intltool-extract; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_EXTRACT in
@@ -5841,7 +6068,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5867,25 +6094,48 @@
     as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
+
+
+
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+
+
+
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
 
 
 
@@ -5988,7 +6238,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $XGETTEXT in
@@ -6002,7 +6252,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6028,7 +6278,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGMERGE in
@@ -6042,7 +6292,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6068,7 +6318,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -6082,7 +6332,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6108,7 +6358,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -6122,7 +6372,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6159,7 +6409,7 @@
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_PERL in
@@ -6173,7 +6423,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6204,7 +6454,7 @@
 if test $? -ne 0; then
    as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
@@ -6222,46 +6472,67 @@
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrtf" >&5
+$as_echo_n "checking for library containing sqrtf... " >&6; }
+if ${ac_cv_search_sqrtf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqrtf ();
 int
 main ()
 {
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
+return sqrtf ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  DATADIRNAME=share
-else
-  case $host in
-    *-*-solaris*)
-                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_sqrtf=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext
+  if ${ac_cv_search_sqrtf+:} false; then :
+  break
 fi
+done
+if ${ac_cv_search_sqrtf+:} false; then :
 
+else
+  ac_cv_search_sqrtf=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrtf" >&5
+$as_echo "$ac_cv_search_sqrtf" >&6; }
+ac_res=$ac_cv_search_sqrtf
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-
-
+else
+  as_fn_error $? "Unable to find math library" "$LINENO" 5
+fi
 
 
 # for plugins
@@ -6274,14 +6545,14 @@
     *)
      enable_static=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -6304,8 +6575,8 @@
 
 
 
-macro_version='2.2.6b'
-macro_revision='1.3017'
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
@@ -6319,7 +6590,7 @@
 
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -6327,7 +6598,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
@@ -6343,7 +6614,7 @@
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -6361,7 +6632,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
@@ -6376,7 +6647,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -6392,9 +6663,78 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$"`$\\$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$"`\\$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case $ECHO in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -6414,7 +6754,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -6476,7 +6816,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+if ${ac_cv_path_FGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -6493,7 +6833,7 @@
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -6563,19 +6903,19 @@
 
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
   with_gnu_ld=no
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
+    # gcc leaves a trailing carriage return, which upsets mingw
     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -6589,7 +6929,7 @@
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
-      test -z "$LD" && LD="$ac_prog"
+      test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -6600,43 +6940,43 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD=$ac_dir/$ac_prog
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+	test no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
+  IFS=$lt_save_ifs
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -6647,7 +6987,7 @@
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -6674,38 +7014,43 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
+if ${lt_cv_path_NM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  lt_cv_path_NM=$NM
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
+  lt_nm_to_check=${ac_tool_prefix}nm
   if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break
+	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break
+	    break 2
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -6716,25 +7061,28 @@
 	esac
       fi
     done
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -6746,7 +7094,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6772,13 +7120,13 @@
 fi
 if test -z "$DUMPBIN"; then
   ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  for ac_prog in dumpbin "link -dump"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -6790,7 +7138,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6827,9 +7175,18 @@
   fi
 fi
 
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
 
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
@@ -6841,18 +7198,18 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
+if ${lt_cv_nm_interface+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6849: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6852: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6855: output\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6865,11 +7222,11 @@
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+if ${lt_cv_sys_max_cmd_len+:} false; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
-  teststring="ABCD"
+  teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
@@ -6898,13 +7255,18 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6923,6 +7285,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6949,22 +7316,23 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
       # Make teststring a little bigger before we do anything with it.
       # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
+      for i in 1 2 3 4 5 6 7 8; do
         teststring=$teststring$teststring
       done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
@@ -6982,7 +7350,7 @@
 
 fi
 
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
@@ -7000,30 +7368,6 @@
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
@@ -7055,9 +7399,83 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
+if ${lt_cv_ld_reload_flag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
@@ -7071,9 +7489,14 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -7093,7 +7516,7 @@
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -7105,7 +7528,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7133,7 +7556,7 @@
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -7145,7 +7568,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7192,7 +7615,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
+if ${lt_cv_deplibs_check_method+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -7201,13 +7624,13 @@
 # Need to set the preceding variable on all platforms that support
 # interlibrary dependencies.
 # 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic regex' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
 
 case $host_os in
 aix4-9*)
@@ -7238,12 +7661,13 @@
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -7269,7 +7693,7 @@
   fi
   ;;
 
-gnu*)
+haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -7281,11 +7705,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - PA-RISC 0-9.0-9'
+    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF -0-90-9)(-bit)?( LMSB)? shared object( file)?, -* PA-RISC 0-9\.0-9'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9.0-9) shared library'
+    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9\.0-9) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -7306,8 +7730,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -7329,8 +7753,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
     lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
@@ -7383,11 +7807,29 @@
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/\1\/\1\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -7403,12 +7845,165 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -7420,8 +8015,8 @@
   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_AR="${ac_tool_prefix}ar"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7441,14 +8036,18 @@
 fi
 
 
+    test -n "$AR" && break
+  done
 fi
-if test -z "$ac_cv_prog_AR"; then
+if test -z "$AR"; then
   ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -7460,8 +8059,8 @@
   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_AR="ar"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7480,6 +8079,10 @@
 $as_echo "no" >&6; }
 fi
 
+
+  test -n "$ac_ct_AR" && break
+done
+
   if test "x$ac_ct_AR" = x; then
     AR="false"
   else
@@ -7491,12 +8094,13 @@
 esac
     AR=$ac_ct_AR
   fi
-else
-  AR="$ac_cv_prog_AR"
 fi
 
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
 
 
 
@@ -7505,6 +8109,61 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
 
 
 
@@ -7513,7 +8172,7 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -7525,7 +8184,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7553,7 +8212,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -7565,7 +8224,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7612,7 +8271,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -7624,7 +8283,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7652,7 +8311,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -7664,7 +8323,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7713,16 +8372,28 @@
 
 if test -n "$RANLIB"; then
   case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
 
 
 
@@ -7769,7 +8440,7 @@
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -7791,7 +8462,7 @@
   symcode='ABCDGISTW'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='ABCDEGRST'
   fi
   ;;
@@ -7824,14 +8495,44 @@
   symcode='ABCDGIRSTW' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* $.*$$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* $lib.*$$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* $.*$$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* $.*$$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $^ *$ $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $^ *$$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $^ *$ $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $lib^ *$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $^ *$ $^ *$$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* $lib.*$$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -7849,24 +8550,29 @@
 
   # Write the raw and C identifiers.
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn2,2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
 "     {if(hidesection) next};"\
-"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a2, s)};"\
-"     s1~/^@?/{print s1, s1; next};"\
-"     s1~prfx {split(s1,t,\"@\"); print t1, substr(t1,length(prfx))}"\
+"     {f=\"D\"}; \$ 0~/.*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a2,s)};"\
+"     s1~/^@?/{print f,s1,s1; next};"\
+"     s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -7892,8 +8598,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -7908,6 +8614,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -7919,7 +8637,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -7927,7 +8645,7 @@
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
@@ -7945,19 +8663,19 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -7974,7 +8692,7 @@
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
+  if test yes = "$pipe_works"; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
@@ -7994,6 +8712,35 @@
 $as_echo "ok" >&6; }
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '@FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -8008,25 +8755,136 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
 
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  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_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
 
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
 
 
 
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *\\/compile | ccache | *\\/ccache ) ;;
+        distcc | *\\/distcc | purify | *\\/purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case $host in
 ia64-*-hpux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -8035,24 +8893,25 @@
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
-	HPUX_IA64_MODE="32"
+	HPUX_IA64_MODE=32
 	;;
       *ELF-64*)
-	HPUX_IA64_MODE="64"
+	HPUX_IA64_MODE=64
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 8049 "configure"' > conftest.$ac_ext
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
@@ -8081,9 +8940,50 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -8097,9 +8997,19 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -8118,7 +9028,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -8136,11 +9049,11 @@
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
+  SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
+if ${lt_cv_cc_needs_belf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -8176,13 +9089,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+  if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
+    CFLAGS=$SAVE_CFLAGS
   fi
   ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -8192,7 +9106,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -8206,7 +9133,124 @@
   ;;
 esac
 
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
 
 
   case $host_os in
@@ -8216,7 +9260,7 @@
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -8228,7 +9272,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8256,7 +9300,7 @@
 set dummy dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -8268,7 +9312,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8308,7 +9352,7 @@
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_NMEDIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -8320,7 +9364,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8348,7 +9392,7 @@
 set dummy nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -8360,7 +9404,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8400,7 +9444,7 @@
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
+if ${ac_cv_prog_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -8412,7 +9456,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8440,7 +9484,7 @@
 set dummy lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -8452,7 +9496,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8492,7 +9536,7 @@
 set dummy ${ac_tool_prefix}otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
+if ${ac_cv_prog_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -8504,7 +9548,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8532,7 +9576,7 @@
 set dummy otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -8544,7 +9588,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8584,7 +9628,7 @@
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -8596,7 +9640,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8624,7 +9668,7 @@
 set dummy otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -8636,7 +9680,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8699,11 +9743,11 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+if ${lt_cv_apple_cc_single_mod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
+      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
@@ -8715,7 +9759,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8726,9 +9776,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
@@ -8753,39 +9804,74 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.012)
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # 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,*-darwin91*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.012*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	  _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' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+    if test yes = "$lt_cv_apple_cc_single_mod"; 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'
+    if test yes = "$lt_cv_ld_exported_symbols_list"; 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}'
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -8793,6 +9879,41 @@
     ;;
   esac
 
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR:DIR:"
+#       string "DIR DIR" will be prepended to VARIABLE
+# ":DIR:DIR"
+#       string "DIR DIR" will be appended to VARIABLE
+# "DIRP:DIRP::DIRA:DIRA"
+#       string "DIRP DIRP" will be prepended to VARIABLE and string
+#       "DIRA DIRA" will be appended to VARIABLE
+# "DIR:DIR"
+#       VARIABLE will be replaced by "DIR DIR"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
@@ -8814,7 +9935,7 @@
 do :
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
@@ -8825,6 +9946,8 @@
 
 
 
+
+
 # Set options
 
 
@@ -8844,14 +9967,14 @@
     *)
       enable_shared=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -8870,14 +9993,27 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
 else
   pic_mode=default
 fi
 
 
-test -z "$pic_mode" && pic_mode=default
-
 
 
 
@@ -8893,14 +10029,14 @@
     *)
       enable_fast_install=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -8914,11 +10050,63 @@
 
 
 
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix5-9*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
 
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8947,6 +10135,11 @@
 
 
 
+
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8962,13 +10155,13 @@
 
 
 
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
+if ${lt_cv_objdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -8996,60 +10189,30 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
   # reason, if we set the COLLECT_NAMES environment variable, the problems
   # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$"`$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
@@ -9058,15 +10221,8 @@
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *\\/compile | ccache | *\\/ccache ) ;;
-    distcc | *\\/distcc | purify | *\\/purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
@@ -9076,27 +10232,27 @@
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 \\/* |  ?:\\/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
@@ -9119,13 +10275,13 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -9142,27 +10298,27 @@
   if test -n "$ac_tool_prefix"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 \\/* |  ?:\\/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
@@ -9185,13 +10341,13 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -9212,7 +10368,7 @@
 
 # Use C for the default configuration in the libtool script
 
-lt_save_CC="$CC"
+lt_save_CC=$CC
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9270,18 +10426,23 @@
 
 lt_prog_compiler_no_builtin_flag=
 
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -9291,15 +10452,15 @@
    -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:9294: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9298: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
@@ -9311,7 +10472,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 else
     :
@@ -9328,20 +10489,19 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; then
     lt_prog_compiler_wl='-Wl,'
     lt_prog_compiler_static='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       fi
+      lt_prog_compiler_pic='-fPIC'
       ;;
 
     amigaos*)
@@ -9352,8 +10512,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -9369,6 +10529,11 @@
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -9377,6 +10542,12 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -9419,12 +10590,21 @@
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
     aix*)
       lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
@@ -9432,10 +10612,29 @@
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # 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='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -9451,7 +10650,7 @@
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      lt_prog_compiler_static='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -9460,9 +10659,9 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
@@ -9481,7 +10680,19 @@
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -9493,25 +10704,40 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
+        *Intel*\ CF*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
 	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
 	  ;;
 	esac
 	;;
@@ -9543,7 +10769,7 @@
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -9563,7 +10789,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	lt_prog_compiler_pic='-Kconform_pic'
 	lt_prog_compiler_static='-Bstatic'
       fi
@@ -9592,7 +10818,7 @@
   fi
 
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic=
     ;;
@@ -9600,13 +10826,17 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
@@ -9614,13 +10844,13 @@
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -9630,15 +10860,15 @@
    -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:9633: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9637: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
@@ -9650,7 +10880,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -9667,17 +10897,22 @@
 
 
 
+
+
+
+
+
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -9686,7 +10921,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -9696,13 +10931,13 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
 else
     lt_prog_compiler_static=
@@ -9716,7 +10951,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9735,16 +10970,16 @@
    -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:9738: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9742: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -9771,7 +11006,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9790,16 +11025,16 @@
    -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:9793: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9797: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -9822,8 +11057,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -9835,9 +11070,9 @@
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -9865,7 +11100,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9881,9 +11115,9 @@
   # included in the symbol list
   include_expsyms=
   # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
+  # 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__FID_.*'
   # 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
@@ -9898,7 +11132,7 @@
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -9906,33 +11140,59 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     link_all_deplibs=no
     ;;
   esac
 
   ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
+	  *\ $GNU\ Binutils$\ 2.2-9*) ;;
+	  *\ $GNU\ Binutils$\ 3-9*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    wlarc='$wl'
 
     # Set some defaults for GNU ld with shared library support. These
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -9945,15 +11205,16 @@
     case $host_os in
     aix3-9*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -9963,7 +11224,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -9979,7 +11240,7 @@
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9989,61 +11250,97 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^	 *//'\''     -e '\''/^$;.*$*$/d'\''     -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
     interix3-9*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
+      if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -10054,39 +11351,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xlcC*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xlcC* | bgxlcC* | mpixlcC*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
-        if test "x$supports_anon_versioning" = xyes; then
+        if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+            cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
-	xlf*)
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+              cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -10100,8 +11405,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -10119,8 +11424,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -10132,7 +11437,7 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -10147,9 +11452,9 @@
 	  # DT_RUNPATH tag from executables and libraries.  But doing so
 	  # requires that you compile everything twice, which is a pain.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    ld_shlibs=no
 	  fi
@@ -10166,15 +11471,15 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs" = no; then
+    if test no = "$ld_shlibs"; then
       runpath_var=
       hardcode_libdir_flag_spec=
       export_dynamic_flag_spec=
@@ -10190,7 +11495,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct=unsupported
@@ -10198,32 +11503,57 @@
       ;;
 
     aix4-9*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
-	no_entry_flag=""
+	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.23|aix4.23.*|aix5-9*)
 	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -10242,13 +11572,21 @@
       hardcode_direct_absolute=yes
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
 
-      if test "$GCC" = yes; then
+      if test yes = "$GCC"; then
 	case $host_os in aix4.012|aix4.012.*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -10267,36 +11605,48 @@
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
-	link_all_deplibs=no
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      export_dynamic_flag_spec='${wl}-bexpall'
+      export_dynamic_flag_spec='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10309,34 +11659,47 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *$.*$$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$^ *$ *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
 
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10349,33 +11712,57 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *$.*$$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$^ *$ *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
 
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -10384,7 +11771,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -10404,20 +11791,65 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^	 *//'\''     -e '\''/^$;.*$*$/d'\''     -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -10427,19 +11859,24 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
   link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
+  allow_undefined_flag=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "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}"
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
   else
   ld_shlibs=no
@@ -10453,10 +11890,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10469,7 +11902,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10478,41 +11911,40 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
       ;;
 
     hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_direct=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
+      export_dynamic_flag_spec='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
+	export_dynamic_flag_spec='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L=yes
@@ -10520,33 +11952,72 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 
 	case $host_cpu in
@@ -10557,7 +12028,7 @@
 	*)
 	  hardcode_direct=yes
 	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
+	  export_dynamic_flag_spec='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -10568,35 +12039,59 @@
       ;;
 
     irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo(void) {}
+int foo (void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+	link_all_deplibs=no
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       inherit_rpath=yes
       link_all_deplibs=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -10611,7 +12106,7 @@
     newsos6)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_shlibpath_var=no
       ;;
@@ -10619,27 +12114,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	hardcode_direct=yes
 	hardcode_shlibpath_var=no
 	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
 	else
-	  case $host_os in
-	   openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	fi
       else
 	ld_shlibs=no
@@ -10650,33 +12137,53 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10687,24 +12194,24 @@
 
     solaris*)
       no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -10714,11 +12221,11 @@
       solaris2.0-5 | solaris2.0-5.*) ;;
       *)
 	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
 	fi
@@ -10728,10 +12235,10 @@
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -10780,43 +12287,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
-      no_undefined_flag='${wl}-z,text'
+      no_undefined_flag='$wl-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
+      # Note: We CANNOT use -z defs as we might desire, because we do not
       # link with -lc, and that would cause any symbols used from libc to
       # always be unresolved, which means just about no library would
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
+      export_dynamic_flag_spec='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -10831,10 +12338,10 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	export_dynamic_flag_spec='$wl-Blargedynsym'
 	;;
       esac
     fi
@@ -10842,7 +12349,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
 
@@ -10868,7 +12375,7 @@
   # Assume -lc should be added
   archive_cmds_need_lc=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -10879,44 +12386,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
   fi
@@ -11074,52 +12587,61 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
   case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
+    mingw* | cegcc*) lt_sed_strip_eq='s|=$A-Za-z:$|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # and add multilib dir if necessary...
   lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
       test -d "$lt_sys_path" && \
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
   for (lt_i = NF; lt_i > 0; lt_i--) {
     if ($lt_i != "" && $lt_i != ".") {
       if ($lt_i == "..") {
         lt_count++;
       } else {
         if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
+          lt_foo = "/" $lt_i lt_foo;
         } else {
           lt_count--;
         }
@@ -11129,14 +12651,20 @@
   if (lt_foo != "") { lt_freqlt_foo++; }
   if (lt_freqlt_foo == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/$A-Za-z:$|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -11153,56 +12681,108 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix4-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.01 | aix4.01.*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -11212,27 +12792,27 @@
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
 bsdi45*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -11244,16 +12824,17 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
@@ -11269,37 +12850,84 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';c-zC-Z:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
+        # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
       ;;
     esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext} $libname.lib'
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -11309,8 +12937,8 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -11320,18 +12948,14 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11339,25 +12963,26 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd123*) objformat=aout ;;
+    freebsd23.*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.01* | freebsdelf3.01*)
@@ -11376,13 +13001,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -11399,14 +13027,15 @@
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -11414,8 +13043,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
@@ -11424,20 +13053,22 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix3-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -11448,16 +13079,16 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
@@ -11476,8 +13107,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
@@ -11486,22 +13117,47 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11514,22 +13170,31 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -11559,12 +13224,12 @@
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -11573,8 +13238,8 @@
   ;;
 
 newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
@@ -11583,58 +13248,68 @@
   version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.89 | openbsd2.89.*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -11642,11 +13317,11 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -11656,20 +13331,20 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
@@ -11690,24 +13365,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -11722,19 +13397,19 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -11744,20 +13419,40 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -11849,15 +13544,15 @@
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
    test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
+   test yes = "$hardcode_automatic"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
+  if test no != "$hardcode_direct" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
   else
@@ -11872,12 +13567,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -11887,7 +13582,7 @@
 
 
 
-  if test "x$enable_dlopen" != xyes; then
+  if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -11897,26 +13592,26 @@
 
   case $host_os in
   beos*)
-    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen=load_add_on
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ;;
 
   mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
-    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
-  # if libdl is installed we need to link against it
+    # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11950,11 +13645,11 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
 
-    lt_cv_dlopen="dyld"
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
 
@@ -11962,14 +13657,22 @@
 
     ;;
 
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12003,16 +13706,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12046,12 +13749,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12085,12 +13788,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12124,8 +13827,8 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
 
@@ -12146,35 +13849,35 @@
     ;;
   esac
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
+  if test no = "$lt_cv_dlopen"; then
     enable_dlopen=no
+  else
+    enable_dlopen=yes
   fi
 
   case $lt_cv_dlopen in
   dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
-    save_LDFLAGS="$LDFLAGS"
+    save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-    save_LIBS="$LIBS"
+    save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
+if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12177 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12215,7 +13918,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -12224,7 +13933,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -12237,7 +13950,7 @@
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -12257,20 +13970,20 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
+    if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
+if ${lt_cv_dlopen_self_static+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12273 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12311,7 +14024,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -12320,7 +14039,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -12333,7 +14056,7 @@
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -12354,9 +14077,9 @@
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
     ;;
   esac
 
@@ -12400,7 +14123,7 @@
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
   darwin*)
-    if test -n "$STRIP" ; then
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -12428,7 +14151,7 @@
 
 
 
-  # Report which library types will actually be built
+  # Report what library types will actually be built
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -12436,13 +14159,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
+  test no = "$can_build_shared" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
   # are all built from PIC.
   case $host_os in
   aix3*)
-    test "$enable_shared" = yes && enable_static=no
+    test yes = "$enable_shared" && enable_static=no
     if test -n "$RANLIB"; then
       archive_cmds="$archive_cmds~\$RANLIB \$lib"
       postinstall_cmds='$RANLIB $lib'
@@ -12450,8 +14173,12 @@
     ;;
 
   aix4-9*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -12461,7 +14188,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
+  test yes = "$enable_shared" || enable_static=yes
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
@@ -12475,7 +14202,9 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-CC="$lt_save_CC"
+CC=$lt_save_CC
+
+
 
 
 
@@ -12506,13 +14235,14 @@
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -12526,7 +14256,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12555,7 +14285,7 @@
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -12569,7 +14299,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12634,6 +14364,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12650,6 +14381,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12669,9 +14401,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$pkg_modules" 2>&1`
+	        PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$pkg_modules" 2>&1`
         else
-	        PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$pkg_modules" 2>&1`
+	        PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$pkg_modules" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PACKAGE_PKG_ERRORS" >&5
@@ -12700,7 +14432,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	PACKAGE_CFLAGS=$pkg_cv_PACKAGE_CFLAGS
 	PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS
@@ -12725,6 +14457,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SOX_CFLAGS=`$PKG_CONFIG --cflags "$sox_modules" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12741,6 +14474,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SOX_LIBS=`$PKG_CONFIG --libs "$sox_modules" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12760,9 +14494,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$sox_modules" 2>&1`
+	        SOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$sox_modules" 2>&1`
         else
-	        SOX_PKG_ERRORS=`$PKG_CONFIG --print-errors "$sox_modules" 2>&1`
+	        SOX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$sox_modules" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOX_PKG_ERRORS" >&5
@@ -12791,7 +14525,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	SOX_CFLAGS=$pkg_cv_SOX_CFLAGS
 	SOX_LIBS=$pkg_cv_SOX_LIBS
@@ -12816,6 +14550,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PLUGINS_CFLAGS=`$PKG_CONFIG --cflags "$plugins_modules" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12832,6 +14567,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PLUGINS_LIBS=`$PKG_CONFIG --libs "$plugins_modules" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12851,9 +14587,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$plugins_modules" 2>&1`
+	        PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$plugins_modules" 2>&1`
         else
-	        PLUGINS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$plugins_modules" 2>&1`
+	        PLUGINS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$plugins_modules" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PLUGINS_PKG_ERRORS" >&5
@@ -12882,7 +14618,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	PLUGINS_CFLAGS=$pkg_cv_PLUGINS_CFLAGS
 	PLUGINS_LIBS=$pkg_cv_PLUGINS_LIBS
@@ -12892,7 +14628,7 @@
 fi
 
 # get svn revision
-REVISION="r1"
+REVISION="r0"
 if test "x${REVISION}" = "xr0"
 then
 	SVN=`which svn 2>/dev/null`
@@ -12935,7 +14671,7 @@
 set dummy xsltproc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XSLTPROC+set}" = set; then :
+if ${ac_cv_path_XSLTPROC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $XSLTPROC in
@@ -12949,7 +14685,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12987,7 +14723,7 @@
    for ac_header in locale.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = x""yes; then :
+if test "x$ac_cv_header_locale_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LOCALE_H 1
 _ACEOF
@@ -12999,7 +14735,7 @@
     if test $ac_cv_header_locale_h = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+if ${am_cv_val_LC_MESSAGES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13038,8 +14774,84 @@
     XGETTEXT=:
     INTLLIBS=
 
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFPreferences.h>
+int
+main ()
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_CFPreferencesCopyAppValue=yes
+else
+  gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+  fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyCurrent();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_CFLocaleCopyCurrent=yes
+else
+  gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+
+
+
     ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
+if test "x$ac_cv_header_libintl_h" = xyes; then :
   gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
 
@@ -13048,7 +14860,7 @@
       #
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
 $as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
+if ${gt_cv_func_ngettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13079,7 +14891,7 @@
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
 	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
 $as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+if ${gt_cv_func_dgettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13112,7 +14924,7 @@
         for ac_func in bind_textdomain_codeset
 do :
   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -13131,7 +14943,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13165,10 +14977,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13202,10 +15014,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
 $as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dgettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13239,7 +15051,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
 $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
   gt_cv_func_dgettext_libintl=yes
 fi
 
@@ -13255,7 +15067,7 @@
 $as_echo "" >&6; }
   	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13289,10 +15101,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
 $as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dcgettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13326,7 +15138,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
   gt_cv_func_dgettext_libintl=yes
 			libintl_extra_libs=-liconv
 else
@@ -13351,7 +15163,7 @@
           for ac_func in bind_textdomain_codeset
 do :
   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -13378,7 +15190,7 @@
       fi
 
       if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
+        INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS"
       fi
 
       if test "$gt_cv_have_gettext" = "yes"; then
@@ -13389,7 +15201,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -13426,7 +15238,7 @@
 	  for ac_func in dcgettext
 do :
   ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = x""yes; then :
+if test "x$ac_cv_func_dcgettext" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DCGETTEXT 1
 _ACEOF
@@ -13467,7 +15279,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -13481,7 +15293,7 @@
   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
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13508,7 +15320,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -13559,7 +15371,7 @@
   case $host in
 	    *-*-solaris*)
 	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   CATOBJEXT=.gmo
                DATADIRNAME=share
 else
@@ -13568,6 +15380,10 @@
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -13757,10 +15573,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -13812,7 +15639,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -13827,6 +15653,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -13864,7 +15698,7 @@
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -13965,6 +15799,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *\\/* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -14160,16 +15995,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -14229,28 +16064,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
@@ -14271,8 +16094,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by imagination $as_me 3.0, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+This file was extended by imagination $as_me 3.4, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14322,17 +16145,17 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <http://sourceforge.net/tracker/?group_id=244319&atid=1125540>."
+Report bugs to <https://sourceforge.net/p/imagination/bugs/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-imagination config.status 3.0
-configured by $0, generated by GNU Autoconf 2.67,
+imagination config.status 3.4
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -14412,7 +16235,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -14446,131 +16269,159 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
 GREP \
 EGREP \
 FGREP \
@@ -14583,8 +16434,13 @@
 OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
+archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
@@ -14592,16 +16448,19 @@
 compiler \
 lt_cv_sys_global_symbol_pipe \
 lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
 lt_prog_compiler_pic \
+lt_prog_compiler_wl \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
+MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
@@ -14615,9 +16474,7 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
-fix_srcfile_path \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
@@ -14625,12 +16482,13 @@
 libname_spec \
 library_names_spec \
 soname_spec \
+install_override_mode \
 finish_eval \
 old_striplib \
 striplib; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -14652,14 +16510,16 @@
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
+postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -14667,26 +16527,17 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
 ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
 
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile'
 
@@ -14729,7 +16580,7 @@
     "icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES icons/scalable/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -14751,9 +16602,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -14761,12 +16613,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -14788,7 +16641,7 @@
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -14816,7 +16669,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -14864,7 +16717,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_setkey = 1
   FS = "&#x7;"
 
@@ -14896,7 +16749,7 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -14936,7 +16789,7 @@
   esac
   case $ac_mode$ac_tag in
   :FHL*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :FH-) ac_tag=-:-;;
   :FH*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -14955,7 +16808,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -14964,7 +16817,7 @@
 	   \\/$*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -14990,8 +16843,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -15127,21 +16980,22 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -15155,7 +17009,7 @@
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -15168,7 +17022,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -15202,21 +17056,19 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -15251,54 +17103,52 @@
  ;;
     "libtool":C)
 
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    cfgfile=${ofile}T
     trap "$RM \"$cfgfile\"; exit 1" 1 2 15
     $RM "$cfgfile"
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Generated automatically by $as_me ($PACKAGE) $VERSION
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 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.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
 #
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # The names of the tagged configurations supported by this script.
-available_tags=""
+available_tags=''
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 
@@ -15318,6 +17168,18 @@
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -15367,9 +17229,11 @@
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
@@ -15377,13 +17241,30 @@
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method == "file_magic".
+# Command to use when deplibs_check_method = "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
 # The archiver.
 AR=$lt_AR
+
+# Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
@@ -15392,6 +17273,9 @@
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
 # A C compiler.
 LTCC=$lt_CC
 
@@ -15404,20 +17288,29 @@
 # Transform the output of nm in a proper C declaration.
 global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
 # Transform the output of nm in a C name address pair.
 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
 
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
@@ -15425,6 +17318,9 @@
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
@@ -15481,6 +17377,9 @@
 # The coded name of the library, if different from the real name.
 soname_spec=$lt_soname_spec
 
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
 # Command to use after installation of a shared archive.
 postinstall_cmds=$lt_postinstall_cmds
 
@@ -15500,8 +17399,11 @@
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -15520,6 +17422,10 @@
 # The linker used to build libraries.
 LD=$lt_LD
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -15532,12 +17438,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
@@ -15587,20 +17493,16 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# 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=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute
 
@@ -15624,9 +17526,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
@@ -15642,6 +17541,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
@@ -15652,13 +17554,72 @@
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR:DIR:"
+#       string "DIR DIR" will be prepended to VARIABLE
+# ":DIR:DIR"
+#       string "DIR DIR" will be appended to VARIABLE
+# "DIRP:DIRP::DIRA:DIRA"
+#       string "DIRP DIRP" will be prepended to VARIABLE and string
+#       "DIRA DIRA" will be appended to VARIABLE
+# "DIR:DIR"
+#       VARIABLE will be replaced by "DIR DIR"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *\\/compile | ccache | *\\/ccache ) ;;
+        distcc | *\\/distcc | purify | *\\/purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
   case $host_os in
   aix3*)
     cat <<\_LT_EOF >> "$cfgfile"
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -15667,219 +17628,17 @@
   esac
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 
   # We use sed instead of cat because bash on DJGPP gets confused if
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^$-^=*$=.*/\1/;q'
-my_sed_long_arg='1s/^-^=*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.^.*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
-
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"

imagination-3.4.tar.bz2/configure.ac Added

@@ -0,0 +1,117 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT(imagination, 3.4,
+		https://sourceforge.net/p/imagination/bugs/)
+AC_CONFIG_SRCDIR(src/imagination.h)
+AM_INIT_AUTOMAKE
+
+# Enable silent rules if supported
+m4_ifdef(AM_SILENT_RULES, AM_SILENT_RULES(yes))
+
+AM_MAINTAINER_MODE
+
+AC_ISC_POSIX
+AC_PROG_CC
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_INTLTOOL
+
+AC_SEARCH_LIBS(sqrtf, m, ,AC_MSG_ERROR(Unable to find math library))
+
+# for plugins
+AC_DISABLE_STATIC
+AM_PROG_LIBTOOL
+LIBTOOL="$LIBTOOL --silent"
+
+pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0"
+PKG_CHECK_MODULES(PACKAGE, $pkg_modules)
+
+sox_modules="sox >= 14.2.0"
+PKG_CHECK_MODULES(SOX, $sox_modules)
+
+plugins_modules="cairo >= 1.6 glib-2.0 > 2.18.0"
+PKG_CHECK_MODULES(PLUGINS, $plugins_modules)
+
+# get svn revision
+REVISION="r0"
+if test "x${REVISION}" = "xr0"
+then
+	SVN=`which svn 2>/dev/null`
+	if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}"
+	then
+		REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4`
+	fi
+fi
+if test "x${REVISION}" != "xr0"
+then
+	# force debug mode for a SVN working copy
+	CFLAGS="-g -Wall"
+else
+	REVISION="-1"
+fi
+AC_DEFINE_UNQUOTED(REVISION, "$REVISION", subversion revision number)
+
+AC_SUBST(PACKAGE_CFLAGS)
+AC_SUBST(PACKAGE_LIBS)
+
+AC_SUBST(SOX_CFLAGS)
+AC_SUBST(SOX_LIBS)
+
+AC_SUBST(PLUGINS_CFLAGS)
+AC_SUBST(PLUGINS_LIBS)
+
+GETTEXT_PACKAGE=imagination
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", Gettext package.)
+
+AC_PATH_PROG(XSLTPROC, xsltproc, yes)
+
+AM_CONDITIONAL(ENABLE_XSLTPROC, test x"$enable_xsltproc" = x"yes")
+
+dnl Add the languages which your application supports here.
+ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`"
+AM_GLIB_GNU_GETTEXT
+
+GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
+SOX_VERSION=`$PKG_CONFIG --modversion sox`
+
+AC_OUTPUT(
+Makefile
+src/Makefile
+transitions/Makefile
+doc/Makefile
+doc/en/Makefile
+doc/en/imagination.xml
+doc/en/images/Makefile
+doc/fr/Makefile
+doc/fr/imagination.xml
+doc/fr/images/Makefile
+doc/es/Makefile
+doc/es/imagination.xml
+doc/es/images/Makefile
+doc/pt_BR/Makefile
+doc/pt_BR/imagination.xml
+doc/pt_BR/images/Makefile
+po/Makefile.in
+icons/Makefile
+icons/16x16/Makefile
+icons/24x24/Makefile
+icons/48x48/Makefile
+icons/scalable/Makefile
+)
+
+echo ""
+echo "Imagination configuration:"
+echo "--------------------------"
+echo ""
+echo "Install in  :       ${prefix}/bin"
+echo "GTK version :       ${GTK_VERSION}"
+echo "SOX version :       ${SOX_VERSION}"
+if test "${REVISION}" != "-1"
+then
+	echo "SVN revision:       ${REVISION}"
+fi
+echo ""

imagination-3.0.tar.bz2/depcomp -> imagination-3.4.tar.bz2/depcomp Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2007-03-29.01
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,9 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -30,9 +27,9 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp --help --version PROGRAM ARGS
@@ -42,11 +39,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -59,6 +56,66 @@
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/^/*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.^.*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.$lower*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.$lower*:$tab *,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -71,6 +128,9 @@
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -82,9 +142,32 @@
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -107,8 +190,7 @@
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -116,13 +198,17 @@
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -130,31 +216,31 @@
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^^:*: / /' \
       -e 's/^'$alpha':\/^:*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -172,8 +258,7 @@
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -181,43 +266,41 @@
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/^/*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -230,9 +313,7 @@
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -241,44 +322,100 @@
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the .
-    sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *$.*$ *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
 
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -290,8 +427,8 @@
   sed "s,^^:*:,$object :," < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^^:*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  sed 's,^^:*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -302,9 +439,8 @@
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/^/*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -315,8 +451,7 @@
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -326,72 +461,107 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.a-z*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.$lower*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/^/*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the .
-      sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *$.*$/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/$.*$/'"$tab"'\1 \\/p
+s/.$.*$ \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
 
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
@@ -404,13 +574,13 @@
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -430,18 +600,18 @@
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^  *^: ^:^:*\:    *:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^$tab *^:$tab ^:^:*:$tab *|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -455,41 +625,51 @@
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  cleared=no eat=no
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -500,13 +680,13 @@
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -525,10 +705,10 @@
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# 0-90-9* "$^"*$".*/ s:: \1 \\:p' \
-       -e '/^#line 0-90-9* "$^"*$".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# 0-90-9* "$^"*$".*/ s:: \1 \\:p' \
+             -e '/^#line 0-90-9* "$^"*$".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -538,35 +718,56 @@
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # always write the preprocessed file to stdout.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line 0-90-9* "$^"*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line 0-90-9* "$^"*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -585,5 +786,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
 # End:

imagination-3.0.tar.bz2/doc/Makefile.in -> imagination-3.4.tar.bz2/doc/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,29 +89,41 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -79,16 +145,43 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(cssdir)"
 DATA = $(css_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -135,6 +228,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -158,6 +252,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -166,8 +265,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -213,6 +314,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -241,11 +343,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -253,6 +356,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -287,7 +391,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -313,8 +416,11 @@
 	-rm -rf .libs _libs
 install-cssDATA: $(css_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)"
 	@list='$(css_DATA)'; test -n "$(cssdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(cssdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(cssdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -328,27 +434,28 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(css_DATA)'; test -n "$(cssdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(cssdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(cssdir)" && rm -f $$files
+	dir='$(DESTDIR)$(cssdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -363,57 +470,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -429,12 +491,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -446,15 +503,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -463,6 +516,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -499,13 +567,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -543,10 +608,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -624,22 +694,23 @@
 
 uninstall-am: uninstall-cssDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-cssDATA \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-cssDATA
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-cssDATA install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-cssDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/doc/en/Makefile.in -> imagination-3.4.tar.bz2/doc/en/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,61 @@
 
 # $Id$
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,38 +90,70 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/en
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/imagination.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = imagination.xml
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/imagination.xml.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -114,6 +200,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -137,6 +224,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -145,8 +237,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -192,6 +286,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -220,11 +315,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -232,6 +328,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -270,7 +367,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/en/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/en/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -298,22 +394,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -328,57 +427,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -394,12 +448,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -411,15 +460,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -428,6 +473,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -464,13 +524,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -508,10 +565,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -591,23 +653,24 @@
 
 uninstall-am: uninstall-local
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist-hook distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+	check check-am clean clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am dist-hook distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-local
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-local
+
+.PRECIOUS: Makefile
 
 
 all-local: html-build.stamp

imagination-3.0.tar.bz2/doc/en/html/index.html -> imagination-3.4.tar.bz2/doc/en/html/index.html Changed

@@ -1,25 +1,21 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Imagination DVD Slide Show Creator</title><link rel="stylesheet" href="../imagination.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="#index" title="Imagination DVD Slide Show Creator"><link rel="next" href="#intro" title="Introduction to Imagination"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="article" title="Imagination DVD Slide Show Creator"><div class="titlepage"><div><div><h2 class="title"><a name="index"></a>Imagination DVD Slide Show Creator</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Giuseppe</span> <span class="surname">Torelli</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Tadej</span> <span class="surname">Borov&#353;ak</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Robert</span> <span class="surname">Chéramy</span></h3></div></div></div><div><p class="releaseinfo">
-			This manual describes version 3.0 of Imagination.
-		</p></div><div><p class="copyright">Copyright © 2009 Giuseppe Torelli</p></div><div><div class="legalnotice" title="Legal Notice"><a name="legalnotice"></a><p>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Imagination Slide Show Creator</title><link rel="stylesheet" type="text/css" href="../imagination.css"><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="#index" title="Imagination Slide Show Creator"><link rel="next" href="#intro" title="Introduction to Imagination"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="article"><div class="titlepage"><div><div><h2 class="title"><a name="index"></a>Imagination Slide Show Creator</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Giuseppe</span> <span class="surname">Torelli</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Tadej</span> <span class="surname">Borov&#353;ak</span></h3></div></div></div><div><p class="releaseinfo">
+			This manual describes version 3.4 of Imagination.
+		</p></div><div><p class="copyright">Copyright © 2009-2018 Giuseppe Torelli</p></div><div><div class="legalnotice"><a name="legalnotice"></a><p>
 				Permission is granted to copy, distribute and/or modify this document
 				under the terms of the GNU Free Documentation License, Version 1.1 or
 				any later version published by the Free Software Foundation; with no
 				Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 				Texts. The complete license text is available from the
 				<a class="ulink" href="http://www.gnu.org/" target="_top">Free Software Foundation</a>.
-			</p></div></div><div><p class="pubdate">October 2009</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#intro">Introduction to Imagination</a></span></dt><dt><span class="sect1"><a href="#new_format">New Slideshow Project Format</a></span></dt><dt><span class="sect1"><a href="#window">Imagination's window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#toolbar">Toolbar</a></span></dt><dt><span class="sect2"><a href="#id393830">Working Area</a></span></dt><dt><span class="sect2"><a href="#image_area">Image Area</a></span></dt><dt><span class="sect2"><a href="#thumbnails_area">Thumbnails Area</a></span></dt><dt><span class="sect2"><a href="#status_bar">Status Bar</a></span></dt></dl></dd><dt><span class="sect1"><a href="#menu">Imagination's Menus</a></span></dt><dd><dl><dt><span class="sect2"><a href="#slideshow">Slideshow Menu</a></span></dt><dt><span class="sect2"><a href="#slide">Slide Menu</a></span></dt><dt><span class="sect2"><a href="#view">View Menu</a></span></dt><dt><span class="sect2"><a href="#help">Help Menu</a></span></dt></dl></dd><dt><span class="sect1"><a href="#license">License</a></span></dt></dl></div><div class="sect1" title="Introduction to Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="intro"></a>Introduction to Imagination</h2></div></div></div><p>
-				Imagination is a lightweight DVD slide show creator developed in C with the GTK+2 toolkit and Cairo. Imagination is designed to be
+			</p></div></div><div><p class="pubdate">December 2018</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="sect1"><a href="#intro">Introduction to Imagination</a></span></dt><dt><span class="sect1"><a href="#window">Imagination's window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#toolbar">Toolbar</a></span></dt><dt><span class="sect2"><a href="#idm71">Working Area</a></span></dt><dt><span class="sect2"><a href="#image_area">Image Area</a></span></dt><dt><span class="sect2"><a href="#thumbnails_area">Thumbnails Area</a></span></dt><dt><span class="sect2"><a href="#status_bar">Status Bar</a></span></dt></dl></dd><dt><span class="sect1"><a href="#menu">Imagination's Menus</a></span></dt><dd><dl><dt><span class="sect2"><a href="#slideshow">Slideshow Menu</a></span></dt><dt><span class="sect2"><a href="#slide">Slide Menu</a></span></dt><dt><span class="sect2"><a href="#view">View Menu</a></span></dt><dt><span class="sect2"><a href="#help">Help Menu</a></span></dt></dl></dd><dt><span class="sect1"><a href="#license">License</a></span></dt></dl></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="intro"></a>Introduction to Imagination</h2></div></div></div><p>
+				Imagination is a lightweight slide show creator developed in C with the GTK+2 toolkit and Cairo. Imagination is designed to be
 				be fast and easy-to-use. Its user interface is clean and intuitive, and does not include any confusing or useless options by default.
 				It requires the ffmpeg encoder to produce the movie file and libsox to import the audio files. Yes you don't need any other third-party software!
-			</p></div><div class="sect1" title="New Slideshow Project Format"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="new_format"></a>New Slideshow Project Format</h2></div></div></div><p>
-				Starting from release 2.0 Imagination's slideshow project format has changed. The old format will be recognized and slideshows saved with this format
-				will be correctly loaded, but in next release support for old slideshow project files (saved with Imagination's release prior to 2.0;)
-				will be <span class="emphasis"><em>DROPPED</em></span>. Please ensure to load ALL your old slideshow projects with Imagination 3.0 and save them again.
-			</p></div><div class="sect1" title="Imagination's window"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="window"></a>Imagination's window</h2></div></div></div><p>
+			</p></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="window"></a>Imagination's window</h2></div></div></div><p>
 			This section describes the area of Imagination's window: the toolbar, the image area, the working area, the thumbnail area and the status bar.
 		</p><p>
 			</p><div class="figure"><a name="imagination_window"></a><p class="title"><b>Figure 1. Imagination Window</b></p><div class="figure-contents"><div><img src="images/imagination_window.png" alt="Imagination Window"></div></div></div><p><br class="figure-break">
-		</p><div class="sect2" title="Toolbar"><div class="titlepage"><div><div><h3 class="title"><a name="toolbar"></a>Toolbar</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>New</p></li><li class="listitem"><p>Open</p></li><li class="listitem"><p>Save</p></li><li class="listitem"><p>Import Pictures As</p></li><li class="listitem"><p>Import Music</p></li><li class="listitem"><p>Delete</p></li><li class="listitem"><p>Rotate Clockwise</p></li><li class="listitem"><p>Rotate Counter-Clockwise</p></li><li class="listitem"><p>Zoom In</p></li><li class="listitem"><p>Zoom Out</p></li><li class="listitem"><p>Zoom Normal Size</p></li><li class="listitem"><p>Preview</p></li><li class="listitem"><p>Goto First Slide</p></li><li class="listitem"><p>Goto Previously Selected Slide</p></li><li class="listitem"><p>Slide Entry</p></li><li class="listitem"><p>Goto Next Selected Slide</p></li><li class="listitem"><p>Goto Last Slide</p></li><li class="listitem"><p>Quit</p></li></ul></div><p>For a detailed explanation please look at <a class="xref" href="#slideshow" title="Slideshow Menu">the section called &#8220;Slideshow Menu&#8221;</a> and <a class="xref" href="#slide" title="Slide Menu">the section called &#8220;Slide Menu&#8221;</a> since these options are the same.</p></div><div class="sect2" title="Working Area"><div class="titlepage"><div><div><h3 class="title"><a name="id393830"></a>Working Area</h3></div></div></div><p>Starting from 2.0 release video and audio parts were split in two separate tabs named "Video" and "Audio". The Video part contains the following settings:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Slide Settings</p></li><li class="listitem"><p>Slide Motion</p></li><li class="listitem"><p>Slide Text</p></li></ul></div><div class="figure"><a name="video_tab"></a><p class="title"><b>Figure 2. Video Tab</b></p><div class="figure-contents"><div><img src="images/side_panel_video.png" alt="Video Tab"></div></div></div><br class="figure-break"><div class="sect3" title="Slide Settings"><div class="titlepage"><div><div><h4 class="title"><a name="slide_settings"></a>Slide Settings</h4></div></div></div><p>
+		</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="toolbar"></a>Toolbar</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>New</p></li><li class="listitem"><p>Open</p></li><li class="listitem"><p>Save</p></li><li class="listitem"><p>Import Pictures As</p></li><li class="listitem"><p>Import Music</p></li><li class="listitem"><p>Delete</p></li><li class="listitem"><p>Rotate Clockwise</p></li><li class="listitem"><p>Rotate Counter-Clockwise</p></li><li class="listitem"><p>Zoom In</p></li><li class="listitem"><p>Zoom Out</p></li><li class="listitem"><p>Zoom Normal Size</p></li><li class="listitem"><p>Preview</p></li><li class="listitem"><p>Goto First Slide</p></li><li class="listitem"><p>Goto Previously Selected Slide</p></li><li class="listitem"><p>Slide Entry</p></li><li class="listitem"><p>Goto Next Selected Slide</p></li><li class="listitem"><p>Goto Last Slide</p></li><li class="listitem"><p>Quit</p></li></ul></div><p>For a detailed explanation please look at <a class="xref" href="#slideshow" title="Slideshow Menu">the section called &#8220;Slideshow Menu&#8221;</a> and <a class="xref" href="#slide" title="Slide Menu">the section called &#8220;Slide Menu&#8221;</a> since these options are the same.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="idm71"></a>Working Area</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Slide Settings</p></li><li class="listitem"><p>Slide Motion</p></li><li class="listitem"><p>Slide Text</p></li><li class="listitem"><p>Slide Text Position</p></li></ul></div><div class="figure"><a name="video_tab"></a><p class="title"><b>Figure 2. Video Tab</b></p><div class="figure-contents"><div><img src="images/side_panel_video.png" alt="Video Tab"></div></div></div><br class="figure-break"><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_settings"></a>Slide Settings</h4></div></div></div><p>
 					This section allows you to choose a random transition or to
 					pick one from the drop-down menu. You can set the transition
 					speed choosing among Fast, Normal and Slow and the time in
@@ -31,7 +27,7 @@
 					field is disabled and cannot be modified, since duration of
 					still part is now calculated as a sum of all stop points'
 					durations and will be automatically updated.
-				</p></div><div class="sect3" title="Slide Motion"><div class="titlepage"><div><div><h4 class="title"><a name="slide_motion"></a>Slide Motion</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_motion"></a>Slide Motion</h4></div></div></div><p>
 					This section allows you to apply the famous Ken Burns
 					effects on a slide. Just begin by zooming in/out and
 					dragging image around with left mouse button to center a
@@ -45,9 +41,8 @@
 					area to show you your selected stop point.
 				</p><p>
 					If you commit a mistake or want to change some point, simply
-					select problematic point, re-adjust your slide and then
-					click the Update button. Now your selected point has it's
-					zoom level and position set to new values.
+					select problematic point and re-adjust your slide.
+					Imagination will automatically update the values for you.
 				</p><p>
 					The Remove button deletes a stop point. Simply select
 					point that should be removed and click Remove button.
@@ -58,26 +53,19 @@
 				</p><p>
 					NOTE: This section is available only when exactly one slide
 					is selected.
-				</p></div><div class="sect3" title="Slide Text"><div class="titlepage"><div><div><h4 class="title"><a name="slide_text"></a>Slide Text</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_text"></a>Slide Text</h4></div></div></div><p>
 					Imagination can add some text to your slides. Just start
 					typing in proper field and text will show up in image
-					area. If you wish to have multi line text, click on + sign
-					on the right side of the text field that will expand it a
-					bit.
+					area.
 				</p><p>
 					You can modify text's font size, variant and family using
 					font button below the text field. Color is controlled by two
 					color selector buttons (font color and text outline color)
                     right of the font button (font color can be partially transparent too).
-				</p><p>
-					Text can be positioned on the slide in nine locations that
-					can be selected with position selector button. Those
-					positions can be made relative to exported video or original
-					image. What does this mean? For images without Ken Burns
-					effect, both options produce the same result. But if you
-					apply zoom, text that is positioned relative to the original
-					image will be zoomed to, while text positioned relative to
-					exported video will stay of the same size.
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_text_position"></a>Slide Text Position</h4></div></div></div><p>
+					Starting from 3.4 version text can be positioned
+					anywhere on the slide. The position dropdown menu
+					was removed. The slide subtitle can be rotated too.
 				</p><p>
 					Text entrance can also be animated. Simply select animation
 					from combo box, set the duration of the effect and enjoy.
@@ -96,7 +84,7 @@
 					animation duration to 6 seconds and slide duration to 10
 					seconds (6 seconds of text animation + 4 seconds of still
 					time).
-				</p></div><div class="sect3" title="Audio Tab"><div class="titlepage"><div><div><h4 class="title"><a name="audio_tab"></a>Audio Tab</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="audio_tab"></a>Audio Tab</h4></div></div></div><p>
 					By clicking on the "Audio" tab the background music list is
 					displayed. Here you can see the length of each of the
 					imported audio files along with the total time length of all
@@ -127,25 +115,28 @@
 					duration; 3. Add prepared audio to slideshow and export.
 					Please note that Imagination WILL NOT use incompatible audio
 					files to calculate the total Music Duration length.
-				</p><div class="figure"><a name="audio_tab_pic"></a><p class="title"><b>Figure 3. Audio Tab</b></p><div class="figure-contents"><div><img src="images/side_panel_audio.png" alt="Audio Tab"></div></div></div><br class="figure-break"></div><div class="sect3" title="Message Tab"><div class="titlepage"><div><div><h4 class="title"><a name="message_tab"></a>Message Tab</h4></div></div></div><p>
+				</p><div class="figure"><a name="audio_tab_pic"></a><p class="title"><b>Figure 3. Audio Tab</b></p><div class="figure-contents"><div><img src="images/side_panel_audio.png" alt="Audio Tab"></div></div></div><br class="figure-break"></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="message_tab"></a>Message Tab</h4></div></div></div><p>
                     In this tab, imagination will write messages that might be of interest for the user. When a message is important (for example: missing image file), the title of the tab will switch to bold.
-                </p></div></div><div class="sect2" title="Image Area"><div class="titlepage"><div><div><h3 class="title"><a name="image_area"></a>Image Area</h3></div></div></div><p>This part of Imagination's window previews the slideshow along with stop points and text. Use zoom controls to enlarge or shrink the area.</p></div><div class="sect2" title="Thumbnails Area"><div class="titlepage"><div><div><h3 class="title"><a name="thumbnails_area"></a>Thumbnails Area</h3></div></div></div><p>Located in the bottom part of Imagination's window the thumbnail area displays the imported slides. Left clicking on one of it displays the slide in the image area along with the slide settings in the working area. Drag and drop is supported so you can import your favorite pictures by dragging them here. Rubber banding is supported too so you can select a group of slides by left clicking on some white space and then by moving the mouse. You can also reorder the slides by holding down left mouse button and by moving them around.</p></div><div class="sect2" title="Status Bar"><div class="titlepage"><div><div><h3 class="title"><a name="status_bar"></a>Status Bar</h3></div></div></div><p>As the name suggests this area, located under the thumbnails one, displays info about the number of transitions loaded at startup, the number of imported slides, and some info on the slide itself when only one slide is selected (otherwise the total number of selected slides is displayed).</p></div></div><div class="sect1" title="Imagination's Menus"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="menu"></a>Imagination's Menus</h2></div></div></div><p>
+                </p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="image_area"></a>Image Area</h3></div></div></div><p>This part of Imagination's window previews the slideshow along with stop points and text. Use zoom controls to enlarge or shrink the area.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="thumbnails_area"></a>Thumbnails Area</h3></div></div></div><p>Located in the bottom part of Imagination's window the thumbnail area displays the imported slides. Left clicking on one of it displays the slide in the image area along with the slide settings in the working area. Drag and drop is supported so you can import your favorite pictures by dragging them here. Rubber banding is supported too so you can select a group of slides by left clicking on some white space and then by moving the mouse. You can also reorder the slides by holding down left mouse button and by moving them around.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="status_bar"></a>Status Bar</h3></div></div></div><p>As the name suggests this area, located under the thumbnails one, displays info about the number of transitions loaded at startup, the number of imported slides, and some info on the slide itself when only one slide is selected (otherwise the total number of selected slides is displayed).</p></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="menu"></a>Imagination's Menus</h2></div></div></div><p>
 			This section describes in detail Imagination's menus.
-		</p><div class="sect2" title="Slideshow Menu"><div class="titlepage"><div><div><h3 class="title"><a name="slideshow"></a>Slideshow Menu</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>New</p></li><li class="listitem"><p>Open</p></li><li class="listitem"><p>Import slideshow</p></li><li class="listitem"><p>Save</p></li><li class="listitem"><p>Save As</p></li><li class="listitem"><p>Close</p></li><li class="listitem"><p>Import pictures</p></li><li class="listitem"><p>Import music</p></li><li class="listitem"><p>Properties</p></li><li class="listitem"><p>Preview</p></li><li class="listitem"><p>Export</p></li><li class="listitem"><p>Quit</p></li></ul></div><div class="sect3" title="New"><div class="titlepage"><div><div><h4 class="title"><a name="new"></a>New</h4></div></div></div><div class="figure"><a name="new_dialog"></a><p class="title"><b>Figure 4. New Dialog</b></p><div class="figure-contents"><div><img src="images/new_dialog.png" alt="New Dialog"></div></div></div><br class="figure-break"><p>
-					This menu allows you to create a new slideshow. The slideshow dialog is displayed. You can choose the video format and size, if to scale the picture so that it covers the whole screen avoiding the black stripes and the background color to be displayed when the picture is too small and the rescaling doesn't succed to cover the whole screen. You can also change these options later.
-				</p></div><div class="sect3" title="Open"><div class="titlepage"><div><div><h4 class="title"><a name="open"></a>Open</h4></div></div></div><p>
+		</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="slideshow"></a>Slideshow Menu</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>New</p></li><li class="listitem"><p>Open</p></li><li class="listitem"><p>Import slideshow</p></li><li class="listitem"><p>Save</p></li><li class="listitem"><p>Save As</p></li><li class="listitem"><p>Close</p></li><li class="listitem"><p>Import pictures</p></li><li class="listitem"><p>Import music</p></li><li class="listitem"><p>Properties</p></li><li class="listitem"><p>Preview</p></li><li class="listitem"><p>Export</p></li><li class="listitem"><p>Quit</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="new"></a>New</h4></div></div></div><div class="figure"><a name="new_dialog"></a><p class="title"><b>Figure 4. New Dialog</b></p><div class="figure-contents"><div><img src="images/new_dialog.png" alt="New Dialog"></div></div></div><br class="figure-break"><p>
+					This menu allows you to create a new slideshow. The slideshow dialog is displayed. You can choose the video format and size, if to scale the picture so that it covers the whole screen avoiding the black stripes and the background color to be displayed when the picture is too small and the rescaling doesn't succed to cover the whole screen. You can choose if ending the slideshow with a blank slide with the same transition effect applied to the first one. You can also change these options later.
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="open"></a>Open</h4></div></div></div><p>
 					This menu allows you to open a previously saved slideshow.
-				</p></div><div class="sect3" title="Import slideshow"><div class="titlepage"><div><div><h4 class="title"><a name="import_slideshow"></a>Import slideshow</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_slideshow"></a>Import slideshow</h4></div></div></div><p>
                     This menu allows you to insert a previously saved slideshow at the end of your slideshow.
-                </p></div><div class="sect3" title="Save"><div class="titlepage"><div><div><h4 class="title"><a name="save"></a>Save</h4></div></div></div><p>
+                </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="save"></a>Save</h4></div></div></div><p>
 					This menu allows you to save a previously saved slideshow.
 					The filename won't be asked unless you haven't saved your
 					project yet.
-				</p></div><div class="sect3" title="Save as"><div class="titlepage"><div><div><h4 class="title"><a name="saveas"></a>Save as</h4></div></div></div><p>
-					This menu allows you save a slideshow with a different filename.
-				</p></div><div class="sect3" title="Close"><div class="titlepage"><div><div><h4 class="title"><a name="close"></a>Close</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="saveas"></a>Save as</h4></div></div></div><p>
+					This menu allows you save a slideshow with a different filename. Starting from 3.4 you can now choose in the "Save As" dialog
+					if to save the project with filenames without their folder name. This will make the project portable to other media. Please
+					be sure to put all the files (music tracks, pictures and pattern images for the subtitle) in the same folder othwerwise when
+					you attempt to load the slideshow Imagination couldn't load the project files.
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="close"></a>Close</h4></div></div></div><p>
 					This menu closes the slideshow. If the slideshow is not saved yet or you changed something Imagination will ask you to save it first.
-				</p></div><div class="sect3" title="Import pictures"><div class="titlepage"><div><div><h4 class="title"><a name="import_pictures"></a>Import pictures</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_pictures"></a>Import pictures</h4></div></div></div><p>
 					This menu opens up a file dialog allowing you to choose the
 					pictures to import into Imagination. To select more than one
 					picture, press and hold SHIFT key while clicking on the
@@ -153,51 +144,46 @@
 					notifying you the percentage progress of the pictures'
 					import. Thumbnails won't be shown util the loading
 					completes.
-				</p></div><div class="sect3" title="Import music"><div class="titlepage"><div><div><h4 class="title"><a name="import_music"></a>Import music</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_music"></a>Import music</h4></div></div></div><p>
 					This is the same as the previous only but works for audio
 					files. Please make sure your libsox is able to handle your
 					selected audio formats (on Debian derived distros, you'll
 					most probably want to install
 					<em class="citetitle">libsox-fmt-all</em> package).
-				</p></div><div class="sect3" title="Properties"><div class="titlepage"><div><div><h4 class="title"><a name="properties"></a>Properties</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="properties"></a>Properties</h4></div></div></div><p>
 					This menu displays a dialog with the slideshow properties. Please see the <a class="xref" href="#new" title="New">the section called &#8220;New&#8221;</a> for an explanation of the available settings.
-				</p></div><div class="sect3" title="Preview"><div class="titlepage"><div><div><h4 class="title"><a name="preview_slideshow"></a>Preview</h4></div></div></div><p>
-					This menu starts the preview of the slideshow in the image area. If you want to start the preview by a specific slide just select it by left clicking on it. The preview quality if affected by the setting in the menu <span class="guimenu">Slide</span> &#8594; <span class="guimenuitem">Preview quality</span>.
-				</p></div><div class="sect3" title="Export"><div class="titlepage"><div><div><h4 class="title"><a name="export"></a>Export</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview_slideshow"></a>Preview</h4></div></div></div><p>
+					This sub menu allows you to start the preview of the slideshow in the image area in 3 different ways. Starting from 3.4 Imagination
+					will play also the music even though it's not faded at the end when exporting the video.
+					If you want to start the preview by a specific slide just select it by left clicking on it. If you added an audio
+					track the music will start at the minute specified by the sum of the total duration of all slides before the one you selected. The other two preview ways are self-explanatory.
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="export"></a>Export</h4></div></div></div><p>
 					This submenu allows you to export the slideshow in the format defined in the New / Properties dialog: VOB (DVD Video) OGV (Ogg Theora/Vorbis)
-					FLV (Flash Video) and 3GP (Mobile Phones). Each format has its own set of
+					FLV (Flash Video), 3GP (Mobile Phones) and H264. Each format has its own set of
 					preferences that you'll be asked about when you select any
 					of them. Please be sure to have all the necessary libraries
 					installed first, otherwise you'll get errors from ffmpeg, the
 					command-line encoder Imagination uses to produce the video.
-				</p></div><div class="sect3" title="Quit"><div class="titlepage"><div><div><h4 class="title"><a name="quit"></a>Quit</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="quit"></a>Quit</h4></div></div></div><p>
 					This menu quits Imagination. If the slideshow wasn't saved yet Imagination will prompt you to save it first.
-				</p></div></div><div class="sect2" title="Slide Menu"><div class="titlepage"><div><div><h3 class="title"><a name="slide"></a>Slide Menu</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Cut</p></li><li class="listitem"><p>Copy</p></li><li class="listitem"><p>Paste</p></li><li class="listitem"><p>Preview quality</p></li><li class="listitem"><p>Zoom</p></li><li class="listitem"><p>Add empty slide</p></li><li class="listitem"><p>Delete</p></li><li class="listitem"><p>Report</p></li><li class="listitem"><p>Rotate clockwise</p></li><li class="listitem"><p>Rotate counter-clockwise</p></li><li class="listitem"><p>Select all</p></li><li class="listitem"><p>Unselect all</p></li></ul></div><div class="sect3" title="Cut"><div class="titlepage"><div><div><h4 class="title"><a name="cut"></a>Cut</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="slide"></a>Slide Menu</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Cut</p></li><li class="listitem"><p>Copy</p></li><li class="listitem"><p>Paste</p></li><li class="listitem"><p>Zoom</p></li><li class="listitem"><p>Add empty slide</p></li><li class="listitem"><p>Edit empty slide</p></li><li class="listitem"><p>Delete</p></li><li class="listitem"><p>Report</p></li><li class="listitem"><p>Rotate clockwise</p></li><li class="listitem"><p>Rotate counter-clockwise</p></li><li class="listitem"><p>Select all</p></li><li class="listitem"><p>Unselect all</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="cut"></a>Cut</h4></div></div></div><p>
 					This menu entry allows you to cut a number of selected slides. 
-				</p></div><div class="sect3" title="Copy"><div class="titlepage"><div><div><h4 class="title"><a name="copy"></a>Copy</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="copy"></a>Copy</h4></div></div></div><p>
 					This menu entry allows you to copy a number of selected slides. 
-				</p></div><div class="sect3" title="Paste"><div class="titlepage"><div><div><h4 class="title"><a name="paste"></a>Paste</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="paste"></a>Paste</h4></div></div></div><p>
 					Before choosing Paste you have to left click on a slide after which you want the previously selected slides to be moved (if you chose Cut) or copied if you chose Copy).
-				</p></div><div class="sect3" title="Preview quality"><div class="titlepage"><div><div><h4 class="title"><a name="preview"></a>Preview quality</h4></div></div></div><p>
-					This submenu allows you to set different quality for the
-					preview and the image quality in the image area. This option
-					doesn't affect exported video in any way. It's main purpose
-					is to speed-up the creation process, since loading large
-					images from disk at original size may take some time
-					(loading of 4032x3024 image from disk takes cca. 2s on
-					modern system). Be aware, preview might not work properly on
-					slower machines when high quality is selected.
-				</p></div><div class="sect3" title="Zoom"><div class="titlepage"><div><div><h4 class="title"><a name="zoom"></a>Zoom</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="zoom"></a>Zoom</h4></div></div></div><p>
 					This submenu allows you to zoom in or out the image area. It was added so that Imagination can be used on notebooks that have limited screen resolution. It does affect also the size of thumbnails when Imagination is in Overview mode (please see the View menu for an explanation of the Overview area).
-				</p></div><div class="sect3" title="Add empty slide"><div class="titlepage"><div><div><h4 class="title"><a name="Add_empty_slide"></a>Add empty slide</h4></div></div></div><div class="figure"><a name="empty_slide"></a><p class="title"><b>Figure 5. Create new slide dialog</b></p><div class="figure-contents"><div><img src="images/empty_slide_dialog.png" alt="Create new slide dialog"></div></div></div><br class="figure-break"><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="Add_empty_slide"></a>Add empty slide</h4></div></div></div><div class="figure"><a name="empty_slide"></a><p class="title"><b>Figure 5. Create new slide dialog</b></p><div class="figure-contents"><div><img src="images/empty_slide_dialog.png" alt="Create new slide dialog"></div></div></div><br class="figure-break"><p>
 					This menu entry displays the above dialog where you can
-					choose the background color of the empty slide in a three
+					choose the background color of the empty slide in a four
 					different ways: 1) with a solid color, 2) with a linear
-					gradient, 3) with a radial gradient. This functionality is
-					most useful when you want to separate your images in
-					distinct groups by adding simple text slide in between them.
-					If a slide is selected the empty slide will be added next to
-					the selected slide otherwise it will be added after the last slide.
+					gradient, 3) with a radial gradient, 4) with a fading
+					gradient. This functionality is most useful when you want
+					to separate your images in distinct groups by adding simple
+					text slide in between them. If a slide is selected the empty
+					slide will be added next to the selected slide otherwise it
+					will be added after the last slide.
 				</p><p>
 					Slides created this way are in no way different from any
 					other slide. You can still add text to them and enhance them
@@ -207,28 +193,36 @@
 					selection of start and end color. Second level is position
 					of the endpoints, which are represented by two white
 					squares that can be dragged around the preview area.
-				</p></div><div class="sect3" title="Delete"><div class="titlepage"><div><div><h4 class="title"><a name="delete"></a>Delete</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="Edit_empty_slide"></a>Edit empty slide</h4></div></div></div><div class="figure"><a name="emptyy_slide"></a><p class="title"><b>Figure 6. Edit a new slide dialog</b></p><div class="figure-contents"><div><img src="images/empty_slide_dialog2.png" alt="Edit a new slide dialog"></div></div></div><br class="figure-break"><p>
+					This menu entry displays the above dialog where you can
+					edit the background color or the gradient you previously
+					chose when you added a new slide.
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="delete"></a>Delete</h4></div></div></div><p>
 					This menu entry deletes the selected slides. Hold down the SHIFT key to select more than one slide at once or CTRL to select selectively. Please be aware this action cannot be undone!
-				</p></div><div class="sect3" title="Report"><div class="titlepage"><div><div><h4 class="title"><a name="report"></a>Report</h4></div></div></div><div class="figure"><a name="slide_report"></a><p class="title"><b>Figure 6. Slide Transitions Report dialog</b></p><div class="figure-contents"><div><img src="images/slide_report_dialog.png" alt="Slide Transitions Report dialog"></div></div></div><br class="figure-break"><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="report"></a>Report</h4></div></div></div><div class="figure"><a name="slide_report"></a><p class="title"><b>Figure 7. Slide Transitions Report dialog</b></p><div class="figure-contents"><div><img src="images/slide_report_dialog.png" alt="Slide Transitions Report dialog"></div></div></div><br class="figure-break"><p>
 					This menu entry shows the Slide Transitions Report dialog where you can see the number of the slides which have the same transition.
 					Click on the slide to have Imagination automatically select it. Slides whose transition is applied only once are not shown
 					here. Please give your feedback on this since we are not sure whether it's an useful feature. Thank you.
-				</p></div><div class="sect3" title="Rotate Clockwise"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_clockwise"></a>Rotate Clockwise</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_clockwise"></a>Rotate Clockwise</h4></div></div></div><p>
 					This entry allows you to rotate the selected slide in the clockwise sense. The picture on the disk is NOT affected by the rotation so if you save the slideshow and you load it back the slide is displayed to its original state before the rotation.
-				</p></div><div class="sect3" title="Rotate Counter-Clockwise"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_counterclockwise"></a>Rotate Counter-Clockwise</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_counterclockwise"></a>Rotate Counter-Clockwise</h4></div></div></div><p>
 					This entry allows you to rotate the selected slide in the counter-clockwise sense. The picture on the disk is NOT affected by the rotation so if you save the slideshow and you load it back the slide is displayed to its original state before the rotation.
-				</p></div><div class="sect3" title="Select All"><div class="titlepage"><div><div><h4 class="title"><a name="select"></a>Select All</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="select"></a>Select All</h4></div></div></div><p>
 					Should this entry be explained?
-				</p></div><div class="sect3" title="Unselect All"><div class="titlepage"><div><div><h4 class="title"><a name="unselect"></a>Unselect All</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="unselect"></a>Unselect All</h4></div></div></div><p>
 					And this?
-				</p></div></div><div class="sect2" title="View Menu"><div class="titlepage"><div><div><h3 class="title"><a name="view"></a>View Menu</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Preview Mode</p></li><li class="listitem"><p>Overview Mode</p></li></ul></div><div class="sect3" title="Preview mode"><div class="titlepage"><div><div><h4 class="title"><a name="preview_mode"></a>Preview mode</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="view"></a>View Menu</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Preview Mode</p></li><li class="listitem"><p>Overview Mode</p></li><li class="listitem"><p>Preview Frame Rate</p></li><li class="listitem"><p>Fullscreen</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview_mode"></a>Preview mode</h4></div></div></div><p>
 					This entry allows you to switch to Preview mode; the image area along with the thumbnails area are displayed. The size of the image area can be enlarged or shrinked with the Zoom controls so to allow Imagination to be used on notebooks.
-				</p></div><div class="sect3" title="Overview mode"><div class="titlepage"><div><div><h4 class="title"><a name="overview_mode"></a>Overview mode</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="overview_mode"></a>Overview mode</h4></div></div></div><p>
 					This entry allows you to switch to Overview mode; the image area along with the thumbnails area are hidden. This mode allows you to organize the slides in a matrix. The size of the thumbnails can be increased or decreased with the Zoom controls. Cut/Copy/Paste menu entries are supported. The slides can also be arranged by holding left mouse button and by moving them around.
-				</p></div></div><div class="sect2" title="Help Menu"><div class="titlepage"><div><div><h3 class="title"><a name="help"></a>Help Menu</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Contents</p></li><li class="listitem"><p>About</p></li></ul></div><div class="sect3" title="Content"><div class="titlepage"><div><div><h4 class="title"><a name="content"></a>Content</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview_frame_rate"></a>Preview frame rate</h4></div></div></div><p>
+					This entry allows you to choose the desidered frame rate when previewing the slideshow. I'm not sure if in 2018 with fast computer available this entry is still useful...
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="fullscreen"></a>Fullscreen</h4></div></div></div><p>
+					Starting from version 3.4, Imagination allows preview to be rendered in fullscreen. Press F11 or ESC to exit fullscreen.
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="help"></a>Help Menu</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Contents</p></li><li class="listitem"><p>About</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="content"></a>Content</h4></div></div></div><p>
 					This entry allows you to display this HTML documentation in the system installed browser.
-				</p></div><div class="sect3" title="About"><div class="titlepage"><div><div><h4 class="title"><a name="about"></a>About</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="about"></a>About</h4></div></div></div><p>
 					This entry displays the About dialog with the credits.
-				</p></div></div></div><div class="sect1" title="License"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="license"></a>License</h2></div></div></div><p>
+				</p></div></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="license"></a>License</h2></div></div></div><p>
 			Imagination is licensed under the GPL2 license.
 		</p></div></div></body></html>

imagination-3.0.tar.bz2/doc/en/images/Makefile.am -> imagination-3.4.tar.bz2/doc/en/images/Makefile.am Changed

imagination-3.0.tar.bz2/doc/en/images/Makefile.in -> imagination-3.4.tar.bz2/doc/en/images/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,61 @@
 # $Id$
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,22 +91,33 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/en/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,8 +139,16 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(imagesdir)"
 DATA = $(images_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -97,6 +170,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -120,6 +194,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -128,8 +207,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -175,6 +256,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -203,11 +285,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -215,6 +298,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -230,6 +314,7 @@
 				side_panel_audio.png   \
 				new_dialog.png			\
 				empty_slide_dialog.png	\
+				empty_slide_dialog2.png	\
 				slide_report_dialog.png
 
 EXTRA_DIST = \
@@ -250,7 +335,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/en/images/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/en/images/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -276,8 +360,11 @@
 	-rm -rf .libs _libs
 install-imagesDATA: $(images_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(imagesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(imagesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -291,14 +378,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(imagesdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(imagesdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -348,10 +433,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -432,16 +522,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-imagesDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-imagesDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-imagesDATA install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-imagesDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/doc/en/images/empty_slide_dialog.png -> imagination-3.4.tar.bz2/doc/en/images/empty_slide_dialog.png Changed

imagination-3.4.tar.bz2/doc/en/images/empty_slide_dialog2.png Added

imagination-3.0.tar.bz2/doc/en/images/new_dialog.png -> imagination-3.4.tar.bz2/doc/en/images/new_dialog.png Changed

imagination-3.0.tar.bz2/doc/en/imagination.xml -> imagination-3.4.tar.bz2/doc/en/imagination.xml Changed

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" 
-  <!ENTITY date "October 2009"> 
-  <!ENTITY version "3.0">
+  <!ENTITY date "December 2018"> 
+  <!ENTITY version "3.4">
   <!ENTITY application "Imagination"> 
 >
 <article id="index" lang="en">
 	<articleinfo>
-		<title>Imagination DVD Slide Show Creator</title>
+		<title>Imagination Slide Show Creator</title>
 		<pubdate>&date;</pubdate>
 		<copyright>
-			<year>2009</year>
+			<year>2009-2018</year>
 			<holder>Giuseppe Torelli</holder>
 		</copyright>
 		<legalnotice id="legalnotice">
@@ -32,10 +32,6 @@
 				<firstname>Tadej</firstname>
 				<surname>Borovšak</surname>
 			</author>
-            <author>
-                <firstname>Robert</firstname>
-                <surname>Chéramy</surname>
-            </author>
 		</authorgroup>
 		<releaseinfo>
 			This manual describes version &version; of &application;.
@@ -45,19 +41,11 @@
 	<sect1 id="intro">
 		<title>Introduction to &application;</title>
 			<para>
-				Imagination is a lightweight DVD slide show creator developed in C with the GTK+2 toolkit and Cairo. Imagination is designed to be
+				Imagination is a lightweight slide show creator developed in C with the GTK+2 toolkit and Cairo. Imagination is designed to be
 				be fast and easy-to-use. Its user interface is clean and intuitive, and does not include any confusing or useless options by default.
 				It requires the ffmpeg encoder to produce the movie file and libsox to import the audio files. Yes you don't need any other third-party software!
 			</para>
 	</sect1>
-	<sect1 id="new_format">
-		<title>New Slideshow Project Format</title>
-			<para>
-				Starting from release 2.0 Imagination's slideshow project format has changed. The old format will be recognized and slideshows saved with this format
-				will be correctly loaded, but in next release support for old slideshow project files (saved with Imagination's release prior to 2.0;)
-				will be <emphasis>DROPPED</emphasis>. Please ensure to load ALL your old slideshow projects with Imagination &version; and save them again.
-			</para>
-	</sect1>
 	<sect1 id="window">
 		<title>Imagination's window</title>
 		<para>
@@ -95,11 +83,11 @@
 		</sect2>
 		<sect2>
 			<title>Working Area</title>
-			<para>Starting from 2.0 release video and audio parts were split in two separate tabs named "Video" and "Audio". The Video part contains the following settings:</para>
 			<itemizedlist>
 				<listitem><para>Slide Settings</para></listitem>
 				<listitem><para>Slide Motion</para></listitem>
 				<listitem><para>Slide Text</para></listitem>
+				<listitem><para>Slide Text Position</para></listitem>
 			</itemizedlist>
 			<figure id="video_tab">
 				<title>Video Tab</title>
@@ -140,9 +128,8 @@
 				</para>
 				<para>
 					If you commit a mistake or want to change some point, simply
-					select problematic point, re-adjust your slide and then
-					click the Update button. Now your selected point has it's
-					zoom level and position set to new values.
+					select problematic point and re-adjust your slide.
+					Imagination will automatically update the values for you.
 				</para>
 				<para>
 					The Remove button deletes a stop point. Simply select
@@ -163,9 +150,7 @@
 				<para>
 					Imagination can add some text to your slides. Just start
 					typing in proper field and text will show up in image
-					area. If you wish to have multi line text, click on + sign
-					on the right side of the text field that will expand it a
-					bit.
+					area.
 				</para>
 				<para>
 					You can modify text's font size, variant and family using
@@ -173,15 +158,13 @@
 					color selector buttons (font color and text outline color)
                     right of the font button (font color can be partially transparent too).
 				</para>
+			</sect3>
+			<sect3 id="slide_text_position">
+				<title>Slide Text Position</title>
 				<para>
-					Text can be positioned on the slide in nine locations that
-					can be selected with position selector button. Those
-					positions can be made relative to exported video or original
-					image. What does this mean? For images without Ken Burns
-					effect, both options produce the same result. But if you
-					apply zoom, text that is positioned relative to the original
-					image will be zoomed to, while text positioned relative to
-					exported video will stay of the same size.
+					Starting from 3.4 version text can be positioned
+					anywhere on the slide. The position dropdown menu
+					was removed. The slide subtitle can be rotated too.
 				</para>
 				<para>
 					Text entrance can also be animated. Simply select animation
@@ -294,7 +277,7 @@
 					<graphic fileref="images/new_dialog.png"></graphic>
 				</figure>
 				<para>
-					This menu allows you to create a new slideshow. The slideshow dialog is displayed. You can choose the video format and size, if to scale the picture so that it covers the whole screen avoiding the black stripes and the background color to be displayed when the picture is too small and the rescaling doesn't succed to cover the whole screen. You can also change these options later.
+					This menu allows you to create a new slideshow. The slideshow dialog is displayed. You can choose the video format and size, if to scale the picture so that it covers the whole screen avoiding the black stripes and the background color to be displayed when the picture is too small and the rescaling doesn't succed to cover the whole screen. You can choose if ending the slideshow with a blank slide with the same transition effect applied to the first one. You can also change these options later.
 				</para>
 			</sect3>
 			<sect3 id="open">
@@ -320,7 +303,10 @@
 			<sect3 id="saveas">
 				<title>Save as</title>
 				<para>
-					This menu allows you save a slideshow with a different filename.
+					This menu allows you save a slideshow with a different filename. Starting from 3.4 you can now choose in the "Save As" dialog
+					if to save the project with filenames without their folder name. This will make the project portable to other media. Please
+					be sure to put all the files (music tracks, pictures and pattern images for the subtitle) in the same folder othwerwise when
+					you attempt to load the slideshow Imagination couldn't load the project files.
 				</para>
 			</sect3>
 			<sect3 id="close">
@@ -360,14 +346,17 @@
 			<sect3 id="preview_slideshow">
 				<title>Preview</title>
 				<para>
-					This menu starts the preview of the slideshow in the image area. If you want to start the preview by a specific slide just select it by left clicking on it. The preview quality if affected by the setting in the menu <menuchoice><guimenu>Slide</guimenu><guimenuitem>Preview quality</guimenuitem></menuchoice>.
+					This sub menu allows you to start the preview of the slideshow in the image area in 3 different ways. Starting from 3.4 Imagination
+					will play also the music even though it's not faded at the end when exporting the video.
+					If you want to start the preview by a specific slide just select it by left clicking on it. If you added an audio
+					track the music will start at the minute specified by the sum of the total duration of all slides before the one you selected. The other two preview ways are self-explanatory.
 				</para>
 			</sect3>
 			<sect3 id="export">
 				<title>Export</title>
 				<para>
 					This submenu allows you to export the slideshow in the format defined in the New / Properties dialog: VOB (DVD Video) OGV (Ogg Theora/Vorbis)
-					FLV (Flash Video) and 3GP (Mobile Phones). Each format has its own set of
+					FLV (Flash Video), 3GP (Mobile Phones) and H264. Each format has its own set of
 					preferences that you'll be asked about when you select any
 					of them. Please be sure to have all the necessary libraries
 					installed first, otherwise you'll get errors from ffmpeg, the
@@ -387,9 +376,9 @@
 				<listitem><para>Cut</para></listitem>
 				<listitem><para>Copy</para></listitem>
 				<listitem><para>Paste</para></listitem>
-				<listitem><para>Preview quality</para></listitem>
 				<listitem><para>Zoom</para></listitem>
 				<listitem><para>Add empty slide</para></listitem>
+				<listitem><para>Edit empty slide</para></listitem>
 				<listitem><para>Delete</para></listitem>
 				<listitem><para>Report</para></listitem>
 				<listitem><para>Rotate clockwise</para></listitem>
@@ -415,19 +404,6 @@
 					Before choosing Paste you have to left click on a slide after which you want the previously selected slides to be moved (if you chose Cut) or copied if you chose Copy).
 				</para>
 			</sect3>
-			<sect3 id="preview">
-				<title>Preview quality</title>
-				<para>
-					This submenu allows you to set different quality for the
-					preview and the image quality in the image area. This option
-					doesn't affect exported video in any way. It's main purpose
-					is to speed-up the creation process, since loading large
-					images from disk at original size may take some time
-					(loading of 4032x3024 image from disk takes cca. 2s on
-					modern system). Be aware, preview might not work properly on
-					slower machines when high quality is selected.
-				</para>
-			</sect3>
 			<sect3 id="zoom">
 				<title>Zoom</title>
 				<para>
@@ -442,13 +418,14 @@
 				</figure>
 				<para>
 					This menu entry displays the above dialog where you can
-					choose the background color of the empty slide in a three
+					choose the background color of the empty slide in a four
 					different ways: 1) with a solid color, 2) with a linear
-					gradient, 3) with a radial gradient. This functionality is
-					most useful when you want to separate your images in
-					distinct groups by adding simple text slide in between them.
-					If a slide is selected the empty slide will be added next to
-					the selected slide otherwise it will be added after the last slide.
+					gradient, 3) with a radial gradient, 4) with a fading
+					gradient. This functionality is most useful when you want
+					to separate your images in distinct groups by adding simple
+					text slide in between them. If a slide is selected the empty
+					slide will be added next to the selected slide otherwise it
+					will be added after the last slide.
 				</para>
 				<para>
 					Slides created this way are in no way different from any
@@ -462,6 +439,18 @@
 					squares that can be dragged around the preview area.
 				</para>
 			</sect3>
+			<sect3 id="Edit_empty_slide">
+				<title>Edit empty slide</title>
+				<figure id="emptyy_slide">
+					<title>Edit a new slide dialog</title>
+					<graphic fileref="images/empty_slide_dialog2.png"></graphic>
+				</figure>
+				<para>
+					This menu entry displays the above dialog where you can
+					edit the background color or the gradient you previously
+					chose when you added a new slide.
+				</para>
+			</sect3>
 			<sect3 id="delete">
 				<title>Delete</title>
 				<para>
@@ -510,6 +499,8 @@
 			<itemizedlist>
 				<listitem><para>Preview Mode</para></listitem>
 				<listitem><para>Overview Mode</para></listitem>
+				<listitem><para>Preview Frame Rate</para></listitem>
+				<listitem><para>Fullscreen</para></listitem>
 			</itemizedlist>
 			<sect3 id="preview_mode">
 				<title>Preview mode</title>
@@ -523,6 +514,18 @@
 					This entry allows you to switch to Overview mode; the image area along with the thumbnails area are hidden. This mode allows you to organize the slides in a matrix. The size of the thumbnails can be increased or decreased with the Zoom controls. Cut/Copy/Paste menu entries are supported. The slides can also be arranged by holding left mouse button and by moving them around.
 				</para>
 			</sect3>
+			<sect3 id="preview_frame_rate">
+				<title>Preview frame rate</title>
+				<para>
+					This entry allows you to choose the desidered frame rate when previewing the slideshow. I'm not sure if in 2018 with fast computer available this entry is still useful...
+				</para>
+			</sect3>
+			<sect3 id="fullscreen">
+				<title>Fullscreen</title>
+				<para>
+					Starting from version 3.4, Imagination allows preview to be rendered in fullscreen. Press F11 or ESC to exit fullscreen.
+				</para>
+			</sect3>
 		</sect2>
 		<sect2 id="help">
 			<title>Help Menu</title>

imagination-3.0.tar.bz2/doc/en/imagination.xml.in -> imagination-3.4.tar.bz2/doc/en/imagination.xml.in Changed

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" 
-  <!ENTITY date "October 2009"> 
-  <!ENTITY version "3.0">
+  <!ENTITY date "December 2018"> 
+  <!ENTITY version "3.4">
   <!ENTITY application "Imagination"> 
 >
 <article id="index" lang="en">
 	<articleinfo>
-		<title>Imagination DVD Slide Show Creator</title>
+		<title>Imagination Slide Show Creator</title>
 		<pubdate>&date;</pubdate>
 		<copyright>
-			<year>2009</year>
+			<year>2009-2018</year>
 			<holder>Giuseppe Torelli</holder>
 		</copyright>
 		<legalnotice id="legalnotice">
@@ -32,10 +32,6 @@
 				<firstname>Tadej</firstname>
 				<surname>Borovšak</surname>
 			</author>
-            <author>
-                <firstname>Robert</firstname>
-                <surname>Chéramy</surname>
-            </author>
 		</authorgroup>
 		<releaseinfo>
 			This manual describes version &version; of &application;.
@@ -45,19 +41,11 @@
 	<sect1 id="intro">
 		<title>Introduction to &application;</title>
 			<para>
-				Imagination is a lightweight DVD slide show creator developed in C with the GTK+2 toolkit and Cairo. Imagination is designed to be
+				Imagination is a lightweight slide show creator developed in C with the GTK+2 toolkit and Cairo. Imagination is designed to be
 				be fast and easy-to-use. Its user interface is clean and intuitive, and does not include any confusing or useless options by default.
 				It requires the ffmpeg encoder to produce the movie file and libsox to import the audio files. Yes you don't need any other third-party software!
 			</para>
 	</sect1>
-	<sect1 id="new_format">
-		<title>New Slideshow Project Format</title>
-			<para>
-				Starting from release 2.0 Imagination's slideshow project format has changed. The old format will be recognized and slideshows saved with this format
-				will be correctly loaded, but in next release support for old slideshow project files (saved with Imagination's release prior to 2.0;)
-				will be <emphasis>DROPPED</emphasis>. Please ensure to load ALL your old slideshow projects with Imagination &version; and save them again.
-			</para>
-	</sect1>
 	<sect1 id="window">
 		<title>Imagination's window</title>
 		<para>
@@ -95,11 +83,11 @@
 		</sect2>
 		<sect2>
 			<title>Working Area</title>
-			<para>Starting from 2.0 release video and audio parts were split in two separate tabs named "Video" and "Audio". The Video part contains the following settings:</para>
 			<itemizedlist>
 				<listitem><para>Slide Settings</para></listitem>
 				<listitem><para>Slide Motion</para></listitem>
 				<listitem><para>Slide Text</para></listitem>
+				<listitem><para>Slide Text Position</para></listitem>
 			</itemizedlist>
 			<figure id="video_tab">
 				<title>Video Tab</title>
@@ -140,9 +128,8 @@
 				</para>
 				<para>
 					If you commit a mistake or want to change some point, simply
-					select problematic point, re-adjust your slide and then
-					click the Update button. Now your selected point has it's
-					zoom level and position set to new values.
+					select problematic point and re-adjust your slide.
+					Imagination will automatically update the values for you.
 				</para>
 				<para>
 					The Remove button deletes a stop point. Simply select
@@ -163,9 +150,7 @@
 				<para>
 					Imagination can add some text to your slides. Just start
 					typing in proper field and text will show up in image
-					area. If you wish to have multi line text, click on + sign
-					on the right side of the text field that will expand it a
-					bit.
+					area.
 				</para>
 				<para>
 					You can modify text's font size, variant and family using
@@ -173,15 +158,13 @@
 					color selector buttons (font color and text outline color)
                     right of the font button (font color can be partially transparent too).
 				</para>
+			</sect3>
+			<sect3 id="slide_text_position">
+				<title>Slide Text Position</title>
 				<para>
-					Text can be positioned on the slide in nine locations that
-					can be selected with position selector button. Those
-					positions can be made relative to exported video or original
-					image. What does this mean? For images without Ken Burns
-					effect, both options produce the same result. But if you
-					apply zoom, text that is positioned relative to the original
-					image will be zoomed to, while text positioned relative to
-					exported video will stay of the same size.
+					Starting from 3.4 version text can be positioned
+					anywhere on the slide. The position dropdown menu
+					was removed. The slide subtitle can be rotated too.
 				</para>
 				<para>
 					Text entrance can also be animated. Simply select animation
@@ -294,7 +277,7 @@
 					<graphic fileref="images/new_dialog.png"></graphic>
 				</figure>
 				<para>
-					This menu allows you to create a new slideshow. The slideshow dialog is displayed. You can choose the video format and size, if to scale the picture so that it covers the whole screen avoiding the black stripes and the background color to be displayed when the picture is too small and the rescaling doesn't succed to cover the whole screen. You can also change these options later.
+					This menu allows you to create a new slideshow. The slideshow dialog is displayed. You can choose the video format and size, if to scale the picture so that it covers the whole screen avoiding the black stripes and the background color to be displayed when the picture is too small and the rescaling doesn't succed to cover the whole screen. You can choose if ending the slideshow with a blank slide with the same transition effect applied to the first one. You can also change these options later.
 				</para>
 			</sect3>
 			<sect3 id="open">
@@ -320,7 +303,10 @@
 			<sect3 id="saveas">
 				<title>Save as</title>
 				<para>
-					This menu allows you save a slideshow with a different filename.
+					This menu allows you save a slideshow with a different filename. Starting from 3.4 you can now choose in the "Save As" dialog
+					if to save the project with filenames without their folder name. This will make the project portable to other media. Please
+					be sure to put all the files (music tracks, pictures and pattern images for the subtitle) in the same folder othwerwise when
+					you attempt to load the slideshow Imagination couldn't load the project files.
 				</para>
 			</sect3>
 			<sect3 id="close">
@@ -360,14 +346,17 @@
 			<sect3 id="preview_slideshow">
 				<title>Preview</title>
 				<para>
-					This menu starts the preview of the slideshow in the image area. If you want to start the preview by a specific slide just select it by left clicking on it. The preview quality if affected by the setting in the menu <menuchoice><guimenu>Slide</guimenu><guimenuitem>Preview quality</guimenuitem></menuchoice>.
+					This sub menu allows you to start the preview of the slideshow in the image area in 3 different ways. Starting from 3.4 Imagination
+					will play also the music even though it's not faded at the end when exporting the video.
+					If you want to start the preview by a specific slide just select it by left clicking on it. If you added an audio
+					track the music will start at the minute specified by the sum of the total duration of all slides before the one you selected. The other two preview ways are self-explanatory.
 				</para>
 			</sect3>
 			<sect3 id="export">
 				<title>Export</title>
 				<para>
 					This submenu allows you to export the slideshow in the format defined in the New / Properties dialog: VOB (DVD Video) OGV (Ogg Theora/Vorbis)
-					FLV (Flash Video) and 3GP (Mobile Phones). Each format has its own set of
+					FLV (Flash Video), 3GP (Mobile Phones) and H264. Each format has its own set of
 					preferences that you'll be asked about when you select any
 					of them. Please be sure to have all the necessary libraries
 					installed first, otherwise you'll get errors from ffmpeg, the
@@ -387,9 +376,9 @@
 				<listitem><para>Cut</para></listitem>
 				<listitem><para>Copy</para></listitem>
 				<listitem><para>Paste</para></listitem>
-				<listitem><para>Preview quality</para></listitem>
 				<listitem><para>Zoom</para></listitem>
 				<listitem><para>Add empty slide</para></listitem>
+				<listitem><para>Edit empty slide</para></listitem>
 				<listitem><para>Delete</para></listitem>
 				<listitem><para>Report</para></listitem>
 				<listitem><para>Rotate clockwise</para></listitem>
@@ -415,19 +404,6 @@
 					Before choosing Paste you have to left click on a slide after which you want the previously selected slides to be moved (if you chose Cut) or copied if you chose Copy).
 				</para>
 			</sect3>
-			<sect3 id="preview">
-				<title>Preview quality</title>
-				<para>
-					This submenu allows you to set different quality for the
-					preview and the image quality in the image area. This option
-					doesn't affect exported video in any way. It's main purpose
-					is to speed-up the creation process, since loading large
-					images from disk at original size may take some time
-					(loading of 4032x3024 image from disk takes cca. 2s on
-					modern system). Be aware, preview might not work properly on
-					slower machines when high quality is selected.
-				</para>
-			</sect3>
 			<sect3 id="zoom">
 				<title>Zoom</title>
 				<para>
@@ -442,13 +418,14 @@
 				</figure>
 				<para>
 					This menu entry displays the above dialog where you can
-					choose the background color of the empty slide in a three
+					choose the background color of the empty slide in a four
 					different ways: 1) with a solid color, 2) with a linear
-					gradient, 3) with a radial gradient. This functionality is
-					most useful when you want to separate your images in
-					distinct groups by adding simple text slide in between them.
-					If a slide is selected the empty slide will be added next to
-					the selected slide otherwise it will be added after the last slide.
+					gradient, 3) with a radial gradient, 4) with a fading
+					gradient. This functionality is most useful when you want
+					to separate your images in distinct groups by adding simple
+					text slide in between them. If a slide is selected the empty
+					slide will be added next to the selected slide otherwise it
+					will be added after the last slide.
 				</para>
 				<para>
 					Slides created this way are in no way different from any
@@ -462,6 +439,18 @@
 					squares that can be dragged around the preview area.
 				</para>
 			</sect3>
+			<sect3 id="Edit_empty_slide">
+				<title>Edit empty slide</title>
+				<figure id="emptyy_slide">
+					<title>Edit a new slide dialog</title>
+					<graphic fileref="images/empty_slide_dialog2.png"></graphic>
+				</figure>
+				<para>
+					This menu entry displays the above dialog where you can
+					edit the background color or the gradient you previously
+					chose when you added a new slide.
+				</para>
+			</sect3>
 			<sect3 id="delete">
 				<title>Delete</title>
 				<para>
@@ -510,6 +499,8 @@
 			<itemizedlist>
 				<listitem><para>Preview Mode</para></listitem>
 				<listitem><para>Overview Mode</para></listitem>
+				<listitem><para>Preview Frame Rate</para></listitem>
+				<listitem><para>Fullscreen</para></listitem>
 			</itemizedlist>
 			<sect3 id="preview_mode">
 				<title>Preview mode</title>
@@ -523,6 +514,18 @@
 					This entry allows you to switch to Overview mode; the image area along with the thumbnails area are hidden. This mode allows you to organize the slides in a matrix. The size of the thumbnails can be increased or decreased with the Zoom controls. Cut/Copy/Paste menu entries are supported. The slides can also be arranged by holding left mouse button and by moving them around.
 				</para>
 			</sect3>
+			<sect3 id="preview_frame_rate">
+				<title>Preview frame rate</title>
+				<para>
+					This entry allows you to choose the desidered frame rate when previewing the slideshow. I'm not sure if in 2018 with fast computer available this entry is still useful...
+				</para>
+			</sect3>
+			<sect3 id="fullscreen">
+				<title>Fullscreen</title>
+				<para>
+					Starting from version 3.4, Imagination allows preview to be rendered in fullscreen. Press F11 or ESC to exit fullscreen.
+				</para>
+			</sect3>
 		</sect2>
 		<sect2 id="help">
 			<title>Help Menu</title>

imagination-3.0.tar.bz2/doc/es/Makefile.in -> imagination-3.4.tar.bz2/doc/es/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,61 @@
 
 # $Id$
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,38 +90,70 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/es
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/imagination.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = imagination.xml
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/imagination.xml.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -114,6 +200,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -137,6 +224,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -145,8 +237,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -192,6 +286,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -220,11 +315,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -232,6 +328,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -270,7 +367,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/es/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -298,22 +394,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -328,57 +427,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -394,12 +448,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -411,15 +460,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -428,6 +473,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -464,13 +524,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -508,10 +565,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -591,23 +653,24 @@
 
 uninstall-am: uninstall-local
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist-hook distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+	check check-am clean clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am dist-hook distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-local
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-local
+
+.PRECIOUS: Makefile
 
 
 all-local: html-build.stamp

imagination-3.0.tar.bz2/doc/es/html/index.html -> imagination-3.4.tar.bz2/doc/es/html/index.html Changed

@@ -1,21 +1,21 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Imagination, Creación DVD de Diapositivas</title><link rel="stylesheet" href="../imagination.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="#index" title="Imagination, Creación DVD de Diapositivas"><link rel="next" href="#intro" title="Introducción a Imagination"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="es" class="article" title="Imagination, Creación DVD de Diapositivas"><div class="titlepage"><div><div><h2 class="title"><a name="index"></a>Imagination, Creación DVD de Diapositivas</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Giuseppe</span> <span class="surname">Torelli</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Tadej</span> <span class="surname">Borov&#353;ak</span></h3></div></div></div><div><p class="releaseinfo">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Imagination, Creación DVD de Diapositivas</title><link rel="stylesheet" type="text/css" href="../imagination.css"><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="#index" title="Imagination, Creación DVD de Diapositivas"><link rel="next" href="#intro" title="Introducción a Imagination"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="es" class="article"><div class="titlepage"><div><div><h2 class="title"><a name="index"></a>Imagination, Creación DVD de Diapositivas</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Giuseppe</span> <span class="surname">Torelli</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Tadej</span> <span class="surname">Borov&#353;ak</span></h3></div></div></div><div><p class="releaseinfo">
 			Este manual describe la version 3.0 de Imagination.
-		</p></div><div><p class="copyright">Copyright © 2009 Giuseppe Torelli</p></div><div><div class="legalnotice" title="Aviso Legal"><a name="legalnotice"></a><p>
+		</p></div><div><p class="copyright">Copyright © 2009 Giuseppe Torelli</p></div><div><div class="legalnotice"><a name="legalnotice"></a><p>
 				Se garantiza el permiso para copiar, distribuir y / o modificar este documento bajo los términos de la licencia GNU Free Documentation License, Versión 1.1 o cualquier otra versión posterior publicada por la Free Software Foundation; este documento se presenta sin Secciones Invariables (no Invariant Sections), sin Textos de Tapa (no Front-Cover Texts) , y sin Textos de Contratapa (no Back-Cover Texts). El texto de la licencia completa está disponible en
 				<a class="ulink" href="http://www.gnu.org/" target="_top">Free Software Foundation</a>.
-			</p></div></div><div><p class="pubdate">Diciembre 2009</p></div></div><hr></div><div class="toc"><p><b>Tabla de contenidos</b></p><dl><dt><span class="sect1"><a href="#intro">Introducción a Imagination</a></span></dt><dt><span class="sect1"><a href="#new_format">Nuevo formato de diapositivas</a></span></dt><dt><span class="sect1"><a href="#window">La ventana de Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#toolbar">Barra de Herramientas</a></span></dt><dt><span class="sect2"><a href="#id419707">Zona de trabajo</a></span></dt><dt><span class="sect2"><a href="#image_area">Zona de la Imagen</a></span></dt><dt><span class="sect2"><a href="#thumbnails_area">Zona de miniaturas</a></span></dt><dt><span class="sect2"><a href="#status_bar">Barra de estado</a></span></dt></dl></dd><dt><span class="sect1"><a href="#menu">Menus de Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#presentacion">Menu Presentación</a></span></dt><dt><span class="sect2"><a href="#diapositiva">Menu diapositiva</a></span></dt><dt><span class="sect2"><a href="#view">Menu Ver</a></span></dt><dt><span class="sect2"><a href="#help">Menu Ayuda</a></span></dt></dl></dd><dt><span class="sect1"><a href="#license">Licencia</a></span></dt></dl></div><div class="sect1" title="Introducción a Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="intro"></a>Introducción a Imagination</h2></div></div></div><p>
+			</p></div></div><div><p class="pubdate">Diciembre 2009</p></div></div><hr></div><div class="toc"><p><b>Tabla de contenidos</b></p><dl class="toc"><dt><span class="sect1"><a href="#intro">Introducción a Imagination</a></span></dt><dt><span class="sect1"><a href="#new_format">Nuevo formato de diapositivas</a></span></dt><dt><span class="sect1"><a href="#window">La ventana de Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#toolbar">Barra de Herramientas</a></span></dt><dt><span class="sect2"><a href="#idm75">Zona de trabajo</a></span></dt><dt><span class="sect2"><a href="#image_area">Zona de la Imagen</a></span></dt><dt><span class="sect2"><a href="#thumbnails_area">Zona de miniaturas</a></span></dt><dt><span class="sect2"><a href="#status_bar">Barra de estado</a></span></dt></dl></dd><dt><span class="sect1"><a href="#menu">Menus de Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#presentacion">Menu Presentación</a></span></dt><dt><span class="sect2"><a href="#diapositiva">Menu diapositiva</a></span></dt><dt><span class="sect2"><a href="#view">Menu Ver</a></span></dt><dt><span class="sect2"><a href="#help">Menu Ayuda</a></span></dt></dl></dd><dt><span class="sect1"><a href="#license">Licencia</a></span></dt></dl></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="intro"></a>Introducción a Imagination</h2></div></div></div><p>
 				Imagination es un creador de presentaciones en video desarrollado en C con las herramientas GTK+2 y Cairo. Imagination es conocido por ser rápido y fácil de usar. Su interface es claro e intuitivo y no contiene opciones inútiles ni confusas. Es necesario tener instalados para codificar: ffmpeg para el vídeo y libsox para importar los ficheros de audio. No se necesita software de terceros!
-			</p></div><div class="sect1" title="Nuevo formato de diapositivas"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="new_format"></a>Nuevo formato de diapositivas</h2></div></div></div><p>
+			</p></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="new_format"></a>Nuevo formato de diapositivas</h2></div></div></div><p>
 				A partir de la versión 2.0, el formato del proyecto de diapositivas ha cambiado. Los antiguos formatos serán reconocidos y se podrán guardar y abrir las presentaciones, pero a partir de la versión 2.0, la posibilidad de importar los ficheros (guardados con el formato de versiones anteriores a 2.0) será <span class="emphasis"><em>ABANDONADA</em></span>. No olvidéis cargar vuestros antiguos proyectos con Imagination 2.0 y guardarlos de nuevo.
-			</p></div><div class="sect1" title="La ventana de Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="window"></a>La ventana de Imagination</h2></div></div></div><p>
+			</p></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="window"></a>La ventana de Imagination</h2></div></div></div><p>
 			Esta sección describe el área de la ventana de Imagination : la barra de Herramientas, el area de Imagen, el area de Trabajo, El area de Miniaturas y la barra de estado.
 		</p><p>
 			</p><div class="figure"><a name="Imagination's%20window"></a><p class="title"><b>Figura 1. Ventana de Imagination</b></p><div class="figure-contents"><div><img src="images/imagination_window.png" alt="Ventana de Imagination"></div></div></div><p><br class="figure-break">
-		</p><div class="sect2" title="Barra de Herramientas"><div class="titlepage"><div><div><h3 class="title"><a name="toolbar"></a>Barra de Herramientas</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Nuevo</p></li><li class="listitem"><p>Abrir</p></li><li class="listitem"><p>Guardar</p></li><li class="listitem"><p>Importar imágenes </p></li><li class="listitem"><p>Importar audio</p></li><li class="listitem"><p>Suprimir</p></li><li class="listitem"><p>Rotacion en el sentido horario</p></li><li class="listitem"><p>Rotacion en el sentido antihorario</p></li><li class="listitem"><p>Zoom dentro</p></li><li class="listitem"><p>Zoom fuera</p></li><li class="listitem"><p>Zoom aspecto normal</p></li><li class="listitem"><p>Previsualisación</p></li><li class="listitem"><p>Volver a la primera diapositiva</p></li><li class="listitem"><p>Volver a la diapositiva anterior</p></li><li class="listitem"><p>Entre diapositiva</p></li><li class="listitem"><p>Ir a la diapositiva siguiente</p></li><li class="listitem"><p>Ir a la última diapositiva</p></li><li class="listitem"><p>Cerrar</p></li></ul></div><p>Para una explicación detallada consultar <a class="xref" href="#presentacion" title="Menu Presentación">&#8220;Menu Presentación&#8221;</a> et <a class="xref" href="#diapositiva" title="Menu diapositiva">&#8220;Menu diapositiva&#8221;</a> ya que estas opciones son iguales.</p></div><div class="sect2" title="Zona de trabajo"><div class="titlepage"><div><div><h3 class="title"><a name="id419707"></a>Zona de trabajo</h3></div></div></div><p>Después de la version 2,0 las secciones Video et Audio se han dividido en dos pestañas "Video" et "Audio". La sección Video contiene los siguientes apartados :</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Ajustes de la diapositivas</p></li><li class="listitem"><p>Movimiento de las diapositivas</p></li><li class="listitem"><p>Texto de las diapositivas</p></li></ul></div><div class="figure"><a name="Video%20Tab"></a><p class="title"><b>Figura 2. Pestaña Video</b></p><div class="figure-contents"><div><img src="images/side_panel_video.png" alt="Pestaña Video"></div></div></div><br class="figure-break"><div class="sect3" title="Ajustes de laa diapositivas"><div class="titlepage"><div><div><h4 class="title"><a name="slide_settings"></a>Ajustes de laa diapositivas</h4></div></div></div><p>
+		</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="toolbar"></a>Barra de Herramientas</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Nuevo</p></li><li class="listitem"><p>Abrir</p></li><li class="listitem"><p>Guardar</p></li><li class="listitem"><p>Importar imágenes </p></li><li class="listitem"><p>Importar audio</p></li><li class="listitem"><p>Suprimir</p></li><li class="listitem"><p>Rotacion en el sentido horario</p></li><li class="listitem"><p>Rotacion en el sentido antihorario</p></li><li class="listitem"><p>Zoom dentro</p></li><li class="listitem"><p>Zoom fuera</p></li><li class="listitem"><p>Zoom aspecto normal</p></li><li class="listitem"><p>Previsualisación</p></li><li class="listitem"><p>Volver a la primera diapositiva</p></li><li class="listitem"><p>Volver a la diapositiva anterior</p></li><li class="listitem"><p>Entre diapositiva</p></li><li class="listitem"><p>Ir a la diapositiva siguiente</p></li><li class="listitem"><p>Ir a la última diapositiva</p></li><li class="listitem"><p>Cerrar</p></li></ul></div><p>Para una explicación detallada consultar <a class="xref" href="#presentacion" title="Menu Presentación">&#8220;Menu Presentación&#8221;</a> et <a class="xref" href="#diapositiva" title="Menu diapositiva">&#8220;Menu diapositiva&#8221;</a> ya que estas opciones son iguales.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="idm75"></a>Zona de trabajo</h3></div></div></div><p>Después de la version 2,0 las secciones Video et Audio se han dividido en dos pestañas "Video" et "Audio". La sección Video contiene los siguientes apartados :</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Ajustes de la diapositivas</p></li><li class="listitem"><p>Movimiento de las diapositivas</p></li><li class="listitem"><p>Texto de las diapositivas</p></li></ul></div><div class="figure"><a name="Video%20Tab"></a><p class="title"><b>Figura 2. Pestaña Video</b></p><div class="figure-contents"><div><img src="images/side_panel_video.png" alt="Pestaña Video"></div></div></div><br class="figure-break"><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_settings"></a>Ajustes de laa diapositivas</h4></div></div></div><p>
 					Esta sección permite escoger una transición al azar o escoger uno en el menú desplegable. Se puede ajustar la velocidad de transición escogiendo entre Rápido, Normal y Lento, y el tiempo en segundos durante el cual la diapositiva debe quedar inmóvil. En definitiva, se puede ver la longitud de la duración total de la presentación. Tengamos en cuenta que por lo menos una diapositiva debe estar seleccionada para que esta sección funcione..
 				</p><p>
 					OBSERVACIÓN: cuando un movimiento es aplicado sobre una diapositiva, el campo durada el desplazamiento es desactivado y no puede ser modificado, ya que la duración de esta parte ahora es calculada como la suma de las duraciones de todos los puntos de parada y automáticamente será puesta al día.
-				</p></div><div class="sect3" title="Movimiento de la diapositiva"><div class="titlepage"><div><div><h4 class="title"><a name="slide_motion"></a>Movimiento de la diapositiva</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_motion"></a>Movimiento de la diapositiva</h4></div></div></div><p>
 					Esta sección permite aplicar sobre una diapositiva los famosos efectos Ken Burns. Basta con comenzar por hacer un zoom antes / atrás y deslizar la imagen con el botón izquierdo del ratón para centrar un detalle sobre la foto. Ahora, haga clic en el botón "Añadir" e Imagination va a añadir un nuevo punto con su nivel de zoom y la posición de la imagen que hemos designado. Se pueden añadir tantos puntos como se quiera.
 				</p><p>
 					Se puede ver cada punto de transición de todo el movimiento, seleccionándolo con las flechas izquierda y derecha, o directamente escribiendo el número del punto de transición en el campo apropiado. Imagination pondrá al corriente su zona de previsualización para mostrarle su punto de transición seleccionado.
@@ -29,7 +29,7 @@
 					para comprobar el efecto añadido.
 				</p><p>
 					OBSERVACIÓN: esta sección está únicamente disponible cuando es seleccionada una sola diapositiva.
-				</p></div><div class="sect3" title="Texto de la diapositiva"><div class="titlepage"><div><div><h4 class="title"><a name="slide_text"></a>Texto de la diapositiva</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_text"></a>Texto de la diapositiva</h4></div></div></div><p>
 					Imagination puede configurar el texto para las diapositivas. Nos situamos en el area apropiada apropiado y el texto se mostrará en la zona de la imagen. Si se desea tener varias líneas de texto, hacer clic en el signo + sobre el lado derecho del campo de texto para ensancharlo.
 				</p><p>
 					Se puede modificar el tamaño, el estilo y los diferentes tipos de texto utilizando el botón de configuración situado debajo del campo de texto. El color es controlado por el botón selector de color a la derecha del botón de configuración de tipos de letras (el color puede también ser transparente).
@@ -41,75 +41,75 @@
 					OBSERVACIÓN: Si la duración del efecto de la animación de texto excede de la duración de la diapositiva, la duración de la diapositiva será sincronizada. Esto es hace de dos maneras: si la diapositiva de movimiento no se ha definido, la parte que concierne a la diapositiva simplemente es aumentada, si la diapositiva tiene una animación aplicada, el último punto de configuración es aumentado para adaptarse.
 				</p><p>
 					¿ Como hacer para tener un texto inmóvil durante un período de tiempo? Nos aseguraremos que la duración de la diapositiva sea más larga que la duración de la animación del texto. Por ejemplo: si queremos tener 6 segundos de movimiento de texto y 4 segundos de texto inmóvil, debemos definir la duración de la animación del texto a 6 segundos y la duración de las diapositivas a 10 segundos (6 segundos de animación de texto + 4 segundos del tiempo inmóvil).
-				</p></div><div class="sect3" title="Pestaña Audio"><div class="titlepage"><div><div><h4 class="title"><a name="audio_tab"></a>Pestaña Audio</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="audio_tab"></a>Pestaña Audio</h4></div></div></div><p>
 					Haciendo clic en el inglete "Audio", la lista de música de fondo es configurada. Aquí se puede ver la longitud de cada uno de los ficheros audio importados, así como la longitud del tiempo total de todos los ficheros audio compatibles (ver más abajo para más información que concierne a la compatibilidad de los ficheros de audio). El botón "play" le permite oir el fichero de audio seleccionado. Las flechas permiten reorganizar los ficheros audio y el último botón elimina los ficheros audio seleccionados..
 				</p><p>
 					Todos los ficheros no pueden ser concatenados. Imagination informará sobre incompatibilidades eventuales cuando se realiza la importación de ficheros de audio. Informaciones más detalladas pueden ser obtenidas a partir de la lista de los ficheros audio. Los ficheros coloreados en rojo tienen un índice de preparación de muestras incompatible, mientras que los de color azul tienen un número incompatible de canales y los de color anaranjado tienen un índice de preparación de muestras y un número de canales incompatibles.. Si se coloca el ratón sobre un fichero de audio, también se puede comprobar aquí cierta información sobre este apartado. En el momento de la exportación, Imagination nos informará sobre todos los ficheros incompatibles en lista de música y le pedirá si está de acuerdo para quitarlos de la presentación.
 				</p><p>
 					El estado actual del soporte de audio en Imagination es bastante limitado. Todos los ficheros de audio compatibles y puestos en la lista son concateandos (no fundidos suaves), y cortados para adaptarse a la longitud total de la presentación (el corte es progresivo con 5 segundos de fundido). Si se desea tener una pista audio más agradable en las presentaciones, probablemente se debería crear la presentación en tres etapas: 1. Crear una diapositiva sin audio (esto nos dará la duración total); 2. Preparar el fichero de audio que exactamente corresponderá a la duración total; 3. Añadir el fichero de audio ya preparado a la presntación y exportar.
                                         Por favor, tenga en cuenta que Imagination NO UTILIZARÁ los ficheros incompatibles para calcular la duración total de la música.
-				</p><div class="figure"><a name="audio_tab_pic"></a><p class="title"><b>Figura 3. Pestaña Audio</b></p><div class="figure-contents"><div><img src="images/side_panel_audio.png" alt="Pestaña Audio"></div></div></div><br class="figure-break"></div></div><div class="sect2" title="Zona de la Imagen"><div class="titlepage"><div><div><h3 class="title"><a name="image_area"></a>Zona de la Imagen</h3></div></div></div><p>Este apartado en la ventana de Imagination ofrece una previsualización a lo largo de la presentación con los puntos y texto configurados. Utilice los controles del zoom para aumentar o disminuir la zona.</p></div><div class="sect2" title="Zona de miniaturas"><div class="titlepage"><div><div><h3 class="title"><a name="thumbnails_area"></a>Zona de miniaturas</h3></div></div></div><p>Ventana de Imagination, la zona de las miniaturas muestra las diapositivas importadas. Pulsar sobre una de ellas y la diapositiva aparece en la zona de la imagen con los parámetros de la presentación en la zona de trabajo. Arrastrar y pegar (Drag and drop) está soportado en el programa, de forma que se pueden importar las fotos preferidas arrastrándolas aquí. La selección agrupada también es posible, seleccionando un grupo de diapositivas pulsando sobre un espacio blanco, luego desplazando el ratón. También se pueden reorganizar las diapositivas manteniendo pulsado el botón izquierdo del ratón y desplazándolo.</p></div><div class="sect2" title="Barra de estado"><div class="titlepage"><div><div><h3 class="title"><a name="status_bar"></a>Barra de estado</h3></div></div></div><p>Como su nombre indica, esta zona, situada debajo de las miniaturas, muestra información sobre el número de transiciones cargadas al comienzo, el número de diapositivas importadas y otras informaciones sobre la diapositiva seleccionada.</p></div></div><div class="sect1" title="Menus de Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="menu"></a>Menus de Imagination</h2></div></div></div><p>
+				</p><div class="figure"><a name="audio_tab_pic"></a><p class="title"><b>Figura 3. Pestaña Audio</b></p><div class="figure-contents"><div><img src="images/side_panel_audio.png" alt="Pestaña Audio"></div></div></div><br class="figure-break"></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="image_area"></a>Zona de la Imagen</h3></div></div></div><p>Este apartado en la ventana de Imagination ofrece una previsualización a lo largo de la presentación con los puntos y texto configurados. Utilice los controles del zoom para aumentar o disminuir la zona.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="thumbnails_area"></a>Zona de miniaturas</h3></div></div></div><p>Ventana de Imagination, la zona de las miniaturas muestra las diapositivas importadas. Pulsar sobre una de ellas y la diapositiva aparece en la zona de la imagen con los parámetros de la presentación en la zona de trabajo. Arrastrar y pegar (Drag and drop) está soportado en el programa, de forma que se pueden importar las fotos preferidas arrastrándolas aquí. La selección agrupada también es posible, seleccionando un grupo de diapositivas pulsando sobre un espacio blanco, luego desplazando el ratón. También se pueden reorganizar las diapositivas manteniendo pulsado el botón izquierdo del ratón y desplazándolo.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="status_bar"></a>Barra de estado</h3></div></div></div><p>Como su nombre indica, esta zona, situada debajo de las miniaturas, muestra información sobre el número de transiciones cargadas al comienzo, el número de diapositivas importadas y otras informaciones sobre la diapositiva seleccionada.</p></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="menu"></a>Menus de Imagination</h2></div></div></div><p>
 			Esta sección describe con detalle los menus de Imagination.
-		</p><div class="sect2" title="Menu Presentación"><div class="titlepage"><div><div><h3 class="title"><a name="presentacion"></a>Menu Presentación</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Nuevo</p></li><li class="listitem"><p>Abrir</p></li><li class="listitem"><p>Guardar</p></li><li class="listitem"><p>Guardar como</p></li><li class="listitem"><p>Cerrar</p></li><li class="listitem"><p>Importar imágenes</p></li><li class="listitem"><p>Importar música</p></li><li class="listitem"><p>Propiedades</p></li><li class="listitem"><p>Previsualisación</p></li><li class="listitem"><p>Exportar</p></li><li class="listitem"><p>Cerrar</p></li></ul></div><div class="sect3" title="Nuevo"><div class="titlepage"><div><div><h4 class="title"><a name="new"></a>Nuevo</h4></div></div></div><div class="figure"><a name="new_dialog"></a><p class="title"><b>Figura 4. Ventana de diálogo "Nuevo"</b></p><div class="figure-contents"><div><img src="images/new_dialog.png" alt='Ventana de diálogo "Nuevo"'></div></div></div><br class="figure-break"><p>
+		</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="presentacion"></a>Menu Presentación</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Nuevo</p></li><li class="listitem"><p>Abrir</p></li><li class="listitem"><p>Guardar</p></li><li class="listitem"><p>Guardar como</p></li><li class="listitem"><p>Cerrar</p></li><li class="listitem"><p>Importar imágenes</p></li><li class="listitem"><p>Importar música</p></li><li class="listitem"><p>Propiedades</p></li><li class="listitem"><p>Previsualisación</p></li><li class="listitem"><p>Exportar</p></li><li class="listitem"><p>Cerrar</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="new"></a>Nuevo</h4></div></div></div><div class="figure"><a name="new_dialog"></a><p class="title"><b>Figura 4. Ventana de diálogo "Nuevo"</b></p><div class="figure-contents"><div><img src="images/new_dialog.png" alt='Ventana de diálogo "Nuevo"'></div></div></div><br class="figure-break"><p>
 					Este menú permite crear una nueva presentación. La ventana de diálogo de propiedades de la presentación se inicia. Se puede escoger el tamaño del vídeo (PAL / NTSC), el redimensionado de la imagen, de modo que cubre toda la pantalla evitando las rayas negras, así como el color de fondo que hay que elegir cuando la imagen es demasiado pequeña y cuando el redimensionado no consigue cubrir toda la pantalla. También se pueden modificar estas opciones más tarde.
-				</p></div><div class="sect3" title="Abrir"><div class="titlepage"><div><div><h4 class="title"><a name="open"></a>Abrir</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="open"></a>Abrir</h4></div></div></div><p>
 					Este menú permite abrir una presentación anteriormente guardada..
-				</p></div><div class="sect3" title="Guardar"><div class="titlepage"><div><div><h4 class="title"><a name="save"></a>Guardar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="save"></a>Guardar</h4></div></div></div><p>
 					Este menú permite guardar una presentación guardada anteriormente. El nombre del fichero no se pedrderá, excepto si todavía no se guardó el proyecto.
-				</p></div><div class="sect3" title="Guardar como"><div class="titlepage"><div><div><h4 class="title"><a name="saveas"></a>Guardar como</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="saveas"></a>Guardar como</h4></div></div></div><p>
 					Este menú le permite guardar una presentación con un nombre de fichero diferente.
-				</p></div><div class="sect3" title="Cerrar"><div class="titlepage"><div><div><h4 class="title"><a name="close"></a>Cerrar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="close"></a>Cerrar</h4></div></div></div><p>
 					Este menu cierra la presentación. Si la diapositiva todavía no se ha guardado o si se modificó algo, Imagination va pedirle guardarlo primero.
-				</p></div><div class="sect3" title="Importar imágenes"><div class="titlepage"><div><div><h4 class="title"><a name="import_pictures"></a>Importar imágenes</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_pictures"></a>Importar imágenes</h4></div></div></div><p>
 					Este menú abre una ventana de diálogo que nos permite escoger las fotos que hay que importar en Imagination. Para seleccionar más de una imagen, apriete y mantenga presionada la tecla MAYÚSCULA haciendo clic en los ficheros. Una barra de progreso se muestra en la barra de estado que nos informará sobre el porcentaje del avance durante la importación de las fotos. Las miniaturas no serán mostradas hasta que se carguen totalmente.
-				</p></div><div class="sect3" title="Importar música"><div class="titlepage"><div><div><h4 class="title"><a name="import_music"></a>Importar música</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_music"></a>Importar música</h4></div></div></div><p>
 					Es igual que el apartado anterior pero con los ficheros audio. Por favor, asegúrese que la libreía libsox que posee en su Sistema es capaz de administrar los formatos de audio seleccionados (puede instalar el software en cualquier distribución basada en  Debian:
 					<em class="citetitle">libsox-fmt-all</em>).
-				</p></div><div class="sect3" title="Propiedades"><div class="titlepage"><div><div><h4 class="title"><a name="properties"></a>Propiedades</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="properties"></a>Propiedades</h4></div></div></div><p>
 					En este apartado seleccionamos las propiedades de la presentación. Consultar <a class="xref" href="#new" title="Nuevo">&#8220;Nuevo&#8221;</a> para un explicación de los parámetros disponibles.
-				</p></div><div class="sect3" title="Previsualizar"><div class="titlepage"><div><div><h4 class="title"><a name="preview_slideshow"></a>Previsualizar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview_slideshow"></a>Previsualizar</h4></div></div></div><p>
 					Este aspecto nos permite comprobar una previsualización del trabajo en la zona de la imagen. Si queremos comprobar el resultado para una diapositiva en concreto, es suficiente con seleccionarla. La calidad de la previsualización depende de lo elegido en el menu <span class="guimenu">Diapositiva</span> &#8594; <span class="guimenuitem">calidad de la previsualiación.</span>.
-				</p></div><div class="sect3" title="Exportar"><div class="titlepage"><div><div><h4 class="title"><a name="export"></a>Exportar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="export"></a>Exportar</h4></div></div></div><p>
 					Este apartado permite exportar la presentación a: VOB (video DVD), OGV (Ogg Theora / Vorbis), FLV (video Flash) y 3GP (teléfonos móviles). Cada formato tiene sus propios parámetros que se deberán configurar en la ventana de diálogo cuando seleccione alguno de ellos. Por favor, asegurarse que todas las bibliotecas y codecs estàn instalados, o habrá errores con ffmpeg , el codificador que Imaginatin utiliza para crear el vídeo. La extensión automáticamente será añadida al nombre del fichero.
-				</p></div><div class="sect3" title="Cerrar"><div class="titlepage"><div><div><h4 class="title"><a name="quit"></a>Cerrar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="quit"></a>Cerrar</h4></div></div></div><p>
 					Esto cierra Imagination. Si la diapositiva no se ha guadado, Imagination preguntará si quiere hacerlo.
-				</p></div></div><div class="sect2" title="Menu diapositiva"><div class="titlepage"><div><div><h3 class="title"><a name="diapositiva"></a>Menu diapositiva</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Cortar</p></li><li class="listitem"><p>Copiar</p></li><li class="listitem"><p>Pegar</p></li><li class="listitem"><p>Calidad de la previsualización</p></li><li class="listitem"><p>Zoom</p></li><li class="listitem"><p>Agreagr una diapositiva vacía</p></li><li class="listitem"><p>Eliminar</p></li><li class="listitem"><p>Informe</p></li><li class="listitem"><p>Rotar en el sentido antihorario </p></li><li class="listitem"><p>Rotar en el sentido horario</p></li><li class="listitem"><p>Seleccionar todo</p></li><li class="listitem"><p>Deseleccionar todo</p></li></ul></div><div class="sect3" title="Cortar"><div class="titlepage"><div><div><h4 class="title"><a name="cut"></a>Cortar</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="diapositiva"></a>Menu diapositiva</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Cortar</p></li><li class="listitem"><p>Copiar</p></li><li class="listitem"><p>Pegar</p></li><li class="listitem"><p>Calidad de la previsualización</p></li><li class="listitem"><p>Zoom</p></li><li class="listitem"><p>Agreagr una diapositiva vacía</p></li><li class="listitem"><p>Eliminar</p></li><li class="listitem"><p>Informe</p></li><li class="listitem"><p>Rotar en el sentido antihorario </p></li><li class="listitem"><p>Rotar en el sentido horario</p></li><li class="listitem"><p>Seleccionar todo</p></li><li class="listitem"><p>Deseleccionar todo</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="cut"></a>Cortar</h4></div></div></div><p>
 					Este apartado del menu permite cortar un cierto número de diapositivas seleccionadas. 
-				</p></div><div class="sect3" title="Copiar"><div class="titlepage"><div><div><h4 class="title"><a name="copy"></a>Copiar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="copy"></a>Copiar</h4></div></div></div><p>
 					Este apartado del menu permite copiar un cierto número de diapositivas seleccionadas. 
-				</p></div><div class="sect3" title="Pegar"><div class="titlepage"><div><div><h4 class="title"><a name="paste"></a>Pegar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="paste"></a>Pegar</h4></div></div></div><p>
 					Antes de escoger "Pegar" hay que pulsar sobre una diapositiva, después de lo cual se podrán cortar las diapositivas anteriormente seleccionadas (si se elige Cortar), o copiadas (si se escoge Copiar).
-				</p></div><div class="sect3" title="Calidad de la previsualización"><div class="titlepage"><div><div><h4 class="title"><a name="preview"></a>Calidad de la previsualización</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview"></a>Calidad de la previsualización</h4></div></div></div><p>
 					Este submenú permite definir calidades diferentes para la previsualización y la calidad de la imagen en la zona de imagen. Esta opción no afecta al vídeo exportado. Su fin principal es acelerar el proceso de creación, ya que la carga de grandes imágenes a partir del disco duro con el tamaño original puede llevar un cierto tiempo (la carga de una imagen 4032x3024 desde el disco tarda 2 segundos sobre un sistema moderno). Tenga en cuenta que la previsualización podría no funcionar correctamente sobre máquinas más lentas cuando la calidad seleccionada es elevada..
-				</p></div><div class="sect3" title="Zoom"><div class="titlepage"><div><div><h4 class="title"><a name="zoom"></a>Zoom</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="zoom"></a>Zoom</h4></div></div></div><p>
 					Este submenú permite aumentar o reducir la zona de imagen. Ha sido añadido con el fin de que Imagination pueda ser utilizado sobre los ordenadores portatiles que tienen una resolución limitada de pantalla. También modifica el tamaño de miniaturas cuando Imaginación está en modo Presentación (por favor, consulte en el menu la ayuda para una explicación de la zona Presentación).
-				</p></div><div class="sect3" title="Agregar una diapositiva vacía"><div class="titlepage"><div><div><h4 class="title"><a name="Add_empty_slide"></a>Agregar una diapositiva vacía</h4></div></div></div><div class="figure"><a name="empty_slide"></a><p class="title"><b>Figura 5. Sección de diálogo "Crear una nueva diapositiva"</b></p><div class="figure-contents"><div><img src="images/empty_slide_dialog.png" alt='Sección de diálogo "Crear una nueva diapositiva"'></div></div></div><br class="figure-break"><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="Add_empty_slide"></a>Agregar una diapositiva vacía</h4></div></div></div><div class="figure"><a name="empty_slide"></a><p class="title"><b>Figura 5. Sección de diálogo "Crear una nueva diapositiva"</b></p><div class="figure-contents"><div><img src="images/empty_slide_dialog.png" alt='Sección de diálogo "Crear una nueva diapositiva"'></div></div></div><br class="figure-break"><p>
 					En este apartado del menú se puede escoger el color de fondo de la diapositiva vacía de tres formas diferentes: 1) con un color sólido, 2) con un degradado lineal, 3) con un degradado radial. Esta funcionalidad es particularmente útil cuando se desea separar las imágenes en grupos distintos, añadiendo diapositivas de texto entre ellos. Si una diapositiva es seleccionada, la diapositiva vacía será añadida al lado de la diapositiva seleccionada, si no: será añadida después de la última diapositiva.
 				</p><p>
 					Las diapositivas creadas de esta manera no son muy diferentes de cualquier otra diapositiva. Se puede añadir texto, títulos, aplicando una animación que da un toque profesional a la presentación.
 				</p><p>
 					Los degradados pueden ser controlados a partir de  dos niveles. El primer nivel consiste en seleccionar el principio y fin del color. El segundo nivel consiste en definir la posición de los puntos de inicio y fín, que son representados por dos cuadrados blancos que pueden ser deslizados alrededor de la zona de previsualización.
-				</p></div><div class="sect3" title="Eliminar"><div class="titlepage"><div><div><h4 class="title"><a name="delete"></a>Eliminar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="delete"></a>Eliminar</h4></div></div></div><p>
 					Esta entrada permite eliminar la diapositiva seleccionada. Manteniendo pulsada la tecka MAYUSCULAS podemos seleccionar varias diapositivas a la vez, o con  CTRL para seleccionar de forma selectiva. ¡A tener en cuenta que esta acción no puede ser anulada !
-				</p></div><div class="sect3" title="Informe"><div class="titlepage"><div><div><h4 class="title"><a name="report"></a>Informe</h4></div></div></div><div class="figure"><a name="slide_report"></a><p class="title"><b>Figura 6. Ventana de diálogo que muestra Información de las transiciones</b></p><div class="figure-contents"><div><img src="images/slide_report_dialog.png" alt="Ventana de diálogo que muestra Información de las transiciones"></div></div></div><br class="figure-break"><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="report"></a>Informe</h4></div></div></div><div class="figure"><a name="slide_report"></a><p class="title"><b>Figura 6. Ventana de diálogo que muestra Información de las transiciones</b></p><div class="figure-contents"><div><img src="images/slide_report_dialog.png" alt="Ventana de diálogo que muestra Información de las transiciones"></div></div></div><br class="figure-break"><p>
 					Esta entrada del menú muestra información sobre las transiciones, donde se puede ver el número de diapositivas que tienen la misma transición.
      Haga clic en la diapositiva para que Imagination lo seleccione automáticamente. Las diapositivas cuya transición es aplicada sólo una sola vez no aparecen aquí. Sería interesante que diese su opinión sobre este apartado, porque no estamos seguros que se trate de una función muy útil. Gracias.
-				</p></div><div class="sect3" title="Rotación en el sentido horario"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_clockwise"></a>Rotación en el sentido horario</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_clockwise"></a>Rotación en el sentido horario</h4></div></div></div><p>
 					Esta entrada permite girar la diapositiva seleccionada en el sentido horario. La imagen original NO SE VE afectada por la rotación si se guarda la presentación y se abre de nuevo, la diapositiva es colocada en su estado de origen antes de la rotación.
-				</p></div><div class="sect3" title="Rotación en el sentido antihorario"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_counterclockwise"></a>Rotación en el sentido antihorario</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_counterclockwise"></a>Rotación en el sentido antihorario</h4></div></div></div><p>
 					Esta entrada permite girar la diapositiva seleccionada en el sentido antihorario. La imagen original NO SE VE afectada por la rotación si se guarda la presentación y se abre de nuevo, la diapositiva es colocada en su estado de origen antes de la rotación.
-				</p></div><div class="sect3" title="Seleccionar todo"><div class="titlepage"><div><div><h4 class="title"><a name="select"></a>Seleccionar todo</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="select"></a>Seleccionar todo</h4></div></div></div><p>
 					¿Necesita alguna explicación? 
-				</p></div><div class="sect3" title="Deseleccionar todo"><div class="titlepage"><div><div><h4 class="title"><a name="unselect"></a>Deseleccionar todo</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="unselect"></a>Deseleccionar todo</h4></div></div></div><p>
 					Igual que el apartado anterior.
-				</p></div></div><div class="sect2" title="Menu Ver"><div class="titlepage"><div><div><h3 class="title"><a name="view"></a>Menu Ver</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Modo Previsualizar</p></li><li class="listitem"><p>Mode Vista general </p></li></ul></div><div class="sect3" title="Modo Previsualizar"><div class="titlepage"><div><div><h4 class="title"><a name="preview_mode"></a>Modo Previsualizar</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="view"></a>Menu Ver</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Modo Previsualizar</p></li><li class="listitem"><p>Mode Vista general </p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview_mode"></a>Modo Previsualizar</h4></div></div></div><p>
 					Este apartado permite ver en modo Previsualizar, la zona de la imagen así como la zona de las miniaturas. El tamaño de la zona de la imagen puede ser aumentada o disminuida con los controles del zoom, para que sea posible utilizar Imagination sobre los ordenadores portatiles, por ejemplo.
-				</p></div><div class="sect3" title="Modode Vista general"><div class="titlepage"><div><div><h4 class="title"><a name="overview_mode"></a>Modode Vista general</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="overview_mode"></a>Modode Vista general</h4></div></div></div><p>
 					Este apartado nos permite elegir el Modo de Vista, la ventana inicial con zona de imagen y las miniaturas cambiarán. En este modo podemos ver las imágenes en una matriz. El tamaño de las miniaturas puede ser controlado con los controles del zoom. Las entradas de menus Cortar / Copiar / Pegar están disponibles. Las diapositivas se pueden organizar seleccionándolas con el botón izquierdo del ratón y desplazándolas.
-				</p></div></div><div class="sect2" title="Menu Ayuda"><div class="titlepage"><div><div><h3 class="title"><a name="help"></a>Menu Ayuda</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Contenidos</p></li><li class="listitem"><p>Acerca de</p></li></ul></div><div class="sect3" title="Contenidos"><div class="titlepage"><div><div><h4 class="title"><a name="content"></a>Contenidos</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="help"></a>Menu Ayuda</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Contenidos</p></li><li class="listitem"><p>Acerca de</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="content"></a>Contenidos</h4></div></div></div><p>
 					Este apartado nos permite consultar la documentación en el navegador predeterminado.
-				</p></div><div class="sect3" title="A cerca de"><div class="titlepage"><div><div><h4 class="title"><a name="about"></a>A cerca de</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="about"></a>A cerca de</h4></div></div></div><p>
 					Este apartado se refiere al diálogo "Acerca de" y los créditos.
-				</p></div></div></div><div class="sect1" title="Licencia"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="license"></a>Licencia</h2></div></div></div><p>
+				</p></div></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="license"></a>Licencia</h2></div></div></div><p>
 			Imagination está bajo la licencia GPL2.
 		</p></div></div></body></html>

imagination-3.0.tar.bz2/doc/es/images/Makefile.in -> imagination-3.4.tar.bz2/doc/es/images/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,61 @@
 # $Id$
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,22 +91,33 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/es/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,8 +139,16 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(imagesdir)"
 DATA = $(images_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -97,6 +170,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -120,6 +194,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -128,8 +207,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -175,6 +256,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -203,11 +285,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -215,6 +298,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -250,7 +334,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es/images/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/es/images/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -276,8 +359,11 @@
 	-rm -rf .libs _libs
 install-imagesDATA: $(images_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(imagesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(imagesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -291,14 +377,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(imagesdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(imagesdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -348,10 +432,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -432,16 +521,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-imagesDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-imagesDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-imagesDATA install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-imagesDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/doc/fr/Makefile.in -> imagination-3.4.tar.bz2/doc/fr/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,61 @@
 
 # $Id$
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,38 +90,70 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/fr
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/imagination.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = imagination.xml
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/imagination.xml.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -114,6 +200,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -137,6 +224,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -145,8 +237,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -192,6 +286,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -220,11 +315,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -232,6 +328,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -270,7 +367,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/fr/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/fr/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -298,22 +394,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -328,57 +427,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -394,12 +448,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -411,15 +460,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -428,6 +473,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -464,13 +524,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -508,10 +565,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -591,23 +653,24 @@
 
 uninstall-am: uninstall-local
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist-hook distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+	check check-am clean clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am dist-hook distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-local
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-local
+
+.PRECIOUS: Makefile
 
 
 all-local: html-build.stamp

imagination-3.0.tar.bz2/doc/fr/html/index.html -> imagination-3.4.tar.bz2/doc/fr/html/index.html Changed

@@ -1,21 +1,21 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Imagination Créateur de Diaporama Vidéo</title><link rel="stylesheet" href="../imagination.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="#index" title="Imagination Créateur de Diaporama Vidéo"><link rel="next" href="#intro" title="Introduction à Imagination"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="fr" class="article" title="Imagination Créateur de Diaporama Vidéo"><div class="titlepage"><div><div><h2 class="title"><a name="index"></a>Imagination Créateur de Diaporama Vidéo</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Giuseppe</span> <span class="surname">Torelli</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Tadej</span> <span class="surname">Borov&#353;ak</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Robert</span> <span class="surname">Chéramy</span></h3></div></div></div><div><p class="releaseinfo">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Imagination Créateur de Diaporama Vidéo</title><link rel="stylesheet" type="text/css" href="../imagination.css"><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="#index" title="Imagination Créateur de Diaporama Vidéo"><link rel="next" href="#intro" title="Introduction à Imagination"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="fr" class="article"><div class="titlepage"><div><div><h2 class="title"><a name="index"></a>Imagination Créateur de Diaporama Vidéo</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Giuseppe</span> <span class="surname">Torelli</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Tadej</span> <span class="surname">Borov&#353;ak</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Robert</span> <span class="surname">Chéramy</span></h3></div></div></div><div><p class="releaseinfo">
 			Ce manuel décrit la version 3.0 de Imagination.
-		</p></div><div><p class="copyright">Copyright © 2009 Giuseppe Torelli</p></div><div><div class="legalnotice" title="Note légale"><a name="legalnotice"></a><p>
+		</p></div><div><p class="copyright">Copyright © 2009 Giuseppe Torelli</p></div><div><div class="legalnotice"><a name="legalnotice"></a><p>
 				Vous avez la permission de copier, distribuer et / ou modifier ce document selon les termes de la licence GNU Free Documentation License, Version 1.1 ou toute version ultérieure publiée par la Free Software Foundation sans section invariante, sans texte de première de couverture, et sans texte de couverture. Le texte de la licence complète est disponible auprès de la
 				<a class="ulink" href="http://www.gnu.org/" target="_top">Free Software Foundation</a>.
-			</p></div></div><div><p class="pubdate">Octobre 2009</p></div></div><hr></div><div class="toc"><p><b>Table des matières</b></p><dl><dt><span class="sect1"><a href="#intro">Introduction à Imagination</a></span></dt><dt><span class="sect1"><a href="#new_format">Nouveau format de projet diaporama</a></span></dt><dt><span class="sect1"><a href="#window">La fenêtre d'Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#toolbar">Barre d'outils</a></span></dt><dt><span class="sect2"><a href="#id444016">Zone de travail</a></span></dt><dt><span class="sect2"><a href="#image_area">Zone de l'image</a></span></dt><dt><span class="sect2"><a href="#thumbnails_area">Zone des miniatures</a></span></dt><dt><span class="sect2"><a href="#status_bar">Barre d'état</a></span></dt></dl></dd><dt><span class="sect1"><a href="#menu">Les Menus d'Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#diaporama">Menu Présentation</a></span></dt><dt><span class="sect2"><a href="#diapositive">Menu diapositive</a></span></dt><dt><span class="sect2"><a href="#view">Menu Affichage</a></span></dt><dt><span class="sect2"><a href="#help">Menu Aide</a></span></dt></dl></dd><dt><span class="sect1"><a href="#license">License</a></span></dt></dl></div><div class="sect1" title="Introduction à Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="intro"></a>Introduction à Imagination</h2></div></div></div><p>
+			</p></div></div><div><p class="pubdate">Octobre 2009</p></div></div><hr></div><div class="toc"><p><b>Table des matières</b></p><dl class="toc"><dt><span class="sect1"><a href="#intro">Introduction à Imagination</a></span></dt><dt><span class="sect1"><a href="#new_format">Nouveau format de projet diaporama</a></span></dt><dt><span class="sect1"><a href="#window">La fenêtre d'Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#toolbar">Barre d'outils</a></span></dt><dt><span class="sect2"><a href="#idm77">Zone de travail</a></span></dt><dt><span class="sect2"><a href="#image_area">Zone de l'image</a></span></dt><dt><span class="sect2"><a href="#thumbnails_area">Zone des miniatures</a></span></dt><dt><span class="sect2"><a href="#status_bar">Barre d'état</a></span></dt></dl></dd><dt><span class="sect1"><a href="#menu">Les Menus d'Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#diaporama">Menu Présentation</a></span></dt><dt><span class="sect2"><a href="#diapositive">Menu diapositive</a></span></dt><dt><span class="sect2"><a href="#view">Menu Affichage</a></span></dt><dt><span class="sect2"><a href="#help">Menu Aide</a></span></dt></dl></dd><dt><span class="sect1"><a href="#license">License</a></span></dt></dl></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="intro"></a>Introduction à Imagination</h2></div></div></div><p>
 				Imagination est un créateur de diaporama vidéo développé en C avec le toolkit GTK 2 et Cairo. Imagination est conçu pour être rapide et facile à utiliser. Son interface utilisateur est claire et intuitive et ne comprend pas d'options par défaut inutiles ou confuses. Elle a besoin de l'encodeur ffmpeg pour produire le fichier vidéo et libsox pour importer les fichiers audio. Vous n'avez pas besoin d'autre logiciel tiers!
-			</p></div><div class="sect1" title="Nouveau format de projet diaporama"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="new_format"></a>Nouveau format de projet diaporama</h2></div></div></div><p>
+			</p></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="new_format"></a>Nouveau format de projet diaporama</h2></div></div></div><p>
 				A partir de cette version 2.0, le format de projet diaporama a changé. Les anciens formats seront reconnus et les diaporamas enregistrés avec ce format seront correctement chargés, mais à partir de la prochaine version, la possibilité d'import des fichiers d'anciens projets (enregistrés avec une version d'Imagination antérieure à 2.0) sera ABANDONNÉE. N'oubliez donc pas de charger TOUS vos vieux projets de diaporama réalisés avec Imagination 2.0 et de les enregistrer à nouveau.
-			</p></div><div class="sect1" title="La fenêtre d'Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="window"></a>La fenêtre d'Imagination</h2></div></div></div><p>
+			</p></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="window"></a>La fenêtre d'Imagination</h2></div></div></div><p>
 			Cette section décrit la zone de la fenêtre d'Imagination : la barre d'outils, la zone de l'image, la zone de travail, la zone des miniatures et la barre d'état.
 		</p><p>
 			</p><div class="figure"><a name="Imagination's%20window"></a><p class="title"><b>Figure 1. Fenêtre d'Imagination</b></p><div class="figure-contents"><div><img src="images/imagination_window.png" alt="Fenêtre d'Imagination"></div></div></div><p><br class="figure-break">
-		</p><div class="sect2" title="Barre d'outils"><div class="titlepage"><div><div><h3 class="title"><a name="toolbar"></a>Barre d'outils</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Nouveau</p></li><li class="listitem"><p>Ouvrir</p></li><li class="listitem"><p>Enregistrer</p></li><li class="listitem"><p>Importer des images </p></li><li class="listitem"><p>Import de la musique</p></li><li class="listitem"><p>Supprimer</p></li><li class="listitem"><p>Rotation dans le sens des aiguilles</p></li><li class="listitem"><p>Rotation dans le sens inverse des aiguilles</p></li><li class="listitem"><p>Zoom avant</p></li><li class="listitem"><p>Zoom arrière</p></li><li class="listitem"><p>Zoom taille Normale</p></li><li class="listitem"><p>Prévisualisation</p></li><li class="listitem"><p>Retourner à la première diapositive</p></li><li class="listitem"><p>Retourner à la diapositive précédente</p></li><li class="listitem"><p>Entrée de diapositive</p></li><li class="listitem"><p>Aller à la prochaine diapositive</p></li><li class="listitem"><p>Aller à la dernière diapositive</p></li><li class="listitem"><p>Quitter</p></li></ul></div><p>Pour une explication détaillée veuillez consulter <a class="xref" href="#diaporama" title="Menu Présentation">la section intitulée « Menu Présentation »</a> et <a class="xref" href="#diapositive" title="Menu diapositive">la section intitulée « Menu diapositive »</a> puisque ces options sont les mêmes.</p></div><div class="sect2" title="Zone de travail"><div class="titlepage"><div><div><h3 class="title"><a name="id444016"></a>Zone de travail</h3></div></div></div><p>Depuis la version 2,0 les parties vidéo et audio ont été scindées en deux onglets séparés nommés "Vidéo" et "Audio". La partie vidéo contient les paramètres suivants :</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Paramètres de la diapositive</p></li><li class="listitem"><p>Mouvement de la diapositive</p></li><li class="listitem"><p>Texte de la diapositive</p></li></ul></div><div class="figure"><a name="Video%20Tab"></a><p class="title"><b>Figure 2. Onglet Vidéo</b></p><div class="figure-contents"><div><img src="images/side_panel_video.png" alt="Onglet Vidéo"></div></div></div><br class="figure-break"><div class="sect3" title="Paramètres de la diapositive"><div class="titlepage"><div><div><h4 class="title"><a name="slide_settings"></a>Paramètres de la diapositive</h4></div></div></div><p>
+		</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="toolbar"></a>Barre d'outils</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Nouveau</p></li><li class="listitem"><p>Ouvrir</p></li><li class="listitem"><p>Enregistrer</p></li><li class="listitem"><p>Importer des images </p></li><li class="listitem"><p>Import de la musique</p></li><li class="listitem"><p>Supprimer</p></li><li class="listitem"><p>Rotation dans le sens des aiguilles</p></li><li class="listitem"><p>Rotation dans le sens inverse des aiguilles</p></li><li class="listitem"><p>Zoom avant</p></li><li class="listitem"><p>Zoom arrière</p></li><li class="listitem"><p>Zoom taille Normale</p></li><li class="listitem"><p>Prévisualisation</p></li><li class="listitem"><p>Retourner à la première diapositive</p></li><li class="listitem"><p>Retourner à la diapositive précédente</p></li><li class="listitem"><p>Entrée de diapositive</p></li><li class="listitem"><p>Aller à la prochaine diapositive</p></li><li class="listitem"><p>Aller à la dernière diapositive</p></li><li class="listitem"><p>Quitter</p></li></ul></div><p>Pour une explication détaillée veuillez consulter <a class="xref" href="#diaporama" title="Menu Présentation">la section intitulée « Menu Présentation »</a> et <a class="xref" href="#diapositive" title="Menu diapositive">la section intitulée « Menu diapositive »</a> puisque ces options sont les mêmes.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="idm77"></a>Zone de travail</h3></div></div></div><p>Depuis la version 2,0 les parties vidéo et audio ont été scindées en deux onglets séparés nommés "Vidéo" et "Audio". La partie vidéo contient les paramètres suivants :</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Paramètres de la diapositive</p></li><li class="listitem"><p>Mouvement de la diapositive</p></li><li class="listitem"><p>Texte de la diapositive</p></li></ul></div><div class="figure"><a name="Video%20Tab"></a><p class="title"><b>Figure 2. Onglet Vidéo</b></p><div class="figure-contents"><div><img src="images/side_panel_video.png" alt="Onglet Vidéo"></div></div></div><br class="figure-break"><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_settings"></a>Paramètres de la diapositive</h4></div></div></div><p>
 					Cette section vous permet de choisir une transition au hasard ou d'en choisir un dans le menu déroulant. Vous pouvez régler la vitesse de transition en choisissant parmi Rapide, Normal et Lent et le temps en secondes pendant lequel la diapositive doit rester immobile. Enfin, vous pouvez voir la longueur de la durée totale du diaporama. Notez qu'au moins une diapositive doit être sélectionnée pour que cette section fonctionne..
 				</p><p>
 					REMARQUE: Quand un mouvement est appliqué à une diapositive, le champ durée du déplacement est désactivé et ne peut pas être modifié, puisque la durée de cette partie est maintenant calculée comme la somme des durées de tous les points d'arrêt et  sera automatiquement mise à jour.
-				</p></div><div class="sect3" title="Mouvement de la diapositive"><div class="titlepage"><div><div><h4 class="title"><a name="slide_motion"></a>Mouvement de la diapositive</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_motion"></a>Mouvement de la diapositive</h4></div></div></div><p>
 					Cette section vous permet d'appliquer les fameux effets Ken Burns sur une diapositive. Il suffit de commencer par faire un zoom avant / arrière et de faire glisser l'image avec le bouton gauche de la souris  pour centrer un détail sur la photo. Maintenant, cliquez sur le bouton Ajouter et Imagination va ajouter un nouveau point d'arrêt avec le niveau de zoom et la position de l'image actuellement sélectionnés. Vous pouvez ajouter autant de points que vous voulez.
 				</p><p>
 					Vous pouvez voir à quoi ressemble chaque point d'arrêt en le sélectionnant avec les flèches gauche et droite ou en entrant directement le numéro du point dans le champ approprié. Imagination mettra à jour sa zone de prévisualisation pour vous montrer votre point d'arrêt sélectionné.
@@ -29,7 +29,7 @@
 					pour avoir un aperçu de l'effet.
 				</p><p>
 					Remarque : Cette section est uniquement disponible quand une seule diapositive est sélectionnée.
-				</p></div><div class="sect3" title="Texte de la diapositive"><div class="titlepage"><div><div><h4 class="title"><a name="slide_text"></a>Texte de la diapositive</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_text"></a>Texte de la diapositive</h4></div></div></div><p>
 					Imagination peut ajouter du texte à vos diapositives. Commencez à taper dans le champ approprié et le texte s'affichera dans la zone de l'image. Si vous souhaitez avoir plusieurs lignes de texte, cliquez sur le signe + sur le côté droit du champ de texte pour l'élargir.
 				</p><p>
 					Vous pouvez modifier la taille, le style et la famille de la police de texte en utilisant le bouton de police situé au-dessous du champ texte. Les couleurs (police et contour) sont contrôlées par les boutons sélecteurs de couleur à droite du bouton de police (la couleur de la police peut aussi être en partie transparente).
@@ -41,79 +41,79 @@
 					REMARQUE: si la durée de la fonction d'animation de texte excède la durée de la diapositive, la durée de la diapositive est synchronisée avec elle. Ceci est fait de deux manières : si la diapositive n'a pas de mouvement appliquée, la partie concernant la diapositive est tout simplement augmentée, si la diapositive a une animation appliquée, le dernier point d'arrêt est augmenté pour s'adapter.
 				</p><p>
 					Comment faire pour avoir un texte immobile pendant une période de temps? Assurez-vous juste que la durée de la diapositive est plus longue que la durée d'animation du texte. Par exemple : si vous voulez avoir 6 secondes de mouvement de texte et 4 secondes de texte immobile, vous devez définir la durée d'animation du texte à 6 secondes et la durée des diapositives à 10 secondes (6 secondes d'animation de texte + 4 secondes de temps immobile).
-				</p></div><div class="sect3" title="Onglet Audio"><div class="titlepage"><div><div><h4 class="title"><a name="audio_tab"></a>Onglet Audio</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="audio_tab"></a>Onglet Audio</h4></div></div></div><p>
 					En cliquant sur l'onglet "Audio", la liste de musique de fond est affichée. Ici vous pouvez voir la longueur de chacun des fichiers audio importés ainsi que la longueur du temps total de tous les fichiers audio compatibles (voir ci-dessous pour plus d'informations concernant la compatibilité des fichiers audio). Le bouton jouer vous permet de prévisualiser le fichier audio sélectionné. Les touches flèches vous permettent de réorganiser les fichiers audio et le dernier supprime les fichiers audio sélectionnés.
 				</p><p>
 					Tous les fichiers ne peuvent être concaténées. Imagination vous informera sur d'éventuelles incompatibilités lorsque vous importez vos fichiers audio. Des informations plus détaillées peuvent être obtenues à partir de la liste des fichiers audio. Les fichiers colorés en rouge ont un taux d'échantillonnage incompatible, tandis que celles de couleur bleue ont un nombre de canaux incompatible et ceux de couleur orange ont un taux d'échantillonnage et un nombre de canaux incompatibles. Si vous placez la souris sur une entrée de fichier audio, vous pourrez également y découvrir quelques informations à ce sujet. Au moment de l'exportation, Imagination vous informera encore sur tous les fichiers incompatibles dans liste de musique et vous demandera si vous êtes d'accord pour les enlever du diaporama.
 				</p><p>
 					L'état actuel du support audio dans Imagination est assez limité. Tous les fichiers audio compatibles listés sont concaténées (pas de fondu enchaîné) et tronqués pour s'adapter à la longueur totale du diaporama (la troncature est progressive avec 5 secondes de fondu). Si vous souhaitez avoir une bande audio plus agréable dans les diaporamas, vous devriez probablement créer votre diaporama en trois étapes :  1.1. Créer un diaporama sans audio (cela vous donnera la durée totale); 2. Préparer le fichier audio qui correspond exactement à la durée; 3. 1. Ajouter le fichier audio préparé au diaporama et exporter.
 					Veuillez noter qu'Imagination N'UTILISERA PAS les fichiers incompatibles pour calculer la durée totale de la musique.
-				</p><div class="figure"><a name="audio_tab_pic"></a><p class="title"><b>Figure 3. Onglet Audio</b></p><div class="figure-contents"><div><img src="images/side_panel_audio.png" alt="Onglet Audio"></div></div></div><br class="figure-break"></div><div class="sect3" title="Onglet Messages"><div class="titlepage"><div><div><h4 class="title"><a name="message_tab"></a>Onglet Messages</h4></div></div></div><p>
+				</p><div class="figure"><a name="audio_tab_pic"></a><p class="title"><b>Figure 3. Onglet Audio</b></p><div class="figure-contents"><div><img src="images/side_panel_audio.png" alt="Onglet Audio"></div></div></div><br class="figure-break"></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="message_tab"></a>Onglet Messages</h4></div></div></div><p>
                     Dans cet onglet, Imagination écrira des messages qui pourraient intéresser l'utilisateur. Si le message est important (par exemple un fichier image manquant), le titre de l'onglet devriendra gras.                
-                </p></div></div><div class="sect2" title="Zone de l'image"><div class="titlepage"><div><div><h3 class="title"><a name="image_area"></a>Zone de l'image</h3></div></div></div><p>Cette partie de la fenêtre d'Imagination donne une prévisualisation tout au long du diaporama avec les points d'arrêt et le texte. Utilisez les commandes de zoom pour agrandir ou rétrécir la zone.</p></div><div class="sect2" title="Zone des miniatures"><div class="titlepage"><div><div><h3 class="title"><a name="thumbnails_area"></a>Zone des miniatures</h3></div></div></div><p>Située dans la partie inférieure de la fenêtre d'Imagination, la zone des miniatures affiche les diapositives importées. Un clic gauche sur l'une d'elles affiche la diapositive dans la zone de l'image avec les paramètres du diaporama dans la zone de travail. Le glisser-déposer est supporté, ainsi vous pouvez importer vos photos préférées en les faisant glisser ici. Le tracé asservi à un point fixe  est aussi supporté ainsi vous pouvez sélectionner un groupe de diapositives par un clic gauche sur un espace blanc, puis en déplaçant la souris. Vous pouvez également réorganiser les diapositives en maintenant enfoncé le bouton gauche de la souris et en les déplaçant.</p></div><div class="sect2" title="Barre d'état"><div class="titlepage"><div><div><h3 class="title"><a name="status_bar"></a>Barre d'état</h3></div></div></div><p>Comme son nom l'indique, cette zone, située au-dessous des miniatures, affiche des informations sur le nombre de transitions chargées au démarrage, le nombre de diapositives importées et quelques informations sur la diapositive elle-même quand une seule diapositive est sélectionnée (sinon le nombre total de diapositives sélectionnées est affiché).</p></div></div><div class="sect1" title="Les Menus d'Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="menu"></a>Les Menus d'Imagination</h2></div></div></div><p>
+                </p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="image_area"></a>Zone de l'image</h3></div></div></div><p>Cette partie de la fenêtre d'Imagination donne une prévisualisation tout au long du diaporama avec les points d'arrêt et le texte. Utilisez les commandes de zoom pour agrandir ou rétrécir la zone.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="thumbnails_area"></a>Zone des miniatures</h3></div></div></div><p>Située dans la partie inférieure de la fenêtre d'Imagination, la zone des miniatures affiche les diapositives importées. Un clic gauche sur l'une d'elles affiche la diapositive dans la zone de l'image avec les paramètres du diaporama dans la zone de travail. Le glisser-déposer est supporté, ainsi vous pouvez importer vos photos préférées en les faisant glisser ici. Le tracé asservi à un point fixe  est aussi supporté ainsi vous pouvez sélectionner un groupe de diapositives par un clic gauche sur un espace blanc, puis en déplaçant la souris. Vous pouvez également réorganiser les diapositives en maintenant enfoncé le bouton gauche de la souris et en les déplaçant.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="status_bar"></a>Barre d'état</h3></div></div></div><p>Comme son nom l'indique, cette zone, située au-dessous des miniatures, affiche des informations sur le nombre de transitions chargées au démarrage, le nombre de diapositives importées et quelques informations sur la diapositive elle-même quand une seule diapositive est sélectionnée (sinon le nombre total de diapositives sélectionnées est affiché).</p></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="menu"></a>Les Menus d'Imagination</h2></div></div></div><p>
 			Cette section décrit en détail les menus d'Imagination.
-		</p><div class="sect2" title="Menu Présentation"><div class="titlepage"><div><div><h3 class="title"><a name="diaporama"></a>Menu Présentation</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Nouveau</p></li><li class="listitem"><p>Ouvrir</p></li><li class="listitem"><p>Importer diaporama</p></li><li class="listitem"><p>Enregistrer</p></li><li class="listitem"><p>Enregistrer sous</p></li><li class="listitem"><p>Fermer</p></li><li class="listitem"><p>Importer des photos</p></li><li class="listitem"><p>Importer de la musique</p></li><li class="listitem"><p>Propriétés</p></li><li class="listitem"><p>Prévisualisation</p></li><li class="listitem"><p>Exporter</p></li><li class="listitem"><p>Quitter</p></li></ul></div><div class="sect3" title="Nouveau"><div class="titlepage"><div><div><h4 class="title"><a name="new"></a>Nouveau</h4></div></div></div><div class="figure"><a name="new_dialog"></a><p class="title"><b>Figure 4. Boite de dialogue Nouveau</b></p><div class="figure-contents"><div><img src="images/new_dialog.png" alt="Boite de dialogue Nouveau"></div></div></div><br class="figure-break"><p>
+		</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="diaporama"></a>Menu Présentation</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Nouveau</p></li><li class="listitem"><p>Ouvrir</p></li><li class="listitem"><p>Importer diaporama</p></li><li class="listitem"><p>Enregistrer</p></li><li class="listitem"><p>Enregistrer sous</p></li><li class="listitem"><p>Fermer</p></li><li class="listitem"><p>Importer des photos</p></li><li class="listitem"><p>Importer de la musique</p></li><li class="listitem"><p>Propriétés</p></li><li class="listitem"><p>Prévisualisation</p></li><li class="listitem"><p>Exporter</p></li><li class="listitem"><p>Quitter</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="new"></a>Nouveau</h4></div></div></div><div class="figure"><a name="new_dialog"></a><p class="title"><b>Figure 4. Boite de dialogue Nouveau</b></p><div class="figure-contents"><div><img src="images/new_dialog.png" alt="Boite de dialogue Nouveau"></div></div></div><br class="figure-break"><p>
 					Ce menu vous permet de créer un nouveau diaporama. La boîte de dialogue diaporama est affichée. Vous pouvez choisir le format vidéo, le redimensionnement de l'image de sorte qu'elle couvre tout l'écran en évitant les rayures noires, ainsi que la couleur de fond à afficher lorsque l'image est trop petite et que le redimensionnement ne réussit pas à couvrir tout l'écran. Vous pouvez également modifier ces options plus tard.
-				</p></div><div class="sect3" title="Ouvrir"><div class="titlepage"><div><div><h4 class="title"><a name="open"></a>Ouvrir</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="open"></a>Ouvrir</h4></div></div></div><p>
 					Ce menu vous permet d'ouvrir un diaporama précédemment enregistré.
-				</p></div><div class="sect3" title="Importer diaporame"><div class="titlepage"><div><div><h4 class="title"><a name="import_slideshow"></a>Importer diaporame</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_slideshow"></a>Importer diaporame</h4></div></div></div><p>
                     Ce menu permet d'ajouter nu diaporama sauvé précédement à la fin du diaporama en cours.
-                </p></div><div class="sect3" title="Enregistrer"><div class="titlepage"><div><div><h4 class="title"><a name="save"></a>Enregistrer</h4></div></div></div><p>
+                </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="save"></a>Enregistrer</h4></div></div></div><p>
 					Ce menu vous permet d'enregistrer un diaporama précédemment enregistré. Le nom de fichier ne sera pas demandé sauf si vous n'avez pas encore enregistré votre projet.
-				</p></div><div class="sect3" title="Enregistrer sous"><div class="titlepage"><div><div><h4 class="title"><a name="saveas"></a>Enregistrer sous</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="saveas"></a>Enregistrer sous</h4></div></div></div><p>
 					Ce menu vous permet d'enregistrer un diaporama avec un nom de fichier différent.
-				</p></div><div class="sect3" title="Fermer"><div class="titlepage"><div><div><h4 class="title"><a name="close"></a>Fermer</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="close"></a>Fermer</h4></div></div></div><p>
 					Ce menu ferme le diaporama. Si le diaporama n'est pas encore enregistré ou si vous avez changé quelque chose, Imagination va vous demander de l'enregistrer d'abord.
-				</p></div><div class="sect3" title="Importer des photos"><div class="titlepage"><div><div><h4 class="title"><a name="import_pictures"></a>Importer des photos</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_pictures"></a>Importer des photos</h4></div></div></div><p>
 					Ce menu ouvre une boite de dialogue vous permettant de choisir les photos à importer dans Imagination. Pour sélectionner plus d'une image, appuyez et maintenez enfoncée la touche MAJUSCULE tout en cliquant sur les fichiers. Une barre de progression est affichée dans la barre d'état vous informant de la progression en pourcentage de l'importation des photos. Les miniatures ne seront pas montrées tant que le chargement n'est pas terminé.
-				</p></div><div class="sect3" title="Importer de la musique"><div class="titlepage"><div><div><h4 class="title"><a name="import_music"></a>Importer de la musique</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_music"></a>Importer de la musique</h4></div></div></div><p>
 					C'est la même démarche que précédemment mais avec les fichiers audio. Veuillez vous assurer que votre libsox est capable de gérer vos formats audio sélectionnés (sur les distributions dérivées de Debian, vous aurez très probablement besoin d'installer le paquet 
 					<em class="citetitle">libsox-fmt-all</em>).
-				</p></div><div class="sect3" title="Propriétés"><div class="titlepage"><div><div><h4 class="title"><a name="properties"></a>Propriétés</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="properties"></a>Propriétés</h4></div></div></div><p>
 					Ce menu affiche une boite de dialogue avec les propriétés du diaporama.  Veuillez consulter <a class="xref" href="#new" title="Nouveau">la section intitulée « Nouveau »</a> pour une explication concernant les paramètres disponibles.
-				</p></div><div class="sect3" title="Prévisualisation"><div class="titlepage"><div><div><h4 class="title"><a name="preview_slideshow"></a>Prévisualisation</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview_slideshow"></a>Prévisualisation</h4></div></div></div><p>
 					Ce menu commence la prévisualisation du diaporama dans la zone d'image. Si vous voulez lancer la prévisualisation par une diapositive en particulier, il suffit de la sélectionner par un clic gauche. La qualité de prévisualisation dépend des paramètres retenus dans le menu <span class="guimenu">Diapositive</span> &#8594; <span class="guimenuitem">qualité de prévisualisation.</span>.
-				</p></div><div class="sect3" title="Exporter"><div class="titlepage"><div><div><h4 class="title"><a name="export"></a>Exporter</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="export"></a>Exporter</h4></div></div></div><p>
 					Ce sous-menu vous permet d'exporter le diaporama dans le format spécifié dans les propriétés : VOB (DVD vidéo) OGV (Ogg Theora / Vorbis), FLV (vidéo Flash) et 3GP (téléphones portables). Chaque format a ses propres paramètres que vous aurez à fixer dans une boite de dialogue quand vous sélectionnez l'un d'entre eux. Veuillez vous assurer que toutes les bibliothèques ont d'abord été installées, sinon vous aurez des erreurs concernant ffmpeg, l'encodeur qu'Imagination utilise pour produire la video.
-				</p></div><div class="sect3" title="Quitter"><div class="titlepage"><div><div><h4 class="title"><a name="quit"></a>Quitter</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="quit"></a>Quitter</h4></div></div></div><p>
 					Ce menu ferme Imagination. Si le diaporama n'est pas encore enregistré, Imagination vous invitera à l'enregistrer d'abord.
-				</p></div></div><div class="sect2" title="Menu diapositive"><div class="titlepage"><div><div><h3 class="title"><a name="diapositive"></a>Menu diapositive</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Couper</p></li><li class="listitem"><p>Copier</p></li><li class="listitem"><p>Coller</p></li><li class="listitem"><p>Qualité de prévisualisation</p></li><li class="listitem"><p>Zoom</p></li><li class="listitem"><p>Ajouter une diapositive vide</p></li><li class="listitem"><p>Supprimer</p></li><li class="listitem"><p>Informations sur les transitions</p></li><li class="listitem"><p>Rotation dans le sens des aiguilles </p></li><li class="listitem"><p>Rotation dans le sens inverse des aiguille</p></li><li class="listitem"><p>Selectionner tout</p></li><li class="listitem"><p>Désélectionner tout</p></li></ul></div><div class="sect3" title="Couper"><div class="titlepage"><div><div><h4 class="title"><a name="cut"></a>Couper</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="diapositive"></a>Menu diapositive</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Couper</p></li><li class="listitem"><p>Copier</p></li><li class="listitem"><p>Coller</p></li><li class="listitem"><p>Qualité de prévisualisation</p></li><li class="listitem"><p>Zoom</p></li><li class="listitem"><p>Ajouter une diapositive vide</p></li><li class="listitem"><p>Supprimer</p></li><li class="listitem"><p>Informations sur les transitions</p></li><li class="listitem"><p>Rotation dans le sens des aiguilles </p></li><li class="listitem"><p>Rotation dans le sens inverse des aiguille</p></li><li class="listitem"><p>Selectionner tout</p></li><li class="listitem"><p>Désélectionner tout</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="cut"></a>Couper</h4></div></div></div><p>
 					Cette entrée de menu vous permet de couper un certain nombre de diapositives sélectionnées. 
-				</p></div><div class="sect3" title="Copier"><div class="titlepage"><div><div><h4 class="title"><a name="copy"></a>Copier</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="copy"></a>Copier</h4></div></div></div><p>
 					Cette entrée de menu vous permet de copier un certain nombre de diapositives sélectionnées. 
-				</p></div><div class="sect3" title="Coller"><div class="titlepage"><div><div><h4 class="title"><a name="paste"></a>Coller</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="paste"></a>Coller</h4></div></div></div><p>
 					Avant de choisir Coller il faut faire un clic gauche sur une diapositive après laquelle vous souhaitez que les diapositives précédemment sélectionnées soient déplacées (si vous avez choisi Couper) ou copiées (si vous choisissez Copier).
-				</p></div><div class="sect3" title="Qualité de prévisualisation"><div class="titlepage"><div><div><h4 class="title"><a name="preview"></a>Qualité de prévisualisation</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview"></a>Qualité de prévisualisation</h4></div></div></div><p>
 					Ce sous-menu vous permet de définir des qualités différentes pour la prévisualisation et la qualité d'image dans la zone d'image. Cette option n'affecte en aucune façon la vidéo exportée. Son but principal est d'accélérer le processus de création, puisque le chargement de grandes images à partir du disque au format original peut prendre un certain temps (le chargement d'une image 4032x3024 depuis le disque prend 2 secondes sur un système moderne). Retenez bien que la prévisualisation pourrait ne pas fonctionner correctement sur des machines plus lentes lorsque la qualité élevée est sélectionnée.
-				</p></div><div class="sect3" title="Zoom"><div class="titlepage"><div><div><h4 class="title"><a name="zoom"></a>Zoom</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="zoom"></a>Zoom</h4></div></div></div><p>
 					Ce sous-menu vous permet d'agrandir ou réduire la zone d'image. Il a été ajouté afin qu'Imagination puisse être utilisé sur les ordinateurs portables qui ont une résolution d'écran limitée. Il modifie également la taille des miniatures quand Imagination est en mode Présentation (veuillez consulter le menu Affichage pour une explication de la zone Présentation).
-				</p></div><div class="sect3" title="Ajouter diapositive vide"><div class="titlepage"><div><div><h4 class="title"><a name="Add_empty_slide"></a>Ajouter diapositive vide</h4></div></div></div><div class="figure"><a name="empty_slide"></a><p class="title"><b>Figure 5. Boite de dialogue Créer une nouvelle diapositive</b></p><div class="figure-contents"><div><img src="images/empty_slide_dialog.png" alt="Boite de dialogue Créer une nouvelle diapositive"></div></div></div><br class="figure-break"><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="Add_empty_slide"></a>Ajouter diapositive vide</h4></div></div></div><div class="figure"><a name="empty_slide"></a><p class="title"><b>Figure 5. Boite de dialogue Créer une nouvelle diapositive</b></p><div class="figure-contents"><div><img src="images/empty_slide_dialog.png" alt="Boite de dialogue Créer une nouvelle diapositive"></div></div></div><br class="figure-break"><p>
 					Cette entrée de menu affiche la fenêtre ci-dessus où vous pouvez choisir la couleur de fond de la diapositive vide de trois manières différentes : 1) avec une couleur unie, 2) avec un dégradé linéaire, 3) avec un dégradé radial. Cette fonctionnalité est particulièrement utile lorsque vous souhaitez séparer vos images dans des groupes distincts en ajoutant des diapositives de texte simple entre eux. Si une diapositive est sélectionnée, la diapositive vide sera ajoutée à côté de la diapositive sélectionnée sinon elle sera ajoutée après la dernière diapositive.
 				</p><p>
 					Les diapositives créées de cette manière ne sont en rien différentes de n'importe quelle autre diapositive. Vous pouvez toujours y ajouter du texte et les améliorer en appliquant une animation.
 				</p><p>
 					Les dégradés peuvent être contrôlés sur deux niveaux. Le premier niveau consiste à sélectionner le début et la fin de la couleur. Le deuxième niveau consiste à définir la position des points d'arrêt qui sont représentés par deux carrés blancs peuvant être glissés autour de la zone de prévisualisation.
-				</p></div><div class="sect3" title="Supprimer"><div class="titlepage"><div><div><h4 class="title"><a name="delete"></a>Supprimer</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="delete"></a>Supprimer</h4></div></div></div><p>
 					Cette entrée de menu supprime les diapositives sélectionnées. Maintenez la touche MAJUSCULE enfoncée pour sélectionner plusieurs diapositives à la fois ou CTRL pour sélectionner de manière sélective. Retenez bien que cette action ne peut pas être annulée !
-				</p></div><div class="sect3" title="Rapport"><div class="titlepage"><div><div><h4 class="title"><a name="report"></a>Rapport</h4></div></div></div><div class="figure"><a name="slide_report"></a><p class="title"><b>Figure 6. Boite de dialogue Informations sur les transitions</b></p><div class="figure-contents"><div><img src="images/slide_report_dialog.png" alt="Boite de dialogue Informations sur les transitions"></div></div></div><br class="figure-break"><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="report"></a>Rapport</h4></div></div></div><div class="figure"><a name="slide_report"></a><p class="title"><b>Figure 6. Boite de dialogue Informations sur les transitions</b></p><div class="figure-contents"><div><img src="images/slide_report_dialog.png" alt="Boite de dialogue Informations sur les transitions"></div></div></div><br class="figure-break"><p>
 					Cette entrée de menu vous montre la boite de dialogue des informations sur les transitions où vous pouvez voir le nombre de diapositives qui ont la même transition.
 					Cliquez sur la diapositive pour qu'Imagination la sélectionne automatiquement. Les diapositives dont la transition n'est appliquée qu'une seule fois ne sont pas montréees ici. Vous seriez aimable de donner votre avis sur cette question car nous ne sommes pas sûrs qu'il s'agisse d'une fonction utile. Merci.
-				</p></div><div class="sect3" title="Rotation dans le sens des aiguilles"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_clockwise"></a>Rotation dans le sens des aiguilles</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_clockwise"></a>Rotation dans le sens des aiguilles</h4></div></div></div><p>
 					Cette entrée vous permet de faire pivoter la diapositive sélectionnée dans le sens horaire. L'image sur le disque N'EST PAS affectée par la rotation donc si vous enregistrez le diaporama et que vous le chargez à nouveau, la diapositive est affichée à son état d'origine avant la rotation.
-				</p></div><div class="sect3" title="Rotation dans le sens inverse des aiguilles"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_counterclockwise"></a>Rotation dans le sens inverse des aiguilles</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_counterclockwise"></a>Rotation dans le sens inverse des aiguilles</h4></div></div></div><p>
 					Cette entrée permet de faire pivoter la diapositive sélectionnée dans le sens inverse des aiguilles d'une montre. L'image sur le disque N'EST pas affectée par la rotation donc si vous enregistrez le diaporama et que vous le chargez à nouveau, la diapositive est affichée à son état d'origine avant la rotation.
-				</p></div><div class="sect3" title="Selectionner tout"><div class="titlepage"><div><div><h4 class="title"><a name="select"></a>Selectionner tout</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="select"></a>Selectionner tout</h4></div></div></div><p>
 					Cette entrée a-t-elle besoin d'être expliquée? 
-				</p></div><div class="sect3" title="Désélectionner tout"><div class="titlepage"><div><div><h4 class="title"><a name="unselect"></a>Désélectionner tout</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="unselect"></a>Désélectionner tout</h4></div></div></div><p>
 					Même remarque que précédemment.
-				</p></div></div><div class="sect2" title="Menu Affichage"><div class="titlepage"><div><div><h3 class="title"><a name="view"></a>Menu Affichage</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Mode Prévisualisation</p></li><li class="listitem"><p>Mode Vue d'ensemble</p></li></ul></div><div class="sect3" title="Mode Prévisualisation"><div class="titlepage"><div><div><h4 class="title"><a name="preview_mode"></a>Mode Prévisualisation</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="view"></a>Menu Affichage</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Mode Prévisualisation</p></li><li class="listitem"><p>Mode Vue d'ensemble</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview_mode"></a>Mode Prévisualisation</h4></div></div></div><p>
 					Cette entrée vous permet de basculer en mode Prévisualisation , la zone de l'image ainsi que la zone des miniatures sont affichées. La taille de la zone de l'image peut être agrandie ou rétrécie avec les commandes de zoom pour qu'il soit possible d'utiliser Imagination sur les ordinateurs portables.
-				</p></div><div class="sect3" title="Mode Vue d'ensemble"><div class="titlepage"><div><div><h4 class="title"><a name="overview_mode"></a>Mode Vue d'ensemble</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="overview_mode"></a>Mode Vue d'ensemble</h4></div></div></div><p>
 					Cette entrée vous permet de basculer en mode Vue d'ensemble, la zone de l'image ainsi que la zone des miniatures sont cachées. Ce mode vous permet d'organiser les diapositives dans une matrice. La taille des miniatures peut être augmentée ou diminuée avec les commandes de zoom. Les entrées de menus Couper / Copier / Coller sont supportés. Les diapositives peuvent aussi être organisées en maintenant appuyé le bouton gauche de la souris et en les déplaçant.
-				</p></div></div><div class="sect2" title="Menu Aide"><div class="titlepage"><div><div><h3 class="title"><a name="help"></a>Menu Aide</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Sommaire</p></li><li class="listitem"><p>À propos</p></li></ul></div><div class="sect3" title="Sommaire"><div class="titlepage"><div><div><h4 class="title"><a name="content"></a>Sommaire</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="help"></a>Menu Aide</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Sommaire</p></li><li class="listitem"><p>À propos</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="content"></a>Sommaire</h4></div></div></div><p>
 					Cette entrée vous permet d'afficher cette documentation HTML dans le navigateur installé.
-				</p></div><div class="sect3" title="À propos"><div class="titlepage"><div><div><h4 class="title"><a name="about"></a>À propos</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="about"></a>À propos</h4></div></div></div><p>
 					Cette entrée affiche la boite de dialogue À propos avec les crédits.
-				</p></div></div></div><div class="sect1" title="License"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="license"></a>License</h2></div></div></div><p>
+				</p></div></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="license"></a>License</h2></div></div></div><p>
 			Imagination est sous licence GPL2.
 		</p></div></div></body></html>

imagination-3.0.tar.bz2/doc/fr/images/Makefile.in -> imagination-3.4.tar.bz2/doc/fr/images/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,61 @@
 # $Id$
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,22 +91,33 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/fr/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,8 +139,16 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(imagesdir)"
 DATA = $(images_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -97,6 +170,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -120,6 +194,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -128,8 +207,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -175,6 +256,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -203,11 +285,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -215,6 +298,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -250,7 +334,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/fr/images/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/fr/images/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -276,8 +359,11 @@
 	-rm -rf .libs _libs
 install-imagesDATA: $(images_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(imagesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(imagesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -291,14 +377,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(imagesdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(imagesdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -348,10 +432,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -432,16 +521,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-imagesDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-imagesDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-imagesDATA install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-imagesDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/doc/pt_BR/Makefile.in -> imagination-3.4.tar.bz2/doc/pt_BR/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,61 @@
 
 # $Id$
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,38 +90,70 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/pt_BR
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/imagination.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = imagination.xml
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/imagination.xml.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -114,6 +200,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -137,6 +224,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -145,8 +237,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -192,6 +286,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -220,11 +315,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -232,6 +328,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -270,7 +367,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/pt_BR/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -298,22 +394,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -328,57 +427,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -394,12 +448,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -411,15 +460,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -428,6 +473,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -464,13 +524,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -508,10 +565,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -591,23 +653,24 @@
 
 uninstall-am: uninstall-local
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist-hook distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+	check check-am clean clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am dist-hook distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-local
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-local
+
+.PRECIOUS: Makefile
 
 
 all-local: html-build.stamp

imagination-3.0.tar.bz2/doc/pt_BR/html/index.html -> imagination-3.4.tar.bz2/doc/pt_BR/html/index.html Changed

@@ -1,27 +1,27 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Criador de Apresentações de Slides para DVD Imagination</title><link rel="stylesheet" href="../imagination.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="#index" title="Criador de Apresentações de Slides para DVD Imagination"><link rel="next" href="#intro" title="Introdução ao Imagination"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="pt" class="article" title="Criador de Apresentações de Slides para DVD Imagination"><div class="titlepage"><div><div><h2 class="title"><a name="index"></a>Criador de Apresentações de Slides para DVD Imagination</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Giuseppe</span> <span class="surname">Torelli</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Tadej</span> <span class="surname">Borov&#353;ak</span></h3></div></div></div><div><p class="releaseinfo">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Criador de Apresentações de Slides para DVD Imagination</title><link rel="stylesheet" type="text/css" href="../imagination.css"><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="#index" title="Criador de Apresentações de Slides para DVD Imagination"><link rel="next" href="#intro" title="Introdução ao Imagination"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="pt" class="article"><div class="titlepage"><div><div><h2 class="title"><a name="index"></a>Criador de Apresentações de Slides para DVD Imagination</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Giuseppe</span> <span class="surname">Torelli</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Tadej</span> <span class="surname">Borov&#353;ak</span></h3></div></div></div><div><p class="releaseinfo">
 			Este manual descreve a versão 3.0 do Imagination.
-		</p></div><div><p class="copyright">Copyright © 2009 Giuseppe Torelli</p></div><div><div class="legalnotice" title="Aviso Legal"><a name="legalnotice"></a><p>
+		</p></div><div><p class="copyright">Copyright © 2009 Giuseppe Torelli</p></div><div><div class="legalnotice"><a name="legalnotice"></a><p>
 				É dada permissão para copiar, distribuir e/ou modificar este documento
 				nos termos da GNU Free Documentation License, Versão 1.1 ou qualquer
 				versão posterior publicada pela Free Software Foundation; sem Seções
 				Invariantes e sem Textos de Capa ou Contra-Capa. O texto completo da
 				licença está disponível na
 				<a class="ulink" href="http://www.gnu.org/" target="_top">Free Software Foundation</a>.
-			</p></div></div><div><p class="pubdate">October 2009</p></div></div><hr></div><div class="toc"><p><b>Índice</b></p><dl><dt><span class="sect1"><a href="#intro">Introdução ao Imagination</a></span></dt><dt><span class="sect1"><a href="#new_format">Novo formato de projeto de apresentação de slides</a></span></dt><dt><span class="sect1"><a href="#window">A janela do Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#toolbar">Barra de Tarefas</a></span></dt><dt><span class="sect2"><a href="#id552684">Área de Trabalho</a></span></dt><dt><span class="sect2"><a href="#image_area">Área de Imagem</a></span></dt><dt><span class="sect2"><a href="#thumbnails_area">Área das Miniaturas</a></span></dt><dt><span class="sect2"><a href="#status_bar">Barra de Estado</a></span></dt></dl></dd><dt><span class="sect1"><a href="#menu">Menus do Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#slideshow">Menu Apresentação de Slides</a></span></dt><dt><span class="sect2"><a href="#slide">Menu Slide</a></span></dt><dt><span class="sect2"><a href="#view">Menu Ver</a></span></dt><dt><span class="sect2"><a href="#help">Menu Ajuda</a></span></dt></dl></dd><dt><span class="sect1"><a href="#license">Licença</a></span></dt></dl></div><div class="sect1" title="Introdução ao Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="intro"></a>Introdução ao Imagination</h2></div></div></div><p>
+			</p></div></div><div><p class="pubdate">October 2009</p></div></div><hr></div><div class="toc"><p><b>Índice</b></p><dl class="toc"><dt><span class="sect1"><a href="#intro">Introdução ao Imagination</a></span></dt><dt><span class="sect1"><a href="#new_format">Novo formato de projeto de apresentação de slides</a></span></dt><dt><span class="sect1"><a href="#window">A janela do Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#toolbar">Barra de Tarefas</a></span></dt><dt><span class="sect2"><a href="#idm73">Área de Trabalho</a></span></dt><dt><span class="sect2"><a href="#image_area">Área de Imagem</a></span></dt><dt><span class="sect2"><a href="#thumbnails_area">Área das Miniaturas</a></span></dt><dt><span class="sect2"><a href="#status_bar">Barra de Estado</a></span></dt></dl></dd><dt><span class="sect1"><a href="#menu">Menus do Imagination</a></span></dt><dd><dl><dt><span class="sect2"><a href="#slideshow">Menu Apresentação de Slides</a></span></dt><dt><span class="sect2"><a href="#slide">Menu Slide</a></span></dt><dt><span class="sect2"><a href="#view">Menu Ver</a></span></dt><dt><span class="sect2"><a href="#help">Menu Ajuda</a></span></dt></dl></dd><dt><span class="sect1"><a href="#license">Licença</a></span></dt></dl></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="intro"></a>Introdução ao Imagination</h2></div></div></div><p>
 				O Imagination é um criador de apresentações de slides para DVD leve desenvolvido em C com o GTK+2 toolkit e o Cairo. O Imagination
 				é pensado para ser rápido e fácil de usar. A sua interface do usuário é limpa e intuitiva e não inclui nenhuma opção confusa ou
 				desnecessária por padrão. Ele requer o codificador ffmpeg para produzir o arquivo de vídeo e libsox para importar os arquivos de áudio.
 				Sim, você não necessita de nenhum outro software extra!
-			</p></div><div class="sect1" title="Novo formato de projeto de apresentação de slides"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="new_format"></a>Novo formato de projeto de apresentação de slides</h2></div></div></div><p>
+			</p></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="new_format"></a>Novo formato de projeto de apresentação de slides</h2></div></div></div><p>
 				A partir da versão 2.0 o formato de projeto de apresentação de slides do Imagination mudou. O formato antigo será reconhecido e as apresentações
 				salvas nesse formato serão carregadas corretamente, mas na próxima versão o suporte para os arquivos de projeto de apresentações antigos
 				(salvos com versões do Imagination anteriores à 2.0) será <span class="emphasis"><em>ENCERRADO</em></span>. Por favor, certifique-se de carregar TODOS
 				os seus projetos de apresentações de slides antigos no Imagination 3.0 e salvá-los novamente.
-			</p></div><div class="sect1" title="A janela do Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="window"></a>A janela do Imagination</h2></div></div></div><p>
+			</p></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="window"></a>A janela do Imagination</h2></div></div></div><p>
 			Esta seção descreve as áreas da janela do Imagination: a barra de tarefas, a área de imagem, a área de trabalho, a área das miniaturas e a barra de estado.
 		</p><p>
 			</p><div class="figure"><a name="imagination_window"></a><p class="title"><b>Figura 1. A janela do Imagination</b></p><div class="figure-contents"><div><img src="images/imagination_window.png" alt="A janela do Imagination"></div></div></div><p><br class="figure-break">
-		</p><div class="sect2" title="Barra de Tarefas"><div class="titlepage"><div><div><h3 class="title"><a name="toolbar"></a>Barra de Tarefas</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Criar uma nova apresentação de slides</p></li><li class="listitem"><p>Abrir uma apresentação de slides</p></li><li class="listitem"><p>Salvar a apresentação de slides</p></li><li class="listitem"><p>Importar imagens</p></li><li class="listitem"><p>Importar música</p></li><li class="listitem"><p>Excluir os slides selecionados</p></li><li class="listitem"><p>Rotacionar o slide no sentido anti-horário</p></li><li class="listitem"><p>Rotacionar o slide no sentido horário</p></li><li class="listitem"><p>Ampliar</p></li><li class="listitem"><p>Reduzir</p></li><li class="listitem"><p>Tamanho normal</p></li><li class="listitem"><p>Iniciar a visualização</p></li><li class="listitem"><p>Ir para o primeiro slide</p></li><li class="listitem"><p>Ir para o slide anterior</p></li><li class="listitem"><p>Janela do slide</p></li><li class="listitem"><p>Ir para o próximo slide</p></li><li class="listitem"><p>Ir para o último slide</p></li></ul></div><p>Para uma explicação detalhada, por favor veja a seção <a class="xref" href="#slideshow" title="Menu Apresentação de Slides">&#8220;Menu Apresentação de Slides&#8221;</a> e a seção <a class="xref" href="#slide" title="Menu Slide">&#8220;Menu Slide&#8221;</a> visto que as opções são as mesmas.</p></div><div class="sect2" title="Área de Trabalho"><div class="titlepage"><div><div><h3 class="title"><a name="id552684"></a>Área de Trabalho</h3></div></div></div><p>A partir da versão 2.0, vídeo e áudio estão em duas abas separadas, Vídeo e Áudio. A aba Vídeo contém as seguintes opções de configuração:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Configurações do slide</p></li><li class="listitem"><p>Movimento do slide</p></li><li class="listitem"><p>Texto do slide</p></li></ul></div><div class="figure"><a name="video_tab"></a><p class="title"><b>Figura 2. Aba Vídeo</b></p><div class="figure-contents"><div><img src="images/side_panel_video.png" alt="Aba Vídeo"></div></div></div><br class="figure-break"><div class="sect3" title="Configurações do slide"><div class="titlepage"><div><div><h4 class="title"><a name="slide_settings"></a>Configurações do slide</h4></div></div></div><p>
+		</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="toolbar"></a>Barra de Tarefas</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Criar uma nova apresentação de slides</p></li><li class="listitem"><p>Abrir uma apresentação de slides</p></li><li class="listitem"><p>Salvar a apresentação de slides</p></li><li class="listitem"><p>Importar imagens</p></li><li class="listitem"><p>Importar música</p></li><li class="listitem"><p>Excluir os slides selecionados</p></li><li class="listitem"><p>Rotacionar o slide no sentido anti-horário</p></li><li class="listitem"><p>Rotacionar o slide no sentido horário</p></li><li class="listitem"><p>Ampliar</p></li><li class="listitem"><p>Reduzir</p></li><li class="listitem"><p>Tamanho normal</p></li><li class="listitem"><p>Iniciar a visualização</p></li><li class="listitem"><p>Ir para o primeiro slide</p></li><li class="listitem"><p>Ir para o slide anterior</p></li><li class="listitem"><p>Janela do slide</p></li><li class="listitem"><p>Ir para o próximo slide</p></li><li class="listitem"><p>Ir para o último slide</p></li></ul></div><p>Para uma explicação detalhada, por favor veja a seção <a class="xref" href="#slideshow" title="Menu Apresentação de Slides">&#8220;Menu Apresentação de Slides&#8221;</a> e a seção <a class="xref" href="#slide" title="Menu Slide">&#8220;Menu Slide&#8221;</a> visto que as opções são as mesmas.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="idm73"></a>Área de Trabalho</h3></div></div></div><p>A partir da versão 2.0, vídeo e áudio estão em duas abas separadas, Vídeo e Áudio. A aba Vídeo contém as seguintes opções de configuração:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Configurações do slide</p></li><li class="listitem"><p>Movimento do slide</p></li><li class="listitem"><p>Texto do slide</p></li></ul></div><div class="figure"><a name="video_tab"></a><p class="title"><b>Figura 2. Aba Vídeo</b></p><div class="figure-contents"><div><img src="images/side_panel_video.png" alt="Aba Vídeo"></div></div></div><br class="figure-break"><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_settings"></a>Configurações do slide</h4></div></div></div><p>
 					Essa seção permite que se escolha uma transição pelo menu
 					expansível ou uma aleatória entre as disponíveis. Pode-se
 					definir a velocidade da transição entre as opções Rápida,
@@ -35,7 +35,7 @@
 					ser modificado, visto que o tempo em que ele fica parado
 					passa a ser calculado pela soma da duração de todos
 					os pontos de parada e será automaticamente atualizado.
-				</p></div><div class="sect3" title="Movimento do slide"><div class="titlepage"><div><div><h4 class="title"><a name="slide_motion"></a>Movimento do slide</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_motion"></a>Movimento do slide</h4></div></div></div><p>
 					Essa seção permite que se aplique os famosos efeitos
 					Ken Burns num slide. Comece por aumentar ou diminuir
 					o zoom e arrastar a imagem com o botão esquerdo do mouse
@@ -65,7 +65,7 @@
 				</p><p>
 					NOTA: essa seção está disponível quando somente um slide
 					está selecionado.
-				</p></div><div class="sect3" title="Texto do slide"><div class="titlepage"><div><div><h4 class="title"><a name="slide_text"></a>Texto do slide</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="slide_text"></a>Texto do slide</h4></div></div></div><p>
 					O Imagination pode adicionar texto aos seus slides.
 					Apenas comece a escrever no campo apropriado e o texto
 					aparecerá na área de imagem. Se você quiser um texto
@@ -107,7 +107,7 @@
 					definir a duração da animação do texto para 6 segundos
 					e a duração do slide para 10 segundos (6 segundos de
 					animação do texto + 4 segundos de texto parado).
-				</p></div><div class="sect3" title="Aba Áudio"><div class="titlepage"><div><div><h4 class="title"><a name="audio_tab"></a>Aba Áudio</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="audio_tab"></a>Aba Áudio</h4></div></div></div><p>
 					Ao clicar na aba Áudio a música de fundo é exibida.
 					Aqui pode-se ver a duração de cada arquivo de música
 					importado assim como o tempo total de todos os arquivos
@@ -144,22 +144,22 @@
 					o áudio preparado à apresentação e exportar. Por favor,
 					note que o Imagination NÃO usará arquivos de áudio
 					incompatíveis para calcular a duração total da música.
-				</p><div class="figure"><a name="audio_tab_pic"></a><p class="title"><b>Figura 3. Aba Áudio</b></p><div class="figure-contents"><div><img src="images/side_panel_audio.png" alt="Aba Áudio"></div></div></div><br class="figure-break"></div></div><div class="sect2" title="Área de Imagem"><div class="titlepage"><div><div><h3 class="title"><a name="image_area"></a>Área de Imagem</h3></div></div></div><p>Essa parte da janela do Imagination exibe uma previsão da apresentação de slides com os pontos de parada e o texto. Use os controles de zoom para ampliar ou reduzir a visualização.</p></div><div class="sect2" title="Área das Miniaturas"><div class="titlepage"><div><div><h3 class="title"><a name="thumbnails_area"></a>Área das Miniaturas</h3></div></div></div><p>Localizada na parte inferior da janela do Imagination, a área das miniaturas exibe os slides importados. Clicar com o botão esquerdo do mouse sobre um deles exibe-o na área de imagem assim como as suas configurações na área de trabalho. Arrastar e soltar é suportado então você pode importar suas imagens favoritas arrastando-as até aqui. Amarração é suportada também então é possível selecionar um grupo de slides clicando-se com o botão esquerdo em um espaço em branco e movimentando o mouse. Você pode ainda reordenar os slides movimentando-os mantendo o botão esquerdo do mouse pressionado.</p></div><div class="sect2" title="Barra de Estado"><div class="titlepage"><div><div><h3 class="title"><a name="status_bar"></a>Barra de Estado</h3></div></div></div><p>Como sugerido pelo seu nome, essa área, localizada sob a área das miniaturas, exibe informação sobre o número de transições carregadas ao iniciar, o número de slides importados e alguma informação sobre o próprio slide quando apenas um slide estiver selecionado (de outro modo, o número total de slides selecionados é exibido).</p></div></div><div class="sect1" title="Menus do Imagination"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="menu"></a>Menus do Imagination</h2></div></div></div><p>
+				</p><div class="figure"><a name="audio_tab_pic"></a><p class="title"><b>Figura 3. Aba Áudio</b></p><div class="figure-contents"><div><img src="images/side_panel_audio.png" alt="Aba Áudio"></div></div></div><br class="figure-break"></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="image_area"></a>Área de Imagem</h3></div></div></div><p>Essa parte da janela do Imagination exibe uma previsão da apresentação de slides com os pontos de parada e o texto. Use os controles de zoom para ampliar ou reduzir a visualização.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="thumbnails_area"></a>Área das Miniaturas</h3></div></div></div><p>Localizada na parte inferior da janela do Imagination, a área das miniaturas exibe os slides importados. Clicar com o botão esquerdo do mouse sobre um deles exibe-o na área de imagem assim como as suas configurações na área de trabalho. Arrastar e soltar é suportado então você pode importar suas imagens favoritas arrastando-as até aqui. Amarração é suportada também então é possível selecionar um grupo de slides clicando-se com o botão esquerdo em um espaço em branco e movimentando o mouse. Você pode ainda reordenar os slides movimentando-os mantendo o botão esquerdo do mouse pressionado.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="status_bar"></a>Barra de Estado</h3></div></div></div><p>Como sugerido pelo seu nome, essa área, localizada sob a área das miniaturas, exibe informação sobre o número de transições carregadas ao iniciar, o número de slides importados e alguma informação sobre o próprio slide quando apenas um slide estiver selecionado (de outro modo, o número total de slides selecionados é exibido).</p></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="menu"></a>Menus do Imagination</h2></div></div></div><p>
 			Esta seção descreve em detalhes os menus do Imagination.
-		</p><div class="sect2" title="Menu Apresentação de Slides"><div class="titlepage"><div><div><h3 class="title"><a name="slideshow"></a>Menu Apresentação de Slides</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Novo</p></li><li class="listitem"><p>Abrir</p></li><li class="listitem"><p>Salvar</p></li><li class="listitem"><p>Salvar como</p></li><li class="listitem"><p>Fechar</p></li><li class="listitem"><p>Importar imagens</p></li><li class="listitem"><p>Importar música</p></li><li class="listitem"><p>Propriedades</p></li><li class="listitem"><p>Visualização</p></li><li class="listitem"><p>Exportar</p></li><li class="listitem"><p>Sair</p></li></ul></div><div class="sect3" title="Novo"><div class="titlepage"><div><div><h4 class="title"><a name="new"></a>Novo</h4></div></div></div><div class="figure"><a name="new_dialog"></a><p class="title"><b>Figura 4. Diálogo Novo</b></p><div class="figure-contents"><div><img src="images/new_dialog.png" alt="Diálogo Novo"></div></div></div><br class="figure-break"><p>
+		</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="slideshow"></a>Menu Apresentação de Slides</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Novo</p></li><li class="listitem"><p>Abrir</p></li><li class="listitem"><p>Salvar</p></li><li class="listitem"><p>Salvar como</p></li><li class="listitem"><p>Fechar</p></li><li class="listitem"><p>Importar imagens</p></li><li class="listitem"><p>Importar música</p></li><li class="listitem"><p>Propriedades</p></li><li class="listitem"><p>Visualização</p></li><li class="listitem"><p>Exportar</p></li><li class="listitem"><p>Sair</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="new"></a>Novo</h4></div></div></div><div class="figure"><a name="new_dialog"></a><p class="title"><b>Figura 4. Diálogo Novo</b></p><div class="figure-contents"><div><img src="images/new_dialog.png" alt="Diálogo Novo"></div></div></div><br class="figure-break"><p>
 					Essa entrada permite que você crie uma nova apresentação de slides. O diálogo da apresentação de slides é exibido. Você pode escolher o formato de vídeo (PAL/NTSC), se se escala as imagens de modo que cubram toda a tela evitando-se as faixas pretas e a cor de fundo a ser exibida se a imagem for pequena demais e o re-escalamento não for suficiente para fazê-la cobrir toda a tela. Você pode ainda modificar essas opções mais tarde.
-				</p></div><div class="sect3" title="Abrir"><div class="titlepage"><div><div><h4 class="title"><a name="open"></a>Abrir</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="open"></a>Abrir</h4></div></div></div><p>
 					Essa entrada permite que você abra uma apresentação de slides previamente salva.
-				</p></div><div class="sect3" title="Salvar"><div class="titlepage"><div><div><h4 class="title"><a name="save"></a>Salvar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="save"></a>Salvar</h4></div></div></div><p>
 					Essa entrada permite a você salvar uma apresentação
 					de slides já salva anteriormente. O nome do arquivo
 					não será perguntado a menos que você ainda não tenha
 					salvo o projeto.
-				</p></div><div class="sect3" title="Salvar como"><div class="titlepage"><div><div><h4 class="title"><a name="saveas"></a>Salvar como</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="saveas"></a>Salvar como</h4></div></div></div><p>
 					Essa entrada permite a você salvar uma apresentação de slides com um novo nome de arquivo.
-				</p></div><div class="sect3" title="Fechar"><div class="titlepage"><div><div><h4 class="title"><a name="close"></a>Fechar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="close"></a>Fechar</h4></div></div></div><p>
 					Essa entrada fecha a apresentação de slides. Se ela ainda não foi salva ou foi modificada, o Imagination pedirá confirmação antes de fechá-la.
-				</p></div><div class="sect3" title="Importar imagens"><div class="titlepage"><div><div><h4 class="title"><a name="import_pictures"></a>Importar imagens</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_pictures"></a>Importar imagens</h4></div></div></div><p>
 					Essa entrada abre um diálogo de arquivos para que você
 					escolha as imagens a serem importadas para o Imagination.
 					Para selecionar mais de uma imagem, pressione a tecla
@@ -168,18 +168,18 @@
 					barra de progresso é exibida na barra de estado notificando
 					você do progresso na importação das imagens. As miniaturas
 					não serão exibidas até que o carregamento se complete.
-				</p></div><div class="sect3" title="Importar música"><div class="titlepage"><div><div><h4 class="title"><a name="import_music"></a>Importar música</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="import_music"></a>Importar música</h4></div></div></div><p>
 					Essa é o mesmo que a anterior mas serve para os arquivos
 					de áudio. Por favor, certifique-se que o seu libsox
 					é capaz de lidar com os arquivos de áudio selecionados
 					(em distribuições derivadas do Debian, você provavelmente
 					terá de instalar o pacote
 					<em class="citetitle">libsox-fmt-all</em>).
-				</p></div><div class="sect3" title="Propriedades"><div class="titlepage"><div><div><h4 class="title"><a name="properties"></a>Propriedades</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="properties"></a>Propriedades</h4></div></div></div><p>
 					Essa entrada exibe um diálogo com as propriedades da apresentação de slides. Por favor, veja a seção Novo para uma explicação das configurações disponíveis.
-				</p></div><div class="sect3" title="Visualização"><div class="titlepage"><div><div><h4 class="title"><a name="preview_slideshow"></a>Visualização</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview_slideshow"></a>Visualização</h4></div></div></div><p>
 					Essa entrada inicia a visualização da apresentação de slides na área de imagem. Se você quiser iniciar a visualização por um slide específico, selecione-o clicando sobre ele . A qualidade da visualização é alterada pelas opções no menu <span class="guimenu">Slide</span> &#8594; <span class="guimenuitem">Qualidade da visualização</span>.
-				</p></div><div class="sect3" title="Exportar"><div class="titlepage"><div><div><h4 class="title"><a name="export"></a>Exportar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="export"></a>Exportar</h4></div></div></div><p>
 					Esse submenu permite que você exporte a apresentação
 					de slides em quatro formatos diferentes: VOB (DVD),
 					OGV (Ogg Theora/Vorbis), FLV (Flash) e 3GP (celulares).
@@ -190,15 +190,15 @@
 					do ffmpeg, o codificador pela linha de comando que o
 					Imagination usa para gerar o vídeo. A extensão será
 					adicionada automaticamente ao nome do arquivo.
-				</p></div><div class="sect3" title="Sair"><div class="titlepage"><div><div><h4 class="title"><a name="quit"></a>Sair</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="quit"></a>Sair</h4></div></div></div><p>
 					Essa entrada fecha o Imagination. Se a apresentação ainda não tiver sido salva, o Imagination pedirá confirmação.
-				</p></div></div><div class="sect2" title="Menu Slide"><div class="titlepage"><div><div><h3 class="title"><a name="slide"></a>Menu Slide</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Recortar</p></li><li class="listitem"><p>Copiar</p></li><li class="listitem"><p>Colar</p></li><li class="listitem"><p>Qualidade da visualização</p></li><li class="listitem"><p>Zoom</p></li><li class="listitem"><p>Adicionar um slide vazio</p></li><li class="listitem"><p>Excluir</p></li><li class="listitem"><p>Relatório</p></li><li class="listitem"><p>Rotacionar no sentido anti-horário</p></li><li class="listitem"><p>Rotacionar no sentido horário</p></li><li class="listitem"><p>Selecionar tudo</p></li><li class="listitem"><p>Desselecionar tudo</p></li></ul></div><div class="sect3" title="Recortar"><div class="titlepage"><div><div><h4 class="title"><a name="cut"></a>Recortar</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="slide"></a>Menu Slide</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Recortar</p></li><li class="listitem"><p>Copiar</p></li><li class="listitem"><p>Colar</p></li><li class="listitem"><p>Qualidade da visualização</p></li><li class="listitem"><p>Zoom</p></li><li class="listitem"><p>Adicionar um slide vazio</p></li><li class="listitem"><p>Excluir</p></li><li class="listitem"><p>Relatório</p></li><li class="listitem"><p>Rotacionar no sentido anti-horário</p></li><li class="listitem"><p>Rotacionar no sentido horário</p></li><li class="listitem"><p>Selecionar tudo</p></li><li class="listitem"><p>Desselecionar tudo</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="cut"></a>Recortar</h4></div></div></div><p>
 					Essa entrada permite que você recorte um número de slides selecionados.
-				</p></div><div class="sect3" title="Copiar"><div class="titlepage"><div><div><h4 class="title"><a name="copy"></a>Copiar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="copy"></a>Copiar</h4></div></div></div><p>
 					Essa entrada permite que você copie um número de slides selecionados.
-				</p></div><div class="sect3" title="Colar"><div class="titlepage"><div><div><h4 class="title"><a name="paste"></a>Colar</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="paste"></a>Colar</h4></div></div></div><p>
 					Antes de escolher Colar você precisa clicar no slide após o qual você quer posicionar os slides previamente selecionados com Recortar ou Copiar.
-				</p></div><div class="sect3" title="Qualidade da visualização"><div class="titlepage"><div><div><h4 class="title"><a name="preview"></a>Qualidade da visualização</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview"></a>Qualidade da visualização</h4></div></div></div><p>
 					Esse submenu permite que você defina a qualidades da
 					imagem ou da visualização na área de imagem. Essa opção
 					não afeta o vídeo exportado de modo algum. Sua principal
@@ -209,9 +209,9 @@
 					computador moderno). Veja bem, a visualização pode não
 					funcionar muito bem em computadores mais lentos quando
 					for selecionada a qualidade alta.
-				</p></div><div class="sect3" title="Zoom"><div class="titlepage"><div><div><h4 class="title"><a name="zoom"></a>Zoom</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="zoom"></a>Zoom</h4></div></div></div><p>
 					Esse submenu permite a você ampliar ou reduzir a imagem na área de imagem. Ele foi adicionado para que o Imagination possa ser usado em notebooks que tenham uma resolução de tela limitada. Ele afeta também o tamanho das miniaturas quando o Imagination estiver no modo de visão geral (por favor, veja o menu Ver para uma explicação da área de visão geral).
-				</p></div><div class="sect3" title="Adicionar um slide vazio"><div class="titlepage"><div><div><h4 class="title"><a name="Add_empty_slide"></a>Adicionar um slide vazio</h4></div></div></div><div class="figure"><a name="empty_slide"></a><p class="title"><b>Figura 5. Criar um novo slide</b></p><div class="figure-contents"><div><img src="images/empty_slide_dialog.png" alt="Criar um novo slide"></div></div></div><br class="figure-break"><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="Add_empty_slide"></a>Adicionar um slide vazio</h4></div></div></div><div class="figure"><a name="empty_slide"></a><p class="title"><b>Figura 5. Criar um novo slide</b></p><div class="figure-contents"><div><img src="images/empty_slide_dialog.png" alt="Criar um novo slide"></div></div></div><br class="figure-break"><p>
 					Essa entrada do menu exibe o diálogo acima no qual pode-se
 					escolher a cor de fundo do slide vazio de três modos
 					distintos: 1) com uma cor sólida, 2) com um gradiente
@@ -231,28 +231,28 @@
 					nível é a posição das extremidades, que são representadas
 					por dois quadrados brancos que podem ser arrastados
 					pela área de visualização.
-				</p></div><div class="sect3" title="Excluir"><div class="titlepage"><div><div><h4 class="title"><a name="delete"></a>Excluir</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="delete"></a>Excluir</h4></div></div></div><p>
 					Essa entrada do menu exclui os slides selecionados. Segure a tecla SHIFT para selecionar mais de um slide ao mesmo tempo ou CTRL para selecionar slides separados. Por favor, saiba que essa ação não pode ser desfeita!
-				</p></div><div class="sect3" title="Relatório"><div class="titlepage"><div><div><h4 class="title"><a name="report"></a>Relatório</h4></div></div></div><div class="figure"><a name="slide_report"></a><p class="title"><b>Figura 6. Diálogo de relatório de transições de slides</b></p><div class="figure-contents"><div><img src="images/slide_report_dialog.png" alt="Diálogo de relatório de transições de slides"></div></div></div><br class="figure-break"><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="report"></a>Relatório</h4></div></div></div><div class="figure"><a name="slide_report"></a><p class="title"><b>Figura 6. Diálogo de relatório de transições de slides</b></p><div class="figure-contents"><div><img src="images/slide_report_dialog.png" alt="Diálogo de relatório de transições de slides"></div></div></div><br class="figure-break"><p>
 					Essa entrada do menu exibe o diálogo de relatório de transições de slides no qual pode-se ver o número de slides que possuem a mesma transição a eles aplicada.
 					Clique num slide para tê-lo automaticamente selecionado pelo Imagination. Os slides cujas transições só foram usadas uma vez não são exibidos.
 					Por favor, opine sobre esse recurso pois não estamos seguros se é um recurso útil. Obrigado.
-				</p></div><div class="sect3" title="Rotacionar no sentido anti-horário"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_clockwise"></a>Rotacionar no sentido anti-horário</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_clockwise"></a>Rotacionar no sentido anti-horário</h4></div></div></div><p>
 					Essa entrada permite que você rode o slide selecionado no sentido anti-horário. A imagem no disco NÃO é afetada pela rotação então se você salvar a apresentação e carregá-la novamente o slide será exibido no seu estado original anterior à rotação.
-				</p></div><div class="sect3" title="Rotacionar no sentido horário"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_counterclockwise"></a>Rotacionar no sentido horário</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="rotate_counterclockwise"></a>Rotacionar no sentido horário</h4></div></div></div><p>
 					Essa entrada permite que você rode o slide selecionado no sentido horário. A imagem no disco NÃO é afetada pela rotação então se você salvar a apresentação e carregá-la novamente o slide será exibido no seu estado original anterior à rotação.
-				</p></div><div class="sect3" title="Selecionar tudo"><div class="titlepage"><div><div><h4 class="title"><a name="select"></a>Selecionar tudo</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="select"></a>Selecionar tudo</h4></div></div></div><p>
 					É preciso explicar essa entrada?
-				</p></div><div class="sect3" title="Desselecionar tudo"><div class="titlepage"><div><div><h4 class="title"><a name="unselect"></a>Desselecionar tudo</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="unselect"></a>Desselecionar tudo</h4></div></div></div><p>
 					E essa?
-				</p></div></div><div class="sect2" title="Menu Ver"><div class="titlepage"><div><div><h3 class="title"><a name="view"></a>Menu Ver</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Modo de visualização</p></li><li class="listitem"><p>Modo de visão geral</p></li></ul></div><div class="sect3" title="Modo de visualização"><div class="titlepage"><div><div><h4 class="title"><a name="preview_mode"></a>Modo de visualização</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="view"></a>Menu Ver</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Modo de visualização</p></li><li class="listitem"><p>Modo de visão geral</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="preview_mode"></a>Modo de visualização</h4></div></div></div><p>
 					Essa entrada habilita o modo de visualização; são exibidas a área de imagem e a área das miniaturas. O tamanho da área de imagem pode ser ampliado ou reduzido com os controles de Zoom possibilitando ao Imagination ser usado em telas pequenas.
-				</p></div><div class="sect3" title="Modo de visão geral"><div class="titlepage"><div><div><h4 class="title"><a name="overview_mode"></a>Modo de visão geral</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="overview_mode"></a>Modo de visão geral</h4></div></div></div><p>
 					Essa entrada habilita o modo de visão geral; a área de imagem e a área das miniaturas não são exibidas. Esse modo organiza os slides numa matriz. O tamanho das miniaturas pode ser ampliado ou reduzido com os controles de Zoom. As entradas do menu Recortar/Copiar/Colar são suportadas. Os slides também podem ser organizados ao manter pressionado o botão esquerdo do mouse enquanto se o movimenta.
-				</p></div></div><div class="sect2" title="Menu Ajuda"><div class="titlepage"><div><div><h3 class="title"><a name="help"></a>Menu Ajuda</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Conteúdo</p></li><li class="listitem"><p>Sobre</p></li></ul></div><div class="sect3" title="Conteúdo"><div class="titlepage"><div><div><h4 class="title"><a name="content"></a>Conteúdo</h4></div></div></div><p>
+				</p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="help"></a>Menu Ajuda</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Conteúdo</p></li><li class="listitem"><p>Sobre</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="content"></a>Conteúdo</h4></div></div></div><p>
 					Essa entrada possibilita a exibição desta documentação HTML no navegador instalado no sistema.
-				</p></div><div class="sect3" title="Sobre"><div class="titlepage"><div><div><h4 class="title"><a name="about"></a>Sobre</h4></div></div></div><p>
+				</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="about"></a>Sobre</h4></div></div></div><p>
 					Essa entrada exibe o diálogo Sobre e os créditos.
-				</p></div></div></div><div class="sect1" title="Licença"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="license"></a>Licença</h2></div></div></div><p>
+				</p></div></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="license"></a>Licença</h2></div></div></div><p>
 			O Imagination é licenciado sob a licença GPL2.
 		</p></div></div></body></html>

imagination-3.0.tar.bz2/doc/pt_BR/images/Makefile.in -> imagination-3.4.tar.bz2/doc/pt_BR/images/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,61 @@
 # $Id$
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,22 +91,33 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/pt_BR/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,8 +139,16 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(imagesdir)"
 DATA = $(images_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -97,6 +170,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -120,6 +194,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -128,8 +207,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -175,6 +256,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -203,11 +285,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -215,6 +298,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -250,7 +334,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR/images/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/pt_BR/images/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -276,8 +359,11 @@
 	-rm -rf .libs _libs
 install-imagesDATA: $(images_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(imagesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(imagesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -291,14 +377,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(imagesdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(imagesdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -348,10 +432,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -432,16 +521,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-imagesDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-imagesDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-imagesDATA install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-imagesDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/icons/16x16/Makefile.in -> imagination-3.4.tar.bz2/icons/16x16/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,61 @@
 # Inspired by Makefile.am from the Thunar file-manager
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,22 +91,33 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = icons/16x16
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,8 +139,16 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -97,6 +170,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -120,6 +194,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -128,8 +207,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -175,6 +256,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -203,11 +285,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -215,6 +298,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -241,7 +325,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/16x16/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu icons/16x16/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -267,8 +350,11 @@
 	-rm -rf .libs _libs
 install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -282,14 +368,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -339,10 +423,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -423,16 +512,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-iconsDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-iconsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-iconsDATA install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/icons/24x24/Makefile.in -> imagination-3.4.tar.bz2/icons/24x24/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,61 @@
 # Inspired by Makefile.am from the Thunar file-manager
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,22 +91,33 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = icons/24x24
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,8 +139,16 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -97,6 +170,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -120,6 +194,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -128,8 +207,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -175,6 +256,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -203,11 +285,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -215,6 +298,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -241,7 +325,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/24x24/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu icons/24x24/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -267,8 +350,11 @@
 	-rm -rf .libs _libs
 install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -282,14 +368,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -339,10 +423,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -423,16 +512,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-iconsDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-iconsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-iconsDATA install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/icons/48x48/Makefile.in -> imagination-3.4.tar.bz2/icons/48x48/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,61 @@
 # Inspired by Makefile.am from the Thunar file-manager
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,22 +91,33 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = icons/48x48
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,8 +139,16 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -97,6 +170,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -120,6 +194,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -128,8 +207,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -175,6 +256,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -203,11 +285,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -215,6 +298,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -241,7 +325,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/48x48/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu icons/48x48/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -267,8 +350,11 @@
 	-rm -rf .libs _libs
 install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -282,14 +368,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -339,10 +423,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -423,16 +512,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-iconsDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-iconsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-iconsDATA install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/icons/Makefile.in -> imagination-3.4.tar.bz2/icons/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,37 +88,70 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -111,6 +198,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -134,6 +222,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -142,8 +235,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -189,6 +284,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -217,11 +313,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -229,6 +326,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -259,7 +357,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu icons/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -285,22 +382,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -315,57 +415,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -381,12 +436,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -398,15 +448,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -415,6 +461,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -451,13 +512,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -492,10 +550,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -574,22 +637,24 @@
 
 uninstall-am: uninstall-local
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-data-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-hook install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-local
+.MAKE: $(am__recursive_targets) install-am install-data-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-local
+
+.PRECIOUS: Makefile
 
 
 install-data-hook:

imagination-3.0.tar.bz2/icons/scalable/Makefile.in -> imagination-3.4.tar.bz2/icons/scalable/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,61 @@
 # Inspired by Makefile.am from the Thunar file-manager
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,22 +91,33 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = icons/scalable
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,8 +139,16 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -97,6 +170,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -120,6 +194,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -128,8 +207,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -175,6 +256,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -203,11 +285,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -215,6 +298,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -241,7 +325,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/scalable/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu icons/scalable/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -267,8 +350,11 @@
 	-rm -rf .libs _libs
 install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -282,14 +368,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -339,10 +423,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -423,16 +512,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-iconsDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-iconsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-iconsDATA install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/imagination.desktop.in -> imagination-3.4.tar.bz2/imagination.desktop.in Changed

imagination-3.0.tar.bz2/install-sh -> imagination-3.4.tar.bz2/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2014-09-12.12; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,25 +35,21 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 OPTION... -T SRCFILE DSTFILE
@@ -137,42 +122,57 @@
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *''*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *''*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | =!) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -186,6 +186,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +198,26 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -211,16 +228,16 @@
 
     *0-7)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -228,9 +245,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | =!) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,51 +269,20 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X$.*^/$//*^/^/*/*$' \| \
-	     X"$dst" : 'X$//$^/' \| \
-	     X"$dst" : 'X$//$$' \| \
-	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$^/.*/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/$.*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
@@ -307,74 +293,81 @@
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *23672367) mkdir_umask=$umask;;
-	  .*00202 | .0202 | .02) mkdir_umask=22;;
-
-	  *0-7)
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *1235670-70-7)
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *23672367) mkdir_umask=$umask;;
+          .*00202 | .0202 | .02) mkdir_umask=22;;
+
+          *0-7)
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *1235670-70-7)
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
+            # that nobody tries to guess the $tmpdir name.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -384,53 +377,51 @@
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        -=!*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -465,15 +456,12 @@
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -486,24 +474,24 @@
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
@@ -515,5 +503,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

imagination-3.0.tar.bz2/ltmain.sh -> imagination-3.4.tar.bz2/ltmain.sh Changed

@@ -1,9 +1,12 @@
-# Generated from ltmain.m4sh.
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 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.
 
@@ -23,598 +26,2112 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Usage: $progname OPTION... MODE-ARG...
-#
-# Provide generalized library-building support services.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION="2.4.6 Debian-2.4.6-2"
+package_revision=2.4.6
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 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.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
-#
-# MODE must be one of the following:
-#
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#   . `echo "$0" | ${SED-sed} 's|^/*$||'`/build-aux/funclib.sh
 #
-# Report bugs to <bug-libtool@gnu.org>.
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
 
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
-TIMESTAMP=""
-package_revision=1.3017
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
 
-# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
 
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
 
 
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
 
 
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC PATH
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
 
-# Global variables:
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/^/*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|$`"$\\$|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/$"`\\$/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|.^$\\*\/|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\$^$_G_bs\$$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
 EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
 
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/^/*$,,"
-basename="s,^.*/,,"
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME0} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
 
-# Generated shell functions inserted here.
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
 
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
 # the _XPG environment variable is not equal to 1 (one), the special
 # positional parameter $0, within a function call, is the name of the
 # function.
-progpath="$0"
+progpath=$0
 
-# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-case $progname in
-  -*) progname=./$progname ;;
-esac
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
 case $progpath in
   \\/*|A-Za-z:\\*) ;;
   *\\/*)
-     progdir=$func_dirname_result
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
      progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
+     progpath=$progdir/$progname
      ;;
   *)
-     save_IFS="$IFS"
-     IFS=:
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
-       IFS="$save_IFS"
+       IFS=$_G_IFS
        test -x "$progdir/$progname" && break
      done
-     IFS="$save_IFS"
+     IFS=$_G_IFS
      test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
+     progpath=$progdir/$progname
      ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/$`"$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
 
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\$^$bs\$$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
 
-# Standard options:
 opt_dry_run=false
-opt_help=false
 opt_quiet=false
 opt_verbose=false
-opt_warning=:
 
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset='&#x1b;0m'
+        tc_bold='&#x1b;1m';   tc_standout='&#x1b;7m'
+        tc_red='&#x1b;31m';   tc_green='&#x1b;32m'
+        tc_blue='&#x1b;34m';  tc_cyan='&#x1b;36m'
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      12.* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '$.$'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: $*"
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
 }
 
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
 {
-    $opt_verbose && func_echo ${1+"$@"}
+    $ECHO "$*"
+}
 
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
 }
 
-# func_error arg...
+
+# func_error ARG...
+# -----------------
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-}
+    $debug_cmd
 
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+    $require_term_colors
 
-    # bash bug again:
-    :
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
 }
 
-# func_fatal_error arg...
+
+# func_fatal_error ARG...
+# -----------------------
 # Echo program name prefixed message to standard error, and exit.
 func_fatal_error ()
 {
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
+    $debug_cmd
 
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
+    func_error "$*"
+    exit $EXIT_FAILURE
 }
-help="Try \`$progname --help' for more information."  ## default
 
 
-# func_grep expression filename
+# func_grep EXPRESSION FILENAME
+# -----------------------------
 # Check whether EXPRESSION matches any line of FILENAME, without output.
 func_grep ()
 {
+    $debug_cmd
+
     $GREP "$1" "$2" >/dev/null 2>&1
 }
 
 
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
 # Make sure the entire path to DIRECTORY-PATH is available.
 func_mkdir_p ()
 {
-    my_directory_path="$1"
-    my_dir_list=
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
 
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
 
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
       esac
 
       # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
+      while test ! -d "$_G_directory_path"; do
         # ...make a list in topmost first order.  Use a colon delimited
 	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
+        _G_dir_list=$_G_directory_path:$_G_dir_list
 
         # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
+        case $_G_directory_path in */*) ;; *) break ;; esac
 
         # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
       done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
 
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
         # try to create one of the directories concurrently.  Don't
         # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
+        $MKDIR "$_G_dir" 2>/dev/null || :
       done
-      IFS="$save_mkdir_p_IFS"
+      IFS=$func_mkdir_p_IFS
 
       # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
     fi
 }
 
 
-# func_mktempdir string
+# func_mktempdir BASENAME
+# -------------------------
 # Make a temporary directory that won't clash with other running
 # libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
 func_mktempdir ()
 {
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
 
-    if test "$opt_dry_run" = ":"; then
+    if test : = "$opt_dry_run"; then
       # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
+      _G_tmpdir=$_G_template-$$
     else
 
       # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
 
-      if test ! -d "$my_tmpdir"; then
+      if test ! -d "$_G_tmpdir"; then
         # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
 
-        save_mktempdir_umask=`umask`
+        func_mktempdir_umask=`umask`
         umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
       fi
 
       # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
     fi
 
-    $ECHO "X$my_tmpdir" | $Xsed
+    $ECHO "$_G_tmpdir"
 }
 
 
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *\\\`\"\$*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/$^/*$.*$|\1|'
+    _G_pathcdr='s|^/^/*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
         ;;
       *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
     esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
 }
 
 
-# func_quote_for_expand arg
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *\\\`\"\$*)
+	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
+      esac
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+      fi
+
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+	  ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
 # Aesthetically quote ARG to be evaled later; same as above,
 # but do not quote variable references.
 func_quote_for_expand ()
 {
+    $debug_cmd
+
     case $1 in
       *\\\`\"*)
-	my_arg=`$ECHO "X$1" | $Xsed \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+	_G_arg=`$ECHO "$1" | $SED \
+	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
-        my_arg="$1" ;;
+        _G_arg=$1 ;;
     esac
 
-    case $my_arg in
+    case $_G_arg in
       # Double-quote args containing shell metacharacters to delay
       # word splitting and command substitution for a subsequent eval.
       # Many Bourne shells cannot handle close brackets correctly
       # in scan sets, so we specify it separately.
       *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
-        my_arg="\"$my_arg\""
+        _G_arg=\"$_G_arg\"
         ;;
     esac
 
-    func_quote_for_expand_result="$my_arg"
+    func_quote_for_expand_result=$_G_arg
 }
 
 
-# func_show_eval cmd fail_exp
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD FAIL_EXP
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.
 func_show_eval ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
+    $debug_cmd
 
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
       fi
-    fi
+    }
 }
 
 
-# func_show_eval_locale cmd fail_exp
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# func_show_eval_locale CMD FAIL_EXP
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.  Use the saved locale for evaluation.
 func_show_eval_locale ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
 
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
       eval "func_echo $func_quote_for_expand_result"
     }
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
       fi
-    fi
+    }
 }
 
 
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+    $debug_cmd
 
+    case $1 in
+    0-9* | *!a-zA-Z0-9_*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^$0-9$/_\1/' -e 's/^a-zA-Z0-9_/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
 
 
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
 {
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/$(C)$ 0-9,-*$ 1-90-9*$/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
 }
 
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
 {
-    $SED -n '/^# Usage:/,/# -h/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    $ECHO
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 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.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath OPTION...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY all
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
 }
 
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME ARG...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
+    done
+
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        # Note that for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=: ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#          esac
+#        done
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options ARG...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
+
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
+
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
+}
+
+
+# func_options_prep ARG...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
+}
+
+
+# func_parse_options ARG...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    func_parse_options_result=
+
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
+
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode"
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
+
+        --warnings|--warning|-W)
+                      test $# = 0 && func_missing_arg $_G_opt && break
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+      esac
+    done
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
+}
+
+
+# func_validate_options ARG...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
 # func_help
+# ---------
 # Echo long help message to standard output and exit.
 func_help ()
 {
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-	p
-     }' < "$progpath"
-    exit $?
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
 }
 
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
 # Echo program name prefixed message to standard error and set global
 # exit_cmd.
 func_missing_arg ()
 {
-    func_error "missing argument for $1"
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
     exit_cmd=exit
 }
 
-exit_cmd=:
 
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
 
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
 
+      func_split_equals_lhs=`expr "x$1" : 'x$^=*$'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x^=*=$.*$$'`
+  }
+fi #func_split_equals
 
 
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-  # Yippee, $ECHO works!
-  :
+# func_split_short_opt SHORTOPT
+# -----------------------------
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
 else
-  # Restart under the correct shell, and then maybe $ECHO will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
+      func_split_short_opt_name=`expr "x$1" : 'x-$.$'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.$.*$$'`
+  }
+fi #func_split_short_opt
 
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
 
-# Global variables.
-# $mode is unset
-nonopt=
-execute_dlfiles=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $debug_cmd
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
 
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
 
-# func_fatal_configuration arg...
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $debug_cmd
+
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|$(C)$ 0-9,-* ,-$1-90-9* $|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
+
+    exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath OPTION... MODE-ARG...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY all
+   -h, --help, --help-all   print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname $scriptversion Debian-2.4.6-2
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.^.*$|.lo|'`
+  }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
 }
 
 
 # func_config
+# -----------
 # Display the configuration for all the tags in this script.
 func_config ()
 {
@@ -632,279 +2149,371 @@
     exit $?
 }
 
+
 # func_features
+# -------------
 # Display the features supported by this script.
 func_features ()
 {
-    $ECHO "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $ECHO "enable shared libraries"
+    echo "host: $host"
+    if test yes = "$build_libtool_libs"; then
+      echo "enable shared libraries"
     else
-      $ECHO "disable shared libraries"
+      echo "disable shared libraries"
     fi
-    if test "$build_old_libs" = yes; then
-      $ECHO "enable static libraries"
+    if test yes = "$build_old_libs"; then
+      echo "enable static libraries"
     else
-      $ECHO "disable static libraries"
+      echo "disable static libraries"
     fi
 
     exit $?
 }
 
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
 # Verify that TAGNAME is valid, and either flag an error and exit, or
 # enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
 # variable here.
 func_enable_tag ()
 {
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *!-_A-Za-z0-9,/*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
+    # Global variable:
+    tagname=$1
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
-{
-
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
-
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
-			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
-			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
-			shift
-			;;
-
-      --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
-			opt_silent=false
-			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
-			shift
-			;;
-
-      # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
-			;;
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *!-_A-Za-z0-9,/*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
     esac
-  done
-
 
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
     *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-      ;;
-  esac
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
 
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
 }
 
+
 # func_check_version_match
+# ------------------------
 # Ensure that we are using m4 macros, and libtool script from the same
 # release of libtool.
 func_check_version_match ()
 {
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from an older release.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      else
-        cat >&2 <<_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
 $progname: but the definition of this LT_INIT comes from revision $macro_revision.
 $progname: You should recreate aclocal.m4 with macros from revision $package_revision
 $progname: of $PACKAGE $VERSION and run autoconf again.
 _LT_EOF
+      fi
+
+      exit $EXIT_MISMATCH
     fi
+}
 
-    exit $EXIT_MISMATCH
-  fi
+
+# libtool_options_prep ARG...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
+
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
+
+    nonopt=
+    preserve_args=
+
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    esac
+
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
 }
+func_add_hook func_options_prep libtool_options_prep
 
 
-## ----------- ##
-##    Main.    ##
-## ----------- ##
+# libtool_parse_options ARG...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
 
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
 
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
 
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
 
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
 
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
 
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
+# libtool_validate_options ARG...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
+    fi
+
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
 
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
+
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
+
+    # Pass back the unparsed argument list
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_validate_options libtool_validate_options
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
 }
 
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
 
 # func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function is only a basic sanity check; it will hardly flush out
 # determined imposters.
 func_lalib_p ()
 {
     test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function implements the same check as func_lalib_p without
 # resorting to external programs.  To this end, it redirects stdin and
 # closes it afterwards, without saving the original file descriptor.
 # As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
+# fatal anyway.  Works if 'file' does not exist.
 func_lalib_unsafe_p ()
 {
     lalib_p=no
@@ -912,13 +2521,13 @@
 	for lalib_p_l in 1 2 3 4
 	do
 	    read lalib_p_line
-	    case "$lalib_p_line" in
+	    case $lalib_p_line in
 		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
 	    esac
 	done
 	exec 0<&5 5<&-
     fi
-    test "$lalib_p" = yes
+    test yes = "$lalib_p"
 }
 
 # func_ltwrapper_script_p file
@@ -927,7 +2536,8 @@
 # determined imposters.
 func_ltwrapper_script_p ()
 {
-    func_lalib_p "$1"
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_ltwrapper_executable_p file
@@ -950,12 +2560,9 @@
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
 }
 
 # func_ltwrapper_p file
@@ -974,11 +2581,13 @@
 # FAIL_CMD may read-access the current command in variable CMD!
 func_execute_cmds ()
 {
-    $opt_debug
+    $debug_cmd
+
     save_ifs=$IFS; IFS='~'
     for cmd in $1; do
-      IFS=$save_ifs
+      IFS=$sp$nl
       eval cmd=\"$cmd\"
+      IFS=$save_ifs
       func_show_eval "$cmd" "${2-:}"
     done
     IFS=$save_ifs
@@ -990,10 +2599,11 @@
 # Note that it is not necessary on cygwin/mingw to append a dot to
 # FILE even if both FILE and FILE.exe exist: automatic-append-.exe
 # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
 func_source ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $1 in
     */* | *\\*)	. "$1" ;;
     *)		. "./$1" ;;
@@ -1001,6 +2611,37 @@
 }
 
 
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case $lt_sysroot:$1 in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result='='$func_stripname_result
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
 # func_infer_tag arg
 # Infer tagged configuration to use if any are available and
 # if one wasn't chosen via the "--tag" command line option.
@@ -1009,32 +2650,37 @@
 # arg is usually of the form 'gcc ...'
 func_infer_tag ()
 {
-    $opt_debug
+    $debug_cmd
+
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	func_append_quoted CC_quoted "$arg"
       done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
 	for z in $available_tags; do
 	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
 	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	      func_append_quoted CC_quoted "$arg"
 	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
 	      # The compiler in the base compile command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.
@@ -1049,7 +2695,7 @@
 	# line option must be used.
 	if test -z "$tagname"; then
 	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
+	  func_fatal_error "specify a tag with '--tag'"
 #	else
 #	  func_verbose "using $tagname tagged configuration"
 	fi
@@ -1065,15 +2711,15 @@
 # but don't create it if we're doing a dry run.
 func_write_libtool_object ()
 {
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
     else
       write_lobj=none
     fi
 
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
     else
       write_oldobj=none
     fi
@@ -1081,7 +2727,7 @@
     $opt_dry_run || {
       cat >${write_libobj}T <<EOF
 # $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -1093,17 +2739,536 @@
 non_pic_object=$write_oldobj
 
 EOF
-      $MV "${write_libobj}T" "${write_libobj}"
+      $MV "${write_libobj}T" "$write_libobj"
     }
 }
 
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $debug_cmd
+
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $debug_cmd
+
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $debug_cmd
+
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/ *$//' -e "$sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  '$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result=$1
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $debug_cmd
+
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  '$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result=$3
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $debug_cmd
+
+  case $4 in
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via '$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $debug_cmd
+
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $debug_cmd
+
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result=$1
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via '$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $debug_cmd
+
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $debug_cmd
+
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result=$1
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^	 *//' \
+    -e '/^$;.*$*$/d' \
+    -e 's/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
-    $opt_debug
+    $debug_cmd
+
     # Get the compilation command and the source file.
     base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
     suppress_opt=yes
     suppress_output=
     arg_mode=normal
@@ -1116,12 +3281,12 @@
       case $arg_mode in
       arg  )
 	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
+	lastarg=$arg
 	arg_mode=normal
 	;;
 
       target )
-	libobj="$arg"
+	libobj=$arg
 	arg_mode=normal
 	continue
 	;;
@@ -1131,18 +3296,18 @@
 	case $arg in
 	-o)
 	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
+	    func_fatal_error "you cannot specify '-o' more than once"
 	  arg_mode=target
 	  continue
 	  ;;
 
 	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
+          func_append pie_flag " $arg"
 	  continue
 	  ;;
 
 	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
+	  func_append later " $arg"
 	  continue
 	  ;;
 
@@ -1160,18 +3325,17 @@
 	  func_stripname '-Wc,' '' "$arg"
 	  args=$func_stripname_result
 	  lastarg=
-	  save_ifs="$IFS"; IFS=','
+	  save_ifs=$IFS; IFS=,
 	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
+	    IFS=$save_ifs
+	    func_append_quoted lastarg "$arg"
 	  done
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
+	  func_append base_compile " $lastarg"
 	  continue
 	  ;;
 
@@ -1179,16 +3343,15 @@
 	  # Accept the current argument as the source file.
 	  # The previous "srcfile" becomes the current argument.
 	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
+	  lastarg=$srcfile
+	  srcfile=$arg
 	  ;;
 	esac  #  case $arg
 	;;
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
+      func_append_quoted base_compile "$lastarg"
     done # for arg
 
     case $arg_mode in
@@ -1196,13 +3359,13 @@
       func_fatal_error "you must specify an argument for -Xcompile"
       ;;
     target)
-      func_fatal_error "you must specify a target with \`-o'"
+      func_fatal_error "you must specify a target with '-o'"
       ;;
     *)
       # Get the name of the library object.
       test -z "$libobj" && {
 	func_basename "$srcfile"
-	libobj="$func_basename_result"
+	libobj=$func_basename_result
       }
       ;;
     esac
@@ -1213,7 +3376,7 @@
     *.cCFSifmso | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.fF09? | *.for | *.java | *.obj | *.sx)
+    *.fF09? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -1222,7 +3385,7 @@
     case $libobj in
     *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      func_fatal_error "cannot determine name of library object from '$libobj'"
       ;;
     esac
 
@@ -1231,8 +3394,8 @@
     for arg in $later; do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	continue
 	;;
@@ -1258,17 +3421,17 @@
     func_quote_for_eval "$libobj"
     test "X$libobj" != "X$func_quote_for_eval_result" \
       && $ECHO "X$libobj" | $GREP '~#^*{};<>?"'"'"'	 &()|`$' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
     func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
 
     test -z "$base_compile" && \
       func_fatal_help "you must specify a compilation command"
 
     # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       removelist="$obj $lobj $libobj ${libobj}T"
     else
       removelist="$lobj $libobj ${libobj}T"
@@ -1280,16 +3443,16 @@
       pic_mode=default
       ;;
     esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
       # non-PIC code in shared libraries is not supported
       pic_mode=default
     fi
 
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.^.*$%%'`.${objext}
-      lockfile="$output_obj.lock"
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.^.*$%%'`.$objext
+      lockfile=$output_obj.lock
     else
       output_obj=
       need_locks=no
@@ -1298,12 +3461,12 @@
 
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
+    if test yes = "$need_locks"; then
       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
 	sleep 2
       done
-    elif test "$need_locks" = warn; then
+    elif test warn = "$need_locks"; then
       if test -f "$lockfile"; then
 	$ECHO "\
 *** ERROR, $lockfile exists and contains:
@@ -1311,7 +3474,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -1319,26 +3482,25 @@
 	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      removelist="$removelist $output_obj"
+      func_append removelist " $output_obj"
       $ECHO "$srcfile" > "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
+    func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       # Without this assignment, base_compile gets emptied.
       fbsd_hideous_sh_bug=$base_compile
 
-      if test "$pic_mode" != no; then
+      if test no != "$pic_mode"; then
 	command="$base_compile $qsrcfile $pic_flag"
       else
 	# Don't build PIC code
@@ -1349,13 +3511,13 @@
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
           'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -1366,7 +3528,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -1382,29 +3544,29 @@
       fi
 
       # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
+      if test yes = "$suppress_opt"; then
 	suppress_output=' >/dev/null 2>&1'
       fi
     fi
 
     # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
 	# Don't build PIC code
 	command="$base_compile $qsrcfile$pie_flag"
       else
 	command="$base_compile $qsrcfile $pic_flag"
       fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+      if test yes = "$compiler_c_o"; then
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
+      func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -1415,7 +3577,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -1435,7 +3597,7 @@
       func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 
       # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
+      if test no != "$need_locks"; then
 	removelist=$lockfile
         $RM "$lockfile"
       fi
@@ -1445,13 +3607,13 @@
 }
 
 $opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $mode in
+    case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -1465,7 +3627,7 @@
 Remove files from the build directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, object or program, all the files associated
@@ -1482,17 +3644,18 @@
 
   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
   -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
 
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 from the given SOURCEFILE.
 
 The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
         ;;
 
       execute)
@@ -1505,7 +3668,7 @@
 
   -dlopen FILE      add the directory containing FILE to the library path
 
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
 flags.
 
 If any of the ARGS are libtool executable wrappers, then they are translated
@@ -1524,7 +3687,7 @@
 Each LIBDIR is a directory that contains libtool libraries.
 
 The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
         ;;
 
       install)
@@ -1534,11 +3697,11 @@
 Install executables or libraries.
 
 INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
 
 The following components of INSTALL-COMMAND are treated specially:
 
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 
 The rest of the components are interpreted as arguments to that command (only
 BSD-compatible install options are recognized)."
@@ -1558,7 +3721,9 @@
 
   -all-static       do not do any dynamic linking at all
   -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
@@ -1572,7 +3737,8 @@
   -no-install       link a not-installable executable
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
   -precious-files-regex REGEX
                     don't remove output files matching REGEX
   -release RELEASE  specify package release information
@@ -1586,21 +3752,26 @@
   -version-info CURRENT:REVISION:AGE
                     specify library version info each variable defaults to 0
   -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
 
-Every other argument is treated as a filename.  Files ending in \`.la' are
+Every other argument is treated as a filename.  Files ending in '.la' are
 treated as uninstalled libtool libraries, other files are standard or library
 object files.
 
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
 required, except when creating a convenience library.
 
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
 
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
 is created, otherwise an executable program is created."
         ;;
 
@@ -1611,7 +3782,7 @@
 Remove libraries from an installation directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, all the files associated with it are deleted.
@@ -1619,40 +3790,70 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$mode'"
+        func_fatal_help "invalid operation mode '$opt_mode'"
         ;;
     esac
 
-    $ECHO
-    $ECHO "Try \`$progname --help' for more information about other modes."
-
-    exit $?
+    echo
+    $ECHO "Try '$progname --help' for more information about other modes."
 }
 
-  # Now that we've collected a possible --mode arg, show help if necessary
-  $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test : = "$opt_help"; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    $SED '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=$^ *$ .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
 
 
 # func_mode_execute arg...
 func_mode_execute ()
 {
-    $opt_debug
+    $debug_cmd
+
     # The first argument is the command name.
-    cmd="$nonopt"
+    cmd=$nonopt
     test -z "$cmd" && \
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
+    for file in $opt_dlopen; do
       test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
+	|| func_fatal_help "'$file' is not a file"
 
       dir=
       case $file in
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
 
 	# Read the libtool library.
 	dlname=
@@ -1663,18 +3864,18 @@
 	if test -z "$dlname"; then
 	  # Warn if it was a shared library.
 	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	    func_warning "'$file' was not linked with '-export-dynamic'"
 	  continue
 	fi
 
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
+	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
 	  fi
 	fi
 	;;
@@ -1682,18 +3883,18 @@
       *.lo)
 	# Just add the directory containing the .lo file.
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	;;
 
       *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
 	continue
 	;;
       esac
 
       # Get the absolute pathname.
       absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
+      test -n "$absdir" && dir=$absdir
 
       # Now add the directory to shlibpath_var.
       if eval "test -z \"\$$shlibpath_var\""; then
@@ -1705,34 +3906,41 @@
 
     # This variable tells wrapper scripts just to set shlibpath_var
     # rather than running their programs.
-    libtool_execute_magic="$magic"
+    libtool_execute_magic=$magic
 
     # Check if any of the arguments is a wrapper script.
     args=
     for file
     do
       case $file in
-      -*) ;;
+      -* | *.la | *.lo ) ;;
       *)
 	# Do a test to see if this is really a libtool program.
 	if func_ltwrapper_script_p "$file"; then
 	  func_source "$file"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	elif func_ltwrapper_executable_p "$file"; then
 	  func_ltwrapper_scriptname "$file"
 	  func_source "$func_ltwrapper_scriptname_result"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	fi
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
+      func_append_quoted args "$file"
     done
 
-    if test "X$opt_dry_run" = Xfalse; then
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
       if test -n "$shlibpath_var"; then
 	# Export the shlibpath_var.
 	eval "export $shlibpath_var"
@@ -1749,34 +3957,64 @@
       done
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
+      exec_cmd=\$cmd$args
     fi
 }
 
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
-    $opt_debug
-    libdirs="$nonopt"
+    $debug_cmd
+
+    libs=
+    libdirs=
     admincmds=
 
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "'$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument '$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/$ '$$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  $SED -e "$sysroot_cmd s/$ '-LR$=/\1/g; s/$ '$=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
 
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
@@ -1786,73 +4024,77 @@
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
 	fi
       done
     fi
 
     # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
+    $opt_quiet && exit $EXIT_SUCCESS
 
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    $ECHO "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    $ECHO
-    $ECHO "If you ever happen to want to link against installed libraries"
-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $ECHO "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $ECHO "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $ECHO "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
 
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $ECHO
+	$ECHO "   - use the '$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
+      fi
+      echo
 
-    $ECHO "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.6789|solaris2.10-9)
-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
-	;;
-      *)
-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.6789|solaris2.10-9)
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
     exit $EXIT_SUCCESS
 }
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
 func_mode_install ()
 {
-    $opt_debug
+    $debug_cmd
+
     # There may be an optional sh(1) argument at the beginning of
     # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
        # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -1866,7 +4108,12 @@
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *\\\ /cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -1874,23 +4121,24 @@
     opts=
     prev=
     install_type=
-    isdir=no
+    isdir=false
     stripme=
+    no_mode=:
     for arg
     do
+      arg2=
       if test -n "$dest"; then
-	files="$files $dest"
+	func_append files " $dest"
 	dest=$arg
 	continue
       fi
 
       case $arg in
-      -d) isdir=yes ;;
+      -d) isdir=: ;;
       -f)
-	case " $install_prog " in
-	*\\\ /cp\ *) ;;
-	*) prev=$arg ;;
-	esac
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
 	;;
       -g | -m | -o)
 	prev=$arg
@@ -1904,6 +4152,10 @@
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
 	  prev=
 	else
 	  dest=$arg
@@ -1914,14 +4166,25 @@
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
       func_fatal_help "you must specify an install program"
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
+      func_fatal_help "the '$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
 
     if test -z "$files"; then
       if test -z "$dest"; then
@@ -1936,19 +4199,19 @@
     dest=$func_stripname_result
 
     # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
       destname=
     else
       func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
+      destdir=$func_dirname_result
+      destname=$func_basename_result
 
       # Not a directory, so check to see that there is only one file specified.
       set dummy $files; shift
       test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
+	func_fatal_help "'$dest' is not a directory"
     fi
     case $destdir in
     \\/* | A-Za-z:\\/*) ;;
@@ -1957,7 +4220,7 @@
 	case $file in
 	*.lo) ;;
 	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  func_fatal_help "'$destdir' must be an absolute directory name"
 	  ;;
 	esac
       done
@@ -1966,7 +4229,7 @@
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     staticlibs=
     future_libdirs=
@@ -1977,13 +4240,16 @@
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+	func_append staticlibs " $file"
 	;;
 
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
+	  || func_fatal_help "'$file' is not a valid libtool archive"
 
 	library_names=
 	old_library=
@@ -1994,23 +4260,23 @@
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  *) func_append current_libdirs " $libdir" ;;
 	  esac
 	else
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  *) func_append future_libdirs " $libdir" ;;
 	  esac
 	fi
 
 	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	dir="$dir$objdir"
+	dir=$func_dirname_result
+	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
 	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
 
 	  # Don't allow the user to place us outside of our expected
 	  # location b/c this prevents finding dependent libraries that
@@ -2019,38 +4285,45 @@
 	  # are installed into $libdir/../bin (currently, that works fine)
 	  # but it's something to keep an eye on.
 	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
-	  func_warning "relinking \`$file'"
+	  func_warning "relinking '$file'"
 	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
 	fi
 
 	# See the names of the shared library.
 	set dummy $library_names; shift
 	if test -n "$1"; then
-	  realname="$1"
+	  realname=$1
 	  shift
 
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
 
 	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
-	  tstripme="$stripme"
+	  tstripme=$stripme
 	  case $host_os in
 	  cygwin* | mingw* | pw32* | cegcc*)
 	    case $realname in
 	    *.dll.a)
-	      tstripme=""
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
 	      ;;
 	    esac
 	    ;;
@@ -2061,7 +4334,7 @@
 
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
 	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
 	    # so we also need to try rm && ln -s.
 	    for linkname
@@ -2072,18 +4345,18 @@
 	  fi
 
 	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
+	  lib=$destdir/$realname
 	  func_execute_cmds "$postinstall_cmds" 'exit $?'
 	fi
 
 	# Install the pseudo-library for information purposes.
 	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
+	name=$func_basename_result
+	instname=$dir/${name}i
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
 	;;
 
       *.lo)
@@ -2091,11 +4364,11 @@
 
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# Deduce the name of the destination old-style object file.
@@ -2105,11 +4378,11 @@
 	  staticdest=$func_lo2o_result
 	  ;;
 	*.$objext)
-	  staticdest="$destfile"
+	  staticdest=$destfile
 	  destfile=
 	  ;;
 	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
 	  ;;
 	esac
 
@@ -2118,7 +4391,7 @@
 	  func_show_eval "$install_prog $file $destfile" 'exit $?'
 
 	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
+	if test yes = "$build_old_libs"; then
 	  # Deduce the name of the old-style object file.
 	  func_lo2o "$file"
 	  staticobj=$func_lo2o_result
@@ -2130,23 +4403,23 @@
       *)
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# If the file is missing, and there is a .exe on the end, strip it
 	# because it is most likely a libtool script we actually want to
 	# install
-	stripped_ext=""
+	stripped_ext=
 	case $file in
 	  *.exe)
 	    if test ! -f "$file"; then
 	      func_stripname '' '.exe' "$file"
 	      file=$func_stripname_result
-	      stripped_ext=".exe"
+	      stripped_ext=.exe
 	    fi
 	    ;;
 	esac
@@ -2174,19 +4447,19 @@
 
 	  # Check the variables that should have been set.
 	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
 
-	  finalize=yes
+	  finalize=:
 	  for lib in $notinst_deplibs; do
 	    # Check to see that each library is installed.
 	    libdir=
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
 	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
 	    fi
 	  done
 
@@ -2194,34 +4467,34 @@
 	  func_source "$wrapper"
 
 	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
+	  if test no = "$fast_install" && test -n "$relink_command"; then
 	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
+	      if $finalize; then
 	        tmpdir=`func_mktempdir`
 		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
 	        # Replace the output file specification.
-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
-	        $opt_silent || {
+	        $opt_quiet || {
 	          func_quote_for_expand "$relink_command"
 		  eval "func_echo $func_quote_for_expand_result"
 	        }
 	        if eval "$relink_command"; then :
 	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
+		  func_error "error: relink '$file' with the above command before installing it"
 		  $opt_dry_run || ${RM}r "$tmpdir"
 		  continue
 	        fi
-	        file="$outputname"
+	        file=$outputname
 	      else
-	        func_warning "cannot relink \`$file'"
+	        func_warning "cannot relink '$file'"
 	      fi
 	    }
 	  else
 	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%$^/*$$%$objdir/\1%"`
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%$^/*$$%$objdir/\1%"`
 	  fi
 	fi
 
@@ -2253,15 +4526,17 @@
 
     for file in $staticlibs; do
       func_basename "$file"
-      name="$func_basename_result"
+      name=$func_basename_result
 
       # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
+      oldlib=$destdir/$name
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -2269,18 +4544,18 @@
     done
 
     test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
+      func_warning "remember to run '$progname --finish$future_libdirs'"
 
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
     else
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -2288,16 +4563,17 @@
 # a dlpreopen symbol table.
 func_generate_dlsyms ()
 {
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%^a-zA-Z0-9%_%g'`
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%^a-zA-Z0-9%_%g'`
     my_dlsyms=
 
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
       if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
+	my_dlsyms=${my_outputname}S.c
       else
 	func_error "not configured to extract global symbols from dlpreopened files"
       fi
@@ -2308,7 +4584,7 @@
       "") ;;
       *.c)
 	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
+	nlist=$output_objdir/$my_outputname.nm
 
 	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
 
@@ -2316,26 +4592,45 @@
 	func_verbose "creating $output_objdir/$my_dlsyms"
 
 	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
 
 #ifdef __cplusplus
 extern \"C\" {
 #endif
 
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* External symbol declarations for the compiler. */\
 "
 
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
 
 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
 	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
 	  if test -n "$exclude_expsyms"; then
@@ -2354,10 +4649,10 @@
 
 	  # Prepare the list of exported symbols
 	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
+	    export_symbols=$output_objdir/$outputname.exp
 	    $opt_dry_run || {
 	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
 	      case $host in
 	      *cygwin* | *mingw* | *cegcc* )
                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -2367,11 +4662,11 @@
 	    }
 	  else
 	    $opt_dry_run || {
-	      eval "${SED} -e 's/$.*^$$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval "$SED -e 's/$.*^$$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
-	        *cygwin | *mingw* | *cegcc* )
+	        *cygwin* | *mingw* | *cegcc* )
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
@@ -2381,13 +4676,55 @@
 	fi
 
 	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_verbose "extracting global C symbols from '$dlprefile'"
 	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
+	  name=$func_basename_result
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname"; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename=$func_basename_result
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename"; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
 	done
 
 	$opt_dry_run || {
@@ -2415,39 +4752,46 @@
 	  if test -f "$nlist"S; then
 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
 	  else
-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	  fi
 
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols.  */
 typedef struct {
   const char *name;
   void *address;
 } lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols;\
 "
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* )
-	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
 
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols;
-$lt_dlsym_const lt_dlsymlist
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
+LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols =
-{\
-  { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
 
 	  case $need_lib_prefix in
 	  no)
@@ -2457,7 +4801,7 @@
 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
 	    ;;
 	  esac
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  echo >> "$output_objdir/$my_dlsyms" "\
   {0, (void *) 0}
 };
 
@@ -2484,14 +4828,12 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
 	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
 	    ;;
 	  esac
 	  ;;
@@ -2500,7 +4842,7 @@
 	for arg in $LTCFLAGS; do
 	  case $arg in
 	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  *) func_append symtab_cflags " $arg" ;;
 	  esac
 	done
 
@@ -2508,28 +4850,28 @@
 	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
 
 	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
 
 	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	symfileobj=$output_objdir/${my_outputname}S.$objext
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 	  else
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 	  fi
 	  ;;
 	*)
-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 	  ;;
 	esac
 	;;
       *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
 	;;
       esac
     else
@@ -2538,38 +4880,81 @@
       # really was required.
 
       # Nullify the symbol file.
-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
     fi
 }
 
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_A-Za-z0-9_+_adl*|A-Za-z0-9_+_adl*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
 # func_win32_libid arg
 # return the library type of file 'arg'
 #
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
-  $opt_debug
-  win32_libid_type="unknown"
+  $debug_cmd
+
+  win32_libid_type=unknown
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
   *ar\ archive\ import\ library*) # definitely import
     win32_libid_type="x86 archive import"
     ;;
   *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 |
-	$SED -n -e '
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
 	    1,100{
 		/ I /{
-		    s,.*,import,
+		    s|.*|import|
 		    p
 		    q
 		}
 	    }'`
+	;;
+      esac
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -2590,15 +4975,131 @@
   $ECHO "$win32_libid_type"
 }
 
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $debug_cmd
+
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $debug_cmd
+
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:	 *file format pei\{,1\}-/d
+    /^In archive ^:*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/\. \t*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1"; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=
+  fi
+}
 
 
 # func_extract_an_archive dir oldlib
 func_extract_an_archive ()
 {
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test yes = "$lock_old_archive_extraction"; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
@@ -2610,22 +5111,23 @@
 # func_extract_archives gentop oldlib ...
 func_extract_archives ()
 {
-    $opt_debug
-    my_gentop="$1"; shift
+    $debug_cmd
+
+    my_gentop=$1; shift
     my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
 
     for my_xlib in $my_oldlibs; do
       # Extract the objects.
       case $my_xlib in
-	\\/* | A-Za-z:\\/*) my_xabs="$my_xlib" ;;
+	\\/* | A-Za-z:\\/*) my_xabs=$my_xlib ;;
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
+      my_xlib=$func_basename_result
       my_xlib_u=$my_xlib
       while :; do
         case " $extracted_archives " in
@@ -2637,7 +5139,7 @@
 	esac
       done
       extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
 
       func_mkdir_p "$my_xdir"
 
@@ -2650,26 +5152,27 @@
 	  cd $my_xdir || exit $?
 	  darwin_archive=$my_xabs
 	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
 	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
 	  if test -n "$darwin_arches"; then
 	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
 	    darwin_arch=
 	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
 	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
 	    done # $darwin_arches
             ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
 	      $LIPO -create -output "$darwin_file" $darwin_files
 	    done # $darwin_filelist
 	    $RM -rf unfat-$$
@@ -2684,31 +5187,36 @@
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
-    func_extract_archives_result="$my_oldobjs"
+    func_extract_archives_result=$my_oldobjs
 }
 
 
-
-# func_emit_wrapper_part1 arg=no
+# func_emit_wrapper arg=no
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
 #
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory where it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
 {
-	func_emit_wrapper_part1_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part1_arg1=$1
-	fi
+	func_emit_wrapper_arg1=${1-no}
 
 	$ECHO "\
 #! $SHELL
 
 # $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # The $output program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
@@ -2718,7 +5226,6 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
 # Be Bourne compatible
@@ -2749,31 +5256,135 @@
 else
   # When we are sourced in execute mode, \$file and \$ECHO are already set.
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    ECHO=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$ECHO works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$ECHO will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/^/*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"$outputname:$output:\$LINENO: newargv\$lt_dump_args_N: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
 "
-	$ECHO "\
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv0: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv0: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
 
   # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/^/*$%%'\`
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/^/*$%%'\`
   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
   while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/^/*\$%%'\`
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/^/*\$%%'\`
 
     # If there was a directory component, then change thisdir.
     if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +5394,13 @@
       esac
     fi
 
-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
   done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 arg=no
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
-	func_emit_wrapper_part2_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part2_arg1=$1
-	fi
-
-	$ECHO "\
 
   # Usually 'no', except on cygwin/mingw when embedded into
   # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +5408,7 @@
     fi
     # remove .libs from thisdir
     case \"\$thisdir\" in
-    *\\\\/$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%\\\\/^\\\\/*$%%'\` ;;
+    *\\\\/$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%\\\\/^\\\\/*$%%'\` ;;
     $objdir )   thisdir=. ;;
     esac
   fi
@@ -2824,13 +5418,13 @@
   test -n \"\$absdir\" && thisdir=\"\$absdir\"
 "
 
-	if test "$fast_install" = yes; then
+	if test yes = "$fast_install"; then
 	  $ECHO "\
   program=lt-'$outputname'$exeext
   progdir=\"\$thisdir/$objdir\"
 
   if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
     file=\"\$\$-\$program\"
@@ -2847,7 +5441,7 @@
     if test -n \"\$relink_command\"; then
       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
       else
-	$ECHO \"\$relink_command_output\" >&2
+	\$ECHO \"\$relink_command_output\" >&2
 	$RM \"\$progdir/\$file\"
 	exit 1
       fi
@@ -2869,261 +5463,48 @@
 
   if test -f \"\$progdir/\$program\"; then"
 
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
 	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
     # Add our own library path to $shlibpath_var
     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
 
     # Some systems cannot cope with colon-terminated $shlibpath_var
     # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
 
     export $shlibpath_var
 "
 	fi
 
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
 	$ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2* | *-cegcc*)
-	  $ECHO "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $ECHO "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
+      func_exec_program \${1+\"\$@\"}
     fi
   else
     # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
   fi
 fi\
 "
 }
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper arg=no
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
-	fi
-
-	# split this up so that func_emit_cwrapperexe_src
-	# can call each part independently.
-	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  e.g. native
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            lt_sed_strip_trailing_spaces="s/ *\$//"
-            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_tmp1=`cygpath -w "$1"`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=""
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
 
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  e.g. native
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-        func_to_host_pathlist_tmp2="$1"
-        # Once set for this call, this variable should not be
-        # reassigned. It is used in tha fallback case.
-        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-          $SED -e 's|^:*||' -e 's|:*$||'`
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            lt_sed_strip_trailing_spaces="s/ *\$//"
-            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-                  fi
-                fi
-              fi
-              IFS=:
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result" ; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
 
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
@@ -3134,38 +5515,30 @@
 	cat <<EOF
 
 /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
 
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "$SHELL $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
 */
 EOF
 	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef _MSC_VER
 # include <direct.h>
 # include <process.h>
 # include <io.h>
-# define setmode _setmode
 #else
 # include <unistd.h>
 # include <stdint.h>
 # ifdef __CYGWIN__
 #  include <io.h>
-#  define HAVE_SETENV
-#  ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-#  endif
 # endif
 #endif
 #include <malloc.h>
@@ -3177,9 +5550,45 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#if defined(PATH_MAX)
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* declarations of non-ANSI functions */
+#if defined __MINGW32__
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined __CYGWIN__
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined other_platform || defined ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined _MSC_VER
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+#elif defined __MINGW32__
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined __CYGWIN__
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined other platforms ... */
+#endif
+
+#if defined PATH_MAX
 # define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
 # define LT_PATHMAX MAXPATHLEN
 #else
 # define LT_PATHMAX 1024
@@ -3192,21 +5601,14 @@
 # define S_IXGRP 0
 #endif
 
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
 #ifndef DIR_SEPARATOR
 # define DIR_SEPARATOR '/'
 # define PATH_SEPARATOR ':'
 #endif
 
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
 # define HAVE_DOS_BASED_FILE_SYSTEM
 # define FOPEN_WB "wb"
 # ifndef DIR_SEPARATOR_2
@@ -3230,10 +5632,6 @@
 # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 #endif /* PATH_SEPARATOR_2 */
 
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
 #ifndef FOPEN_WB
 # define FOPEN_WB "w"
 #endif
@@ -3243,25 +5641,16 @@
 
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
+  if (stale) { free (stale); stale = 0; } \
 } while (0)
 
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
-    va_list args;
-    va_start (args, fmt);
-    (void) vfprintf (stderr, fmt, args);
-    va_end (args);
-}
+#if defined LT_DEBUGWRAPPER
+static int lt_debug = 1;
 #else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
 #endif
 
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
 
 void *xmalloc (size_t num);
 char *xstrdup (const char *string);
@@ -3271,41 +5660,32 @@
 int make_executable (const char *path);
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
 void lt_setenv (const char *name, const char *value);
 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
 void lt_update_exe_path (const char *name, const char *value);
 void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
-	    func_emit_wrapper_part1 yes |
-	        $SED -e 's/$\\"$/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-	    cat <<EOF
-
-static const char *script_text_part2 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
 EOF
-	    func_emit_wrapper_part2 yes |
-	        $SED -e 's/$\\"$/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
 
 	    cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_pathlist "$temp_rpath"
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
 	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3314,10 +5694,10 @@
 	    fi
 
 	    if test -n "$dllsearchpath"; then
-              func_to_host_pathlist "$dllsearchpath:"
+              func_to_host_path "$dllsearchpath:"
 	      cat <<EOF
 const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3326,7 +5706,7 @@
 EOF
 	    fi
 
-	    if test "$fast_install" = yes; then
+	    if test yes = "$fast_install"; then
 	      cat <<EOF
 const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
 EOF
@@ -3340,24 +5720,10 @@
 	    cat <<"EOF"
 
 #define LTWRAPPER_OPTION_PREFIX         "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
 
-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
 static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
 
 int
 main (int argc, char *argv)
@@ -3369,21 +5735,24 @@
   char *actual_cwrapper_name;
   char *target_name;
   char *lt_argv_zero;
-  intptr_t rval = 127;
+  int rval = 127;
 
   int i;
 
   program_name = (char *) xstrdup (base_name (argv0));
-  LTWRAPPER_DEBUGPRINTF (("(main) argv0      : %s\n", argv0));
-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+  newargz = XMALLOC (char *, (size_t) argc + 1);
 
-  /* very simple arg parsing; don't want to rely on getopt */
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz0, which is handled differently
+   */
+  newargc=0;
   for (i = 1; i < argc; i++)
     {
-      if (strcmp (argvi, dumpscript_opt) == 0)
+      if (STREQ (argvi, dumpscript_opt))
 	{
 EOF
-	    case "$host" in
+	    case $host in
 	      *mingw* | *cygwin* )
 		# make stdout use "unix" line endings
 		echo "          setmode(1,_O_BINARY);"
@@ -3391,25 +5760,57 @@
 	      esac
 
 	    cat <<"EOF"
-	  printf ("%s", script_text_part1);
-	  printf ("%s", script_text_part2);
+	  lt_dump_script (stdout);
 	  return 0;
 	}
+      if (STREQ (argvi, debug_opt))
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (STREQ (argvi, ltwrapper_option_prefix))
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argvi);
+        }
+      /* otherwise ... */
+      newargz++newargc = xstrdup (argvi);
     }
+  newargz++newargc = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv0: %s\n", argv0);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
 
-  newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv0);
   if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv0);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-			  tmp_pathspec));
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv0);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
 
   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-			  actual_cwrapper_path));
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
   XFREE (tmp_pathspec);
 
-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
   strendzap (actual_cwrapper_path, actual_cwrapper_name);
 
   /* wrapper name transforms */
@@ -3427,8 +5828,9 @@
   target_name = tmp_pathspec;
   tmp_pathspec = 0;
 
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-			  target_name));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
 EOF
 
 	    cat <<EOF
@@ -3478,80 +5880,19 @@
 
   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
 
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strncmp (argvi, env_set_opt, env_set_opt_len) == 0)
-        {
-          if (argvienv_set_opt_len == '=')
-            {
-              const char *p = argvi + env_set_opt_len + 1;
-              lt_opt_process_env_set (p);
-            }
-          else if (argvienv_set_opt_len == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_set (argv++i); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_set_opt);
-          continue;
-        }
-      if (strncmp (argvi, env_prepend_opt, env_prepend_opt_len) == 0)
-        {
-          if (argvienv_prepend_opt_len == '=')
-            {
-              const char *p = argvi + env_prepend_opt_len + 1;
-              lt_opt_process_env_prepend (p);
-            }
-          else if (argvienv_prepend_opt_len == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_prepend (argv++i); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_prepend_opt);
-          continue;
-        }
-      if (strncmp (argvi, env_append_opt, env_append_opt_len) == 0)
-        {
-          if (argvienv_append_opt_len == '=')
-            {
-              const char *p = argvi + env_append_opt_len + 1;
-              lt_opt_process_env_append (p);
-            }
-          else if (argvienv_append_opt_len == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_append (argv++i); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_append_opt);
-          continue;
-        }
-      if (strncmp (argvi, ltwrapper_option_prefix, opt_prefix_len) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-                    ltwrapper_option_prefix, argvi);
-        }
-      /* otherwise ... */
-      newargz++newargc = xstrdup (argvi);
-    }
-  newargz++newargc = NULL;
-
-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
   for (i = 0; i < newargc; i++)
     {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz%d   : %s\n", i, (newargzi ? newargzi : "<NULL>")));
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz%d: %s\n",
+		      i, nonnull (newargzi));
     }
 
 EOF
@@ -3560,11 +5901,14 @@
 	      mingw*)
 		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  newargz = prepare_spawn (newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
       return 127;
     }
   return rval;
@@ -3586,7 +5930,7 @@
 {
   void *p = (void *) malloc (num);
   if (!p)
-    lt_fatal ("Memory exhausted");
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
 
   return p;
 }
@@ -3603,7 +5947,7 @@
 {
   const char *base;
 
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   /* Skip over the disk name in MSDOS pathnames. */
   if (isalpha ((unsigned char) name0) && name1 == ':')
     name += 2;
@@ -3620,8 +5964,8 @@
 {
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3638,8 +5982,8 @@
   int rval = 0;
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3662,17 +6006,17 @@
   const char *p_next;
   /* static buffer for getcwd */
   char tmpLT_PATHMAX + 1;
-  int tmp_len;
+  size_t tmp_len;
   char *concat_name;
 
-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
 
   if ((wrapper == NULL) || (*wrapper == '\0'))
     return NULL;
 
   /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   if (isalpha ((unsigned char) wrapper0) && wrapper1 == ':')
     {
       concat_name = xstrdup (wrapper);
@@ -3690,7 +6034,7 @@
 	    return concat_name;
 	  XFREE (concat_name);
 	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
     }
 #endif
 
@@ -3713,13 +6057,14 @@
 	      for (q = p; *q; q++)
 		if (IS_PATH_SEPARATOR (*q))
 		  break;
-	      p_len = q - p;
+	      p_len = (size_t) (q - p);
 	      p_next = (*q == '\0' ? q : q + 1);
 	      if (p_len == 0)
 		{
 		  /* empty path: current directory */
 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal ("getcwd failed");
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
 		  tmp_len = strlen (tmp);
 		  concat_name =
 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +6089,8 @@
     }
   /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
   tmp_len = strlen (tmp);
   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
   memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +6116,9 @@
   int has_symlinks = 0;
   while (strlen (tmp_pathspec) && !has_symlinks)
     {
-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			      tmp_pathspec));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
       if (lstat (tmp_pathspec, &s) == 0)
 	{
 	  if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +6140,9 @@
 	}
       else
 	{
-	  char *errstr = strerror (errno);
-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
 	}
     }
   XFREE (tmp_pathspec);
@@ -3807,7 +6155,8 @@
   tmp_pathspec = realpath (pathspec, buf);
   if (tmp_pathspec == 0)
     {
-      lt_fatal ("Could not follow symlinks for %s", pathspec);
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
     }
   return xstrdup (tmp_pathspec);
 #endif
@@ -3827,17 +6176,31 @@
   if (patlen <= len)
     {
       str += len - patlen;
-      if (strcmp (str, pat) == 0)
+      if (STREQ (str, pat))
 	*str = '\0';
     }
   return str;
 }
 
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
 static void
-lt_error_core (int exit_status, const char *mode,
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
 	       const char *message, va_list ap)
 {
-  fprintf (stderr, "%s: %s: ", program_name, mode);
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
   vfprintf (stderr, message, ap);
   fprintf (stderr, ".\n");
 
@@ -3846,27 +6209,39 @@
 }
 
 void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
 {
   va_list ap;
   va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
   va_end (ap);
 }
 
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
 void
 lt_setenv (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
   {
 #ifdef HAVE_SETENV
     /* always make a copy, for consistency with !HAVE_SETENV */
     char *str = xstrdup (value);
     setenv (name, str, 1);
 #else
-    int len = strlen (name) + 1 + strlen (value) + 1;
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
     char *str = XMALLOC (char, len);
     sprintf (str, "%s=%s", name, value);
     if (putenv (str) != EXIT_SUCCESS)
@@ -3883,8 +6258,8 @@
   char *new_value;
   if (orig_value && *orig_value)
     {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
       new_value = XMALLOC (char, add_len + orig_value_len + 1);
       if (to_end)
         {
@@ -3904,104 +6279,21 @@
   return new_value;
 }
 
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
-  const char *p;
-  int len;
-  if (!arg || !*arg)
-    return 1;
-
-  p = strchr (arg, (int)'=');
-
-  if (!p)
-    return 1;
-
-  *value = xstrdup (++p);
-
-  len = strlen (arg) - strlen (*value);
-  *name = XMALLOC (char, len);
-  strncpy (*name, arg, len-1);
-  (*name)len - 1 = '\0';
-
-  return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-    }
-
-  lt_setenv (name, value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 0);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 1);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
 void
 lt_update_exe_path (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
       char *new_value = lt_extend_str (getenv (name), value, 0);
       /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_valuelen-1))
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_valuelen-1))
         {
-          new_valuelen-1 = '\0';
+          new_value--len = '\0';
         }
       lt_setenv (name, new_value);
       XFREE (new_value);
@@ -4011,9 +6303,9 @@
 void
 lt_update_lib_path (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
@@ -4023,25 +6315,192 @@
     }
 }
 
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argvargc != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argvi;
+
+      if (string0 == '\0')
+	new_argvi = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argvi = quoted_string;
+	}
+      else
+	new_argvi = (char *) string;
+    }
+  new_argvargc = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
 
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$\\"$/\\\1/g
+s/$/\\n/
+s/$^\n*$.*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
 EOF
 }
 # end: func_emit_cwrapperexe_src
 
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $debug_cmd
+
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++0-90-9\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $host in
     *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
+      # what system we are compiling for in order to pass an extra
       # flag for every libtool invocation.
       # allow_undefined=no
 
       # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
+      # to make a dll that has undefined symbols, in which case not
       # even a static library is built.  For now, we need to specify
       # -no-undefined on the libtool link line when we can be certain
       # that all symbols are satisfied, otherwise we get a static library.
@@ -4072,6 +6531,7 @@
     new_inherited_linker_flags=
 
     avoid_version=no
+    bindir=
     dlfiles=
     dlprefiles=
     dlself=no
@@ -4084,10 +6544,11 @@
     module=no
     no_install=no
     objs=
+    os2dllname=
     non_pic_objects=
     precious_files_regex=
     prefer_static_libs=no
-    preload=no
+    preload=false
     prev=
     prevarg=
     release=
@@ -4099,7 +6560,7 @@
     vinfo=
     vinfo_number=no
     weak_libs=
-    single_module="${wl}-single_module"
+    single_module=$wl-single_module
     func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
@@ -4107,15 +6568,15 @@
     do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	break
 	;;
       -all-static | -static | -static-libtool-libs)
 	case $arg in
 	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
 	    func_warning "complete static linking is impossible in this configuration"
 	  fi
 	  if test -n "$link_static_flag"; then
@@ -4148,7 +6609,7 @@
 
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
-      arg="$1"
+      arg=$1
       shift
       func_quote_for_eval "$arg"
       qarg=$func_quote_for_eval_unquoted_result
@@ -4164,17 +6625,22 @@
 	esac
 
 	case $prev in
+	bindir)
+	  bindir=$arg
+	  prev=
+	  continue
+	  ;;
 	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
+	  $preload || {
 	    # Add the symbol object into the linking commands.
 	    func_append compile_command " @SYMFILE@"
 	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
+	    preload=:
+	  }
 	  case $arg in
 	  *.la | *.lo) ;;  # We handle these cases below.
 	  force)
-	    if test "$dlself" = no; then
+	    if test no = "$dlself"; then
 	      dlself=needless
 	      export_dynamic=yes
 	    fi
@@ -4182,9 +6648,9 @@
 	    continue
 	    ;;
 	  self)
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
 	      dlself=yes
 	    else
 	      dlself=needless
@@ -4194,10 +6660,10 @@
 	    continue
 	    ;;
 	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
+	    if test dlfiles = "$prev"; then
+	      func_append dlfiles " $arg"
 	    else
-	      dlprefiles="$dlprefiles $arg"
+	      func_append dlprefiles " $arg"
 	    fi
 	    prev=
 	    continue
@@ -4205,14 +6671,14 @@
 	  esac
 	  ;;
 	expsyms)
-	  export_symbols="$arg"
+	  export_symbols=$arg
 	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
+	    || func_fatal_error "symbol file '$arg' does not exist"
 	  prev=
 	  continue
 	  ;;
 	expsyms_regex)
-	  export_symbols_regex="$arg"
+	  export_symbols_regex=$arg
 	  prev=
 	  continue
 	  ;;
@@ -4221,7 +6687,7 @@
 	    *-*-darwin*)
 	      case "$deplibs " in
 		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
 		   ;;
 	      esac
 	      ;;
@@ -4230,7 +6696,13 @@
 	  continue
 	  ;;
 	inst_prefix)
-	  inst_prefix_dir="$arg"
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
 	  prev=
 	  continue
 	  ;;
@@ -4240,7 +6712,7 @@
 	    moreargs=
 	    for fil in `cat "$save_arg"`
 	    do
-#	      moreargs="$moreargs $fil"
+#	      func_append moreargs " $fil"
 	      arg=$fil
 	      # A libtool-controlled object.
 
@@ -4254,22 +6726,22 @@
 
 		if test -z "$pic_object" ||
 		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
 		fi
 
 		# Extract subdirectory from the argument.
 		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
+		xdir=$func_dirname_result
 
-		if test "$pic_object" != none; then
+		if test none != "$pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
+		  pic_object=$xdir$pic_object
 
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		      func_append dlfiles " $pic_object"
 		      prev=
 		      continue
 		    else
@@ -4279,31 +6751,31 @@
 		  fi
 
 		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
+		  if test dlprefiles = "$prev"; then
 		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
+		    func_append dlprefiles " $pic_object"
 		    prev=
 		  fi
 
 		  # A PIC object.
 		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
+		  arg=$pic_object
 		fi
 
 		# Non-PIC object.
-		if test "$non_pic_object" != none; then
+		if test none != "$non_pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
+		  non_pic_object=$xdir$non_pic_object
 
 		  # A standard non-PIC object
 		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
 		  fi
 		else
 		  # If the PIC object exists, use it instead.
 		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
+		  non_pic_object=$pic_object
 		  func_append non_pic_objects " $non_pic_object"
 		fi
 	      else
@@ -4311,7 +6783,7 @@
 		if $opt_dry_run; then
 		  # Extract subdirectory from the argument.
 		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
+		  xdir=$func_dirname_result
 
 		  func_lo2o "$arg"
 		  pic_object=$xdir$objdir/$func_lo2o_result
@@ -4319,24 +6791,29 @@
 		  func_append libobjs " $pic_object"
 		  func_append non_pic_objects " $non_pic_object"
 	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
+		  func_fatal_error "'$arg' is not a valid libtool object"
 		fi
 	      fi
 	    done
 	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
+	    func_fatal_error "link input file '$arg' does not exist"
 	  fi
 	  arg=$save_arg
 	  prev=
 	  continue
 	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
 	precious_regex)
-	  precious_files_regex="$arg"
+	  precious_files_regex=$arg
 	  prev=
 	  continue
 	  ;;
 	release)
-	  release="-$arg"
+	  release=-$arg
 	  prev=
 	  continue
 	  ;;
@@ -4348,48 +6825,48 @@
 	    func_fatal_error "only absolute run-paths are allowed"
 	    ;;
 	  esac
-	  if test "$prev" = rpath; then
+	  if test rpath = "$prev"; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
+	    *) func_append rpath " $arg" ;;
 	    esac
 	  else
 	    case "$xrpath " in
 	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
+	    *) func_append xrpath " $arg" ;;
 	    esac
 	  fi
 	  prev=
 	  continue
 	  ;;
 	shrext)
-	  shrext_cmds="$arg"
+	  shrext_cmds=$arg
 	  prev=
 	  continue
 	  ;;
 	weak)
-	  weak_libs="$weak_libs $arg"
+	  func_append weak_libs " $arg"
 	  prev=
 	  continue
 	  ;;
 	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
 	  prev=
 	  func_append compile_command " $wl$qarg"
 	  func_append finalize_command " $wl$qarg"
@@ -4403,7 +6880,7 @@
 	esac
       fi # test -n "$prev"
 
-      prevarg="$arg"
+      prevarg=$arg
 
       case $arg in
       -all-static)
@@ -4417,7 +6894,7 @@
 
       -allow-undefined)
 	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
 	;;
 
       -avoid-version)
@@ -4425,6 +6902,11 @@
 	continue
 	;;
 
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
       -dlopen)
 	prev=dlfiles
 	continue
@@ -4444,7 +6926,7 @@
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
-	if test "X$arg" = "X-export-symbols"; then
+	if test X-export-symbols = "X$arg"; then
 	  prev=expsyms
 	else
 	  prev=expsyms_regex
@@ -4475,44 +6957,51 @@
 	;;
 
       -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	if test -z "$dir"; then
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
 	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
+	    func_fatal_error "require no space between '-L' and '$1'"
 	  else
-	    func_fatal_error "need path for \`-L' option"
+	    func_fatal_error "need path for '-L' option"
 	  fi
 	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
 	# We need an absolute path.
 	case $dir in
 	\\/* | A-Za-z:\\/*) ;;
 	*)
 	  absdir=`cd "$dir" && pwd`
 	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
 	  ;;
 	esac
 	case "$deplibs " in
-	*" -L$dir "*) ;;
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
 	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    \\/* | A-Za-z:\\/* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
 	  ;;
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  *) func_append dllsearchpath ":$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -4520,43 +7009,48 @@
 	;;
 
       -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
 	  *-*-os2*)
 	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.012)
 	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
 	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  esac
-	elif test "X$arg" = "X-lc_r"; then
+	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
 	 esac
 	fi
-	deplibs="$deplibs $arg"
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -mllvm)
+	prev=mllvm
 	continue
 	;;
 
@@ -4568,27 +7062,28 @@
       # Tru64 UNIX uses -model arg to determine the layout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	prev=xcompiler
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	case "$new_inherited_linker_flags " in
 	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
 	esac
 	continue
 	;;
 
       -multi_module)
-	single_module="${wl}-multi_module"
+	single_module=$wl-multi_module
 	continue
 	;;
 
@@ -4602,8 +7097,8 @@
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
 	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -4621,6 +7116,11 @@
 	continue
 	;;
 
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
       -o) prev=output ;;
 
       -precious-files-regex)
@@ -4649,13 +7149,17 @@
 	# We need an absolute path.
 	case $dir in
 	\\/* | A-Za-z:\\/*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
 	*)
 	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
 	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
+	*) func_append xrpath " $dir" ;;
 	esac
 	continue
 	;;
@@ -4704,14 +7208,14 @@
 	func_stripname '-Wc,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -4720,15 +7224,15 @@
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	  linker_flags="$linker_flags $func_quote_for_eval_result"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -4751,38 +7255,66 @@
       # -msg_* for osf cc
       -msg_*)
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
-      # -64, -mips0-9 enable 64-bit mode on the SGI compiler
-      # -r0-90-9* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m*, -t45*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # @file GCC response files
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips0-9      enable 64-bit mode for the SGI compiler
+      # -r0-90-9*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t45*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -specs=*             GCC specs files
+      # -stdlib=*            select c++ std lib with clang
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
       -64|-mips0-9|-r0-90-9*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t45*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+      -t45*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*|-fsanitize=*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
-        compiler_flags="$compiler_flags $arg"
+        func_append compiler_flags " $arg"
         continue
         ;;
 
+      -Z*)
+        if test os2 = "`expr $host : '.*$os2$'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+        fi
+	;;
+
       # Some other compiler flag.
       -* | +*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
       *.$objext)
 	# A standard object.
-	objs="$objs $arg"
+	func_append objs " $arg"
 	;;
 
       *.lo)
@@ -4798,22 +7330,22 @@
 
 	  if test -z "$pic_object" ||
 	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
 	  fi
 
 	  # Extract subdirectory from the argument.
 	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
+	  xdir=$func_dirname_result
 
-	  if test "$pic_object" != none; then
+	  test none = "$pic_object" || {
 	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
+	    pic_object=$xdir$pic_object
 
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		func_append dlfiles " $pic_object"
 		prev=
 		continue
 	      else
@@ -4823,31 +7355,31 @@
 	    fi
 
 	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
+	      func_append dlprefiles " $pic_object"
 	      prev=
 	    fi
 
 	    # A PIC object.
 	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
+	    arg=$pic_object
+	  }
 
 	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
+	  if test none != "$non_pic_object"; then
 	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
+	    non_pic_object=$xdir$non_pic_object
 
 	    # A standard non-PIC object
 	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
 	    fi
 	  else
 	    # If the PIC object exists, use it instead.
 	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
+	    non_pic_object=$pic_object
 	    func_append non_pic_objects " $non_pic_object"
 	  fi
 	else
@@ -4855,7 +7387,7 @@
 	  if $opt_dry_run; then
 	    # Extract subdirectory from the argument.
 	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
+	    xdir=$func_dirname_result
 
 	    func_lo2o "$arg"
 	    pic_object=$xdir$objdir/$func_lo2o_result
@@ -4863,31 +7395,32 @@
 	    func_append libobjs " $pic_object"
 	    func_append non_pic_objects " $non_pic_object"
 	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
+	    func_fatal_error "'$arg' is not a valid libtool object"
 	  fi
 	fi
 	;;
 
       *.$libext)
 	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
 	continue
 	;;
 
       *.la)
 	# A libtool-controlled library.
 
-	if test "$prev" = dlfiles; then
+	func_resolve_sysroot "$arg"
+	if test dlfiles = "$prev"; then
 	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
+	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
-	elif test "$prev" = dlprefiles; then
+	elif test dlprefiles = "$prev"; then
 	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
+	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
 	else
-	  deplibs="$deplibs $arg"
+	  func_append deplibs " $func_resolve_sysroot_result"
 	fi
 	continue
 	;;
@@ -4897,7 +7430,7 @@
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
       esac # arg
 
@@ -4909,9 +7442,9 @@
     done # argument parsing loop
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
+      func_fatal_help "the '$prevarg' option requires an argument"
 
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
       eval arg=\"$export_dynamic_flag_spec\"
       func_append compile_command " $arg"
       func_append finalize_command " $arg"
@@ -4920,20 +7453,25 @@
     oldlibs=
     # calculate the name of the file, without its directory
     func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
     func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
+    output_objdir=$func_dirname_result$objdir
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
     func_mkdir_p "$output_objdir"
 
@@ -4954,15 +7492,15 @@
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if $opt_duplicate_deps ; then
+      if $opt_preserve_dup_deps; then
 	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
       fi
-      libs="$libs $deplib"
+      func_append libs " $deplib"
     done
 
-    if test "$linkmode" = lib; then
+    if test lib = "$linkmode"; then
       libs="$predeps $libs $compiler_lib_search_path $postdeps"
 
       # Compute libraries that are listed more than once in $predeps
@@ -4972,9 +7510,9 @@
       if $opt_duplicate_compiler_generated_deps; then
 	for pre_post_dep in $predeps $postdeps; do
 	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
 	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	  func_append pre_post_deps " $pre_post_dep"
 	done
       fi
       pre_post_deps=
@@ -4994,7 +7532,7 @@
 	  case $file in
 	  *.la) ;;
 	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
 	    ;;
 	  esac
 	done
@@ -5002,7 +7540,7 @@
     prog)
 	compile_deplibs=
 	finalize_deplibs=
-	alldeplibs=no
+	alldeplibs=false
 	newdlfiles=
 	newdlprefiles=
 	passes="conv scan dlopen dlpreopen link"
@@ -5014,85 +7552,88 @@
     for pass in $passes; do
       # The preopen pass in lib mode reverses $deplibs; put it back here
       # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
+      if test lib,link = "$linkmode,$pass"; then
 	## FIXME: Find the place where the list is rebuilt in the wrong
 	##        order, and fix it there properly
         tmp_deplibs=
 	for deplib in $deplibs; do
 	  tmp_deplibs="$deplib $tmp_deplibs"
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
       fi
 
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
 	deplibs=
       fi
-      if test "$linkmode" = prog; then
+      if test prog = "$linkmode"; then
 	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
 	link)
 	  libs="$deplibs %DEPLIBS%"
 	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
 	  ;;
 	esac
       fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+      if test lib,dlpreopen = "$linkmode,$pass"; then
 	# Collect and forward deplibs of preopened libtool libs
 	for lib in $dlprefiles; do
 	  # Ignore non-libtool-libs
 	  dependency_libs=
+	  func_resolve_sysroot "$lib"
 	  case $lib in
-	  *.la)	func_source "$lib" ;;
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
 	  esac
 
 	  # Collect preopened libtool deplibs, except any this library
 	  # has declared as weak libs
 	  for deplib in $dependency_libs; do
-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
 	    case " $weak_libs " in
 	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
+	    *) func_append deplibs " $deplib" ;;
 	    esac
 	  done
 	done
-	libs="$dlprefiles"
+	libs=$dlprefiles
       fi
-      if test "$pass" = dlopen; then
+      if test dlopen = "$pass"; then
 	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
+	save_deplibs=$deplibs
 	deplibs=
       fi
 
       for deplib in $libs; do
 	lib=
-	found=no
+	found=false
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    compiler_flags="$compiler_flags $deplib"
-	    if test "$linkmode" = lib ; then
+	    func_append compiler_flags " $deplib"
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
 	  continue
 	  ;;
 	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
 	    continue
 	  fi
 	  func_stripname '-l' '' "$deplib"
 	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
 	  else
 	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -5100,31 +7641,22 @@
 	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
+	      lib=$searchdir/lib$name$search_ext
 	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
+		if test .la = "$search_ext"; then
+		  found=:
 		else
-		  found=no
+		  found=false
 		fi
 		break 2
 	      fi
 	    done
 	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
+	  if $found; then
+	    # deplib is a libtool library
 	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
 	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 	      case " $predeps $postdeps " in
 	      *" $deplib "*)
 		if func_lalib_p "$lib"; then
@@ -5132,19 +7664,19 @@
 		  old_library=
 		  func_source "$lib"
 		  for l in $old_library $library_names; do
-		    ll="$l"
+		    ll=$l
 		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
 		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
+		    ladir=$func_dirname_result
 		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
+		    if test prog,link = "$linkmode,$pass"; then
 		      compile_deplibs="$deplib $compile_deplibs"
 		      finalize_deplibs="$deplib $finalize_deplibs"
 		    else
 		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
 		    fi
 		    continue
 		  fi
@@ -5153,18 +7685,28 @@
 	      *) ;;
 	      esac
 	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
 	  fi
 	  ;; # -l
 	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -5174,47 +7716,53 @@
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
+	    test conv = "$pass" && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  prog)
-	    if test "$pass" = conv; then
+	    if test conv = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	      continue
 	    fi
-	    if test "$pass" = scan; then
+	    if test scan = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
+	    func_warning "'-L' is ignored for archives/objects"
 	    ;;
 	  esac # linkmode
 	  continue
 	  ;; # -L
 	-R*)
-	  if test "$pass" = link; then
+	  if test link = "$pass"; then
 	    func_stripname '-R' '' "$deplib"
-	    dir=$func_stripname_result
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
+	    *) func_append xrpath " $dir" ;;
 	    esac
 	  fi
 	  deplibs="$deplib $deplibs"
 	  continue
 	  ;;
-	*.la) lib="$deplib" ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
 	*.$libext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
 	    continue
 	  fi
@@ -5225,40 +7773,40 @@
 	    case " $dlpreconveniencelibs " in
 	    *" $deplib "*) ;;
 	    *)
-	      valid_a_lib=no
+	      valid_a_lib=false
 	      case $deplibs_check_method in
 		match_pattern*)
 		  set dummy $deplibs_check_method; shift
 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
+		    valid_a_lib=:
 		  fi
 		;;
 		pass_all)
-		  valid_a_lib=yes
+		  valid_a_lib=:
 		;;
 	      esac
-	      if test "$valid_a_lib" != yes; then
-		$ECHO
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-		$ECHO "*** that it is just a static archive that I should not use here."
-	      else
-		$ECHO
+	      if $valid_a_lib; then
+		echo
 		$ECHO "*** Warning: Linking the shared library $output against the"
 		$ECHO "*** static library $deplib is not portable!"
 		deplibs="$deplib $deplibs"
+	      else
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
 	      fi
 	      ;;
 	    esac
 	    continue
 	    ;;
 	  prog)
-	    if test "$pass" != link; then
+	    if test link != "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -5269,38 +7817,36 @@
 	  esac # linkmode
 	  ;; # *.$libext
 	*.lo | *.$objext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
+	      func_append newdlprefiles " $deplib"
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    else
-	      newdlfiles="$newdlfiles $deplib"
+	      func_append newdlfiles " $deplib"
 	    fi
 	  fi
 	  continue
 	  ;;
 	%DEPLIBS%)
-	  alldeplibs=yes
+	  alldeplibs=:
 	  continue
 	  ;;
 	esac # case $deplib
 
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
 
 	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
+	ladir=$func_dirname_result
 
 	dlname=
 	dlopen=
@@ -5321,44 +7867,44 @@
 
 	# Convert "-framework foo" to "foo.ltframework"
 	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework $^ $*$/\1.ltframework/g'`
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework $^ $*$/\1.ltframework/g'`
 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
 	    case " $new_inherited_linker_flags " in
 	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
 	    esac
 	  done
 	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% $^ $*$.ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
-	if test "$pass" = conv; then
+	if test conv = "$pass"; then
 	  # Only check for convenience libraries
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
+	      func_fatal_error "cannot find name of link library for '$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
 	    tmp_libs=
 	    for deplib in $dependency_libs; do
 	      deplibs="$deplib $deplibs"
-	      if $opt_duplicate_deps ; then
+	      if $opt_preserve_dup_deps; then
 		case "$tmp_libs " in
-		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 		esac
 	      fi
-	      tmp_libs="$tmp_libs $deplib"
+	      func_append tmp_libs " $deplib"
 	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
 	  fi
 	  continue
 	fi # $pass = conv
@@ -5366,101 +7912,133 @@
 
 	# Get the name of the library we link against.
 	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
+	if test -n "$old_library" &&
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib=$l
+	  done
+	fi
 	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
+	  func_fatal_error "cannot find name of link library for '$lib'"
 	fi
 
 	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
 	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
 	    # If there is no dlname, no dlopen support or we're linking
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
 	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	    func_append dlprefiles " $lib $dependency_libs"
 	  else
-	    newdlfiles="$newdlfiles $lib"
+	    func_append newdlfiles " $lib"
 	  fi
 	  continue
 	fi # $pass = dlopen
 
 	# We need an absolute path.
 	case $ladir in
-	\\/* | A-Za-z:\\/*) abs_ladir="$ladir" ;;
+	\\/* | A-Za-z:\\/*) abs_ladir=$ladir ;;
 	*)
 	  abs_ladir=`cd "$ladir" && pwd`
 	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "cannot determine absolute directory name of '$ladir'"
 	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
+	    abs_ladir=$ladir
 	  fi
 	  ;;
 	esac
 	func_basename "$lib"
-	laname="$func_basename_result"
+	laname=$func_basename_result
 
 	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
+	if test yes = "$installed"; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
 	  else
-	    dir="$libdir"
-	    absdir="$libdir"
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
 	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
 	else
 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
+	    dir=$ladir
+	    absdir=$abs_ladir
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  fi
 	fi # $installed = yes
 	func_stripname 'lib' '.la' "$laname"
 	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	    # Keep a list of preopened convenience libraries to check
-	    # that they are being used correctly in the link pass.
-	    test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
 	  fi
+	  case $host in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
 	fi # $pass = dlpreopen
 
 	if test -z "$libdir"; then
 	  # Link the convenience library
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
+	  elif test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$dir/$old_library $compile_deplibs"
 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
 	  else
@@ -5470,52 +8048,53 @@
 	fi
 
 
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
+	if test prog = "$linkmode" && test link != "$pass"; then
+	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
 	  fi
 
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    case $deplib in
 	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
+	    if $linkalldeplibs; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      # Need to hardcode shared library paths
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_duplicate_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done # for deplib
 	  continue
 	fi # $linkmode = prog...
 
-	if test "$linkmode,$pass" = "prog,link"; then
+	if test prog,link = "$linkmode,$pass"; then
 	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
 	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
 	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
+	      case $temp_rpath: in
 	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
+	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
 	    fi
 
@@ -5527,7 +8106,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5536,15 +8115,15 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
 	  fi # $linkmode,$pass = prog,link...
 
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
 		 test -n "$library_names"; }; }; then
 	    # We only need to search for static libraries
 	    continue
@@ -5553,20 +8132,20 @@
 
 	link_static=no # Whether the deplib will be linked statically
 	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
+	if test built = "$use_static_libs" && test yes = "$installed"; then
 	  use_static_libs=no
 	fi
 	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
 	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
 	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=no
 	    ;;
 	  *)
-	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
+	    if test no = "$installed"; then
+	      func_append notinst_deplibs " $lib"
 	      need_relink=yes
 	    fi
 	    ;;
@@ -5575,24 +8154,24 @@
 
 	  # Warn about portability, can't link against -module's on some
 	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
+	  dlopenmodule=
 	  for dlpremoduletest in $dlprefiles; do
 	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
+	      dlopenmodule=$dlpremoduletest
 	      break
 	    fi
 	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    $ECHO
-	    if test "$linkmode" = prog; then
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
+	    echo
+	    if test prog = "$linkmode"; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
 	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
 	    $ECHO "*** $linklib is not portable!"
 	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
 	    # Hardcode the library path.
 	    # Skip directories that are in the system default run-time
 	    # search path.
@@ -5601,7 +8180,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5610,7 +8189,7 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5620,43 +8199,43 @@
 	    # figure out the soname
 	    set dummy $library_names
 	    shift
-	    realname="$1"
+	    realname=$1
 	    shift
 	    libname=`eval "\\$ECHO \"$libname_spec\""`
 	    # use dlname if we got it. it's perfectly good, no?
 	    if test -n "$dlname"; then
-	      soname="$dlname"
+	      soname=$dlname
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
+	      *cygwin* | mingw* | *cegcc* | *os2*)
 	        func_arith $current - $age
 		major=$func_arith_result
-		versuffix="-$major"
+		versuffix=-$major
 		;;
 	      esac
 	      eval soname=\"$soname_spec\"
 	    else
-	      soname="$realname"
+	      soname=$realname
 	    fi
 
 	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
+	    soroot=$soname
 	    func_basename "$soroot"
-	    soname="$func_basename_result"
+	    soname=$func_basename_result
 	    func_stripname 'lib' '.dll' "$soname"
 	    newlib=libimp-$func_stripname_result.a
 
 	    # If the library has no export list, then create one now
 	    if test -f "$output_objdir/$soname-def"; then :
 	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_verbose "extracting exported symbol list from '$soname'"
 	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 	    fi
 
 	    # Create $newlib
 	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
+	      func_verbose "generating import library for '$soname'"
 	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 	    fi
 	    # make sure the library variables are pointing to the new library
@@ -5664,70 +8243,70 @@
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$mode" != relink; then
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    lib_linked=yes
 	    case $hardcode_action in
 	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
 		case $host in
-		  *-*-sco3.2v5.0.024*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sco3.2v5.0.024*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
 		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.01.10* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
+		    *-*-unixware7*) add_dir=-L$dir ;;
 		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
+		    # if the lib is a (non-dlopened) module then we cannot
 		    # link against it, someone is ignoring the earlier warnings
 		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": ^:* bundle" >/dev/null ; then
+			 $GREP ": ^:* bundle" >/dev/null; then
 		      if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  $ECHO
-			  $ECHO "*** And there doesn't seem to be a static archive available"
-			  $ECHO "*** The link will probably fail, sorry"
+			if test -z "$old_library"; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
 			else
-			  add="$dir/$old_library"
+			  add=$dir/$old_library
 			fi
 		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
+			add=$dir/$old_library
 		      fi
 		    fi
 		esac
-	      elif test "$hardcode_minus_L" = no; then
+	      elif test no = "$hardcode_minus_L"; then
 		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
+		*-*-sunos*) add_shlibpath=$dir ;;
 		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
 	      ;;
 	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
 		    \\/*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
 		      ;;
 		  esac
 		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
@@ -5735,72 +8314,72 @@
 	    *) lib_linked=no ;;
 	    esac
 
-	    if test "$lib_linked" != yes; then
+	    if test yes != "$lib_linked"; then
 	      func_fatal_configuration "unsupported hardcode properties"
 	    fi
 
 	    if test -n "$add_shlibpath"; then
 	      case :$compile_shlibpath: in
 	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
 	    else
 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
 		esac
 	      fi
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$mode" = relink; then
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
 	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
 	      else
-		add="$libdir/$linklib"
+		add=$libdir/$linklib
 	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+	      add_dir=-L$libdir
 	      # Try looking first in the location we're being installed to.
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
 		  \\/*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
-	      add="-l$name"
+	      add=-l$name
 	    fi
 
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -5808,43 +8387,43 @@
 	      test -n "$add" && deplibs="$add $deplibs"
 	    fi
 	  fi
-	elif test "$linkmode" = prog; then
+	elif test prog = "$linkmode"; then
 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 	  # is not unsupported.  This is valid on all known static and
 	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
 	    compile_deplibs="$dir/$linklib $compile_deplibs"
 	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
 	  else
 	    compile_deplibs="-l$name -L$dir $compile_deplibs"
 	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
 	  fi
-	elif test "$build_libtool_libs" = yes; then
+	elif test yes = "$build_libtool_libs"; then
 	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
+	  if test pass_all != "$deplibs_check_method"; then
 	    # We're trying link a shared library against a static one
 	    # but the system doesn't support it.
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    $ECHO
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    $ECHO "*** I have the capability to make that library automatically link in when"
-	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-	    $ECHO "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $ECHO "*** But as you try to build a module library, libtool will still create "
-	      $ECHO "*** a static module, that should work as long as the dlopening application"
-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	    echo
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test yes = "$module"; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
-		$ECHO
-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$ECHO "*** not find such a program.  So, this module is probably useless."
-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	      fi
-	      if test "$build_old_libs" = no; then
+	      if test no = "$build_old_libs"; then
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -5857,11 +8436,11 @@
 	  fi
 	fi # link shared/static library?
 
-	if test "$linkmode" = lib; then
+	if test lib = "$linkmode"; then
 	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
 	    for libdir in $dependency_libs; do
@@ -5870,46 +8449,54 @@
 	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
+		   *) func_append xrpath " $temp_xrpath";;
 		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
-	    dependency_libs="$temp_deplibs"
+	    dependency_libs=$temp_deplibs
 	  fi
 
-	  newlib_search_path="$newlib_search_path $absdir"
+	  func_append newlib_search_path " $absdir"
 	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $func_resolve_sysroot_result"
 	  done
 
-	  if test "$link_all_deplibs" != no; then
+	  if test no != "$link_all_deplibs"; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
 	      path=
 	      case $deplib in
-	      -L*) path="$deplib" ;;
+	      -L*) path=$deplib ;;
 	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
 	        func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
+		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
-		\\/* | A-Za-z:\\/*) absdir="$dir" ;;
+		\\/* | A-Za-z:\\/*) absdir=$dir ;;
 		*)
 		  absdir=`cd "$dir" && pwd`
 		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
 		  fi
 		  ;;
 		esac
@@ -5917,35 +8504,35 @@
 		case $host in
 		*-*-darwin*)
 		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=$.*$$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=$.*$$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
                       if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                       fi
-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
 		      path=
 		    fi
 		  fi
 		  ;;
 		*)
-		  path="-L$absdir/$objdir"
+		  path=-L$absdir/$objdir
 		  ;;
 		esac
 		else
-		  eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		  eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $deplib`
 		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
 		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
+		    func_warning "'$deplib' seems to be moved"
 
-		  path="-L$absdir"
+		  path=-L$absdir
 		fi
 		;;
 	      esac
@@ -5957,38 +8544,38 @@
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
       done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $^ $*$.ltframework% -framework \1%g'`
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
 	fi
       fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
 	# Link the dlpreopened libraries before other libraries
 	for deplib in $save_deplibs; do
 	  deplibs="$deplib $deplibs"
 	done
       fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
 	  # Make sure lib_search_path contains only unique directories.
 	  lib_search_path=
 	  for dir in $newlib_search_path; do
 	    case "$lib_search_path " in
 	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
+	    *) func_append lib_search_path " $dir" ;;
 	    esac
 	  done
 	  newlib_search_path=
-	fi
+	}
 
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
+	if test prog,link = "$linkmode,$pass"; then
 	  vars="compile_deplibs finalize_deplibs"
+	else
+	  vars=deplibs
 	fi
 	for var in $vars dependency_libs; do
 	  # Add libraries to $var in reverse order
@@ -6037,71 +8624,102 @@
 	    -L*)
 	      case " $tmp_libs " in
 	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      *) func_append tmp_libs " $deplib" ;;
 	      esac
 	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    *) func_append tmp_libs " $deplib" ;;
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
       # Last step: remove runtime libs from dependency_libs
       # (they stay in deplibs)
       tmp_libs=
-      for i in $dependency_libs ; do
+      for i in $dependency_libs; do
 	case " $predeps $postdeps $compiler_lib_search_path " in
 	*" $i "*)
-	  i=""
+	  i=
 	  ;;
 	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
+	if test -n "$i"; then
+	  func_append tmp_libs " $i"
 	fi
       done
       dependency_libs=$tmp_libs
     done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
     fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
     fi
 
     case $linkmode in
     oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+	func_warning "'-l' and '-L' are ignored for archives" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
+	func_warning "'-rpath' is ignored for archives"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
+	func_warning "'-R' is ignored for archives"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
+	func_warning "'-version-info/-version-number' is ignored for archives"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
+	func_warning "'-release' is ignored for archives"
 
       test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
+	func_warning "'-export-symbols' is ignored for archives"
 
       # Now set the variables for building old libraries.
       build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
+      oldlibs=$output
+      func_append objs "$old_deplibs"
       ;;
 
     lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
+      # Make sure we only generate libraries of the form 'libNAME.la'.
       case $outputname in
       lib*)
 	func_stripname 'lib' '.la' "$outputname"
@@ -6110,10 +8728,10 @@
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
 
-	if test "$need_lib_prefix" != no; then
+	if test no != "$need_lib_prefix"; then
 	  # Add the "lib" prefix for modules if required
 	  func_stripname '' '.la' "$outputname"
 	  name=$func_stripname_result
@@ -6127,31 +8745,31 @@
       esac
 
       if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
 	else
-	  $ECHO
+	  echo
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
 	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
+	  func_append libobjs " $objs"
 	fi
       fi
 
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
       shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
 
-      install_libdir="$1"
+      install_libdir=$1
 
       oldlibs=
       if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
+	if test yes = "$build_libtool_libs"; then
 	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
+	  # Some compilers have problems with a '.al' extension so
 	  # convenience libraries should have the same extension an
 	  # archive normally would.
 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -6160,20 +8778,20 @@
 	fi
 
 	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
 
 	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
+	  func_warning "'-release' is ignored for convenience libraries"
       else
 
 	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
+	save_ifs=$IFS; IFS=:
 	set dummy $vinfo 0 0 0
 	shift
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
+	  func_fatal_help "too many parameters to '-version-info'"
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
@@ -6181,44 +8799,45 @@
 
 	case $vinfo_number in
 	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
 	  #
 	  # There are really only two kinds -- those that
 	  # use the current revision as the major version
 	  # and those that subtract age and use age as
 	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
+	  # that has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows|none)
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|freebsd-elf|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
+	    age=$number_minor
+	    revision=$number_revision
 	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
 	    ;;
 	  irix|nonstopux)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
+	    age=$number_minor
+	    revision=$number_minor
 	    lt_irix_increment=no
 	    ;;
 	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
 	    ;;
 	  esac
 	  ;;
 	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
+	  current=$1
+	  revision=$2
+	  age=$3
 	  ;;
 	esac
 
@@ -6226,30 +8845,30 @@
 	case $current in
 	0|1-9|1-90-9|1-90-90-9|1-90-90-90-9|1-90-90-90-90-9) ;;
 	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $revision in
 	0|1-9|1-90-9|1-90-90-9|1-90-90-90-9|1-90-90-90-90-9) ;;
 	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $age in
 	0|1-9|1-90-9|1-90-90-9|1-90-90-90-9|1-90-90-90-90-9) ;;
 	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	fi
 
 	# Calculate the version variables.
@@ -6264,26 +8883,36 @@
 	  # verstring for coding it into the library header
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  # Darwin ld doesn't like 0 for these options...
 	  func_arith $current + 1
 	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
 	  ;;
 
 	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
+	  if test no = "$lt_irix_increment"; then
 	    func_arith $current - $age
 	  else
 	    func_arith $current - $age + 1
@@ -6294,69 +8923,74 @@
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
 	  esac
-	  verstring="$verstring_prefix$major.$revision"
+	  verstring=$verstring_prefix$major.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$revision
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $revision - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
+	    verstring=$verstring_prefix$major.$iface:$verstring
 	  done
 
-	  # Before this point, $major must not contain `.'.
+	  # Before this point, $major must not contain '.'.
 	  major=.$major
-	  versuffix="$major.$revision"
+	  versuffix=$major.$revision
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	osf)
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$age
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $current - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
+	    verstring=$verstring:$iface.0
 	  done
 
 	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
+	  func_append verstring ":$current.0"
 	  ;;
 
 	qnx)
-	  major=".$current"
-	  versuffix=".$current"
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
 	  ;;
 
 	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	windows)
 	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
+	  # extension on DOS 8.3 file systems.
 	  func_arith $current - $age
 	  major=$func_arith_result
-	  versuffix="-$major"
+	  versuffix=-$major
 	  ;;
 
 	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  func_fatal_configuration "unknown library version type '$version_type'"
 	  ;;
 	esac
 
@@ -6370,42 +9004,45 @@
 	    verstring=
 	    ;;
 	  *)
-	    verstring="0.0"
+	    verstring=0.0
 	    ;;
 	  esac
-	  if test "$need_version" = no; then
+	  if test no = "$need_version"; then
 	    versuffix=
 	  else
-	    versuffix=".0.0"
+	    versuffix=.0.0
 	  fi
 	fi
 
 	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
+	if test yes,no = "$avoid_version,$need_version"; then
 	  major=
 	  versuffix=
-	  verstring=""
+	  verstring=
 	fi
 
 	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
 	  fi
 	else
 	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
+	  allow_undefined_flag=$no_undefined_flag
 	fi
 
       fi
 
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
+      func_generate_dlsyms "$libname" "$libname" :
+      func_append libobjs " $symfileobj"
+      test " " = "$libobjs" && libobjs=
 
-      if test "$mode" != relink; then
+      if test relink != "$opt_mode"; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -6414,14 +9051,14 @@
 	  case $p in
 	    *.$objext | *.gcno)
 	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
 		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
 		 then
 		   continue
 		 fi
 	       fi
-	       removelist="$removelist $p"
+	       func_append removelist " $p"
 	       ;;
 	    *) ;;
 	  esac
@@ -6431,64 +9068,65 @@
       fi
 
       # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
       #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
       #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
 	temp_xrpath=
 	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
 	  dependency_libs="$temp_xrpath $dependency_libs"
 	fi
       fi
 
       # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
+      old_dlfiles=$dlfiles
       dlfiles=
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
 	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
+	*) func_append dlfiles " $lib" ;;
 	esac
       done
 
       # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
+      old_dlprefiles=$dlprefiles
       dlprefiles=
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
 	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
+	*) func_append dlprefiles " $lib" ;;
 	esac
       done
 
-      if test "$build_libtool_libs" = yes; then
+      if test yes = "$build_libtool_libs"; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.012)
 	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -6504,8 +9142,8 @@
 	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
+	    if test yes = "$build_libtool_need_lc"; then
+	      func_append deplibs " -lc"
 	    fi
 	    ;;
 	  esac
@@ -6520,9 +9158,9 @@
 	# I'm not sure if I'm treating the release correctly.  I think
 	# release should show up in the -l (ie -lgmp5) so we don't want to
 	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
+	release=
+	versuffix=
+	major=
 	newdeplibs=
 	droppeddeps=no
 	case $deplibs_check_method in
@@ -6551,35 +9189,35 @@
 	      -l*)
 		func_stripname -l '' "$i"
 		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
+		    func_append newdeplibs " $i"
+		    i=
 		    ;;
 		  esac
 		fi
-		if test -n "$i" ; then
+		if test -n "$i"; then
 		  libname=`eval "\\$ECHO \"$libname_spec\""`
 		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
-		    $ECHO
+		    echo
 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    $ECHO "*** I have the capability to make that library automatically link in when"
-		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-		    $ECHO "*** shared version of the library, which I believe you do not have"
-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
 		  fi
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6594,43 +9232,43 @@
 		$opt_dry_run || $RM conftest
 		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
+		      func_append newdeplibs " $i"
+		      i=
 		      ;;
 		    esac
 		  fi
-		  if test -n "$i" ; then
+		  if test -n "$i"; then
 		    libname=`eval "\\$ECHO \"$libname_spec\""`
 		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		      func_append newdeplibs " $i"
 		    else
 		      droppeddeps=yes
-		      $ECHO
+		      echo
 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      $ECHO "*** I have the capability to make that library automatically link in when"
-		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-		      $ECHO "*** shared version of the library, which you do not appear to have"
-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
 		    fi
 		  fi
 		else
 		  droppeddeps=yes
-		  $ECHO
+		  echo
 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $ECHO "*** make it link in!  You will probably need to install it or some"
-		  $ECHO "*** library that it depends on before this library will be fully"
-		  $ECHO "*** functional.  Installing it before continuing would be even better."
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6644,18 +9282,30 @@
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname.-* 2>/dev/null`
+		  if test yes = "$want_nocaseglob"; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob.-* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob.-* 2>/dev/null`
+		  fi
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null |
@@ -6667,33 +9317,33 @@
 		      # We might still enter an endless loop, since a link
 		      # loop can be closed while we follow links,
 		      # but so what?
-		      potlib="$potent_lib"
+		      potlib=$potent_lib
 		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
 			case $potliblink in
-			\\/* | A-Za-z:\\/*) potlib="$potliblink";;
-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,^/*$,,'`"$potliblink";;
+			\\/* | A-Za-z:\\/*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|^/*$||'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
+			func_append newdeplibs " $a_deplib"
+			a_deplib=
 			break 2
 		      fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
-		$ECHO
+		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -6703,7 +9353,7 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -6716,38 +9366,38 @@
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		  potential_libs=`ls $i/$libname.-* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+		    potlib=$potent_lib # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=
 		      break 2
 		    fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
-		$ECHO
+		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -6757,32 +9407,32 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-	      -e 's/ -lc$//' -e 's/ -LR^ *//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
+	  newdeplibs=
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -LR^ *//g'`
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
 	    done
 	  fi
-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/	 //g' |
-	     $GREP . >/dev/null; then
-	    $ECHO
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+	  case $tmp_deplibs in
+	  *!\	\ *)
+	    echo
+	    if test none = "$deplibs_check_method"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    $ECHO "*** All declared inter-library dependencies are being dropped."
+	    echo "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
-	  fi
+	    ;;
+	  esac
 	  ;;
 	esac
 	versuffix=$versuffix_save
@@ -6794,44 +9444,44 @@
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.012)
 	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
 	  ;;
 	esac
 
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $ECHO
-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $ECHO "*** a static module, that should work as long as the dlopening"
-	    $ECHO "*** application is linked with the -dlopen flag."
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
-	      $ECHO
-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $ECHO "*** not find such a program.  So, this module is probably useless."
-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
 	      build_libtool_libs=module
 	      build_old_libs=yes
 	    else
 	      build_libtool_libs=no
 	    fi
 	  else
-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-	    $ECHO "*** automatically added whenever a program is linked with this library"
-	    $ECHO "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $ECHO
-	      $ECHO "*** Since this library must not contain undefined symbols,"
-	      $ECHO "*** because either the platform does not support them or"
-	      $ECHO "*** it was explicitly requested with -no-undefined,"
-	      $ECHO "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test no = "$allow_undefined"; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -6846,9 +9496,9 @@
       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
       case $host in
 	*-*-darwin*)
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% $^ $*$.ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $^ $*$.ltframework% -framework \1%g'`
-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% $^ $*$.ltframework% -framework \1%g'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
 	  ;;
       esac
 
@@ -6861,7 +9511,7 @@
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -6871,13 +9521,13 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      deplibs="$new_libs"
+      deplibs=$new_libs
 
       # All the library-specific variables (install_libdir is set above).
       library_names=
@@ -6885,62 +9535,65 @@
       dlname=
 
       # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test yes = "$hardcode_into_libs"; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
+		  hardcode_libdirs=$libdir
 		else
 		  # Just accumulate the unique libdirs.
 		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
 	  # Substitute the hardcoded libdirs into the rpath.
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    libdir=$hardcode_libdirs
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
 	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 	fi
 
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -6950,34 +9603,34 @@
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	shift
-	realname="$1"
+	realname=$1
 	shift
 
 	if test -n "$soname_spec"; then
 	  eval soname=\"$soname_spec\"
 	else
-	  soname="$realname"
+	  soname=$realname
 	fi
 	if test -z "$dlname"; then
 	  dlname=$soname
 	fi
 
-	lib="$output_objdir/$realname"
+	lib=$output_objdir/$realname
 	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
+	  func_append linknames " $link"
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	test "X$libobjs" = "X " && libobjs=
 
 	delfiles=
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
+	  export_symbols=$output_objdir/$libname.uexp
+	  func_append delfiles " $export_symbols"
 	fi
 
 	orig_export_symbols=
@@ -6985,36 +9638,68 @@
 	cygwin* | mingw* | cegcc*)
 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	    func_dll_def_p "$export_symbols" || {
 	      # and it's NOT already a .def file. Must figure out
 	      # which of the given symbols are data symbols and tag
 	      # them as such. So, trigger use of export_symbols_cmds.
 	      # export_symbols gets reassigned inside the "prepare
 	      # the list of exported symbols" if statement, so the
 	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
+	      orig_export_symbols=$export_symbols
 	      export_symbols=
 	      always_export_symbols=yes
-	    fi
+	    }
 	  fi
 	  ;;
 	esac
 
 	# Prepare the list of exported symbols
 	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	    save_ifs=$IFS; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS=$save_ifs
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test yes = "$try_normal_branch" \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=$output_objdir/$output_la.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
 		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
 		skipped_export=false
 	      else
 		# The command line is too long to execute in one step.
@@ -7025,8 +9710,8 @@
 		break
 	      fi
 	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 	    fi
@@ -7034,21 +9719,21 @@
 	fi
 
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
 	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
 	  # though. Also, the filter scales superlinearly with the number of
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
 	  $opt_dry_run || $SED -e '/ ,DATA/!d;s,$.*$$ \,.*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	  export_symbols=$output_objdir/$libname.def
 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
@@ -7058,15 +9743,15 @@
 	  case " $convenience " in
 	  *" $test_deplib "*) ;;
 	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    func_append tmp_deplibs " $test_deplib"
 	    ;;
 	  esac
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
 
 	if test -n "$convenience"; then
 	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
+	    test yes = "$compiler_needs_object" &&
 	    test -z "$libobjs"; then
 	    # extract the archives, so we have objects to list.
 	    # TODO: could optimize this to just extract one archive.
@@ -7077,27 +9762,27 @@
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 	    test "X$libobjs" = "X " && libobjs=
 	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
+	    gentop=$output_objdir/${outputname}x
+	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
+	    func_append libobjs " $func_extract_archives_result"
 	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
 
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
 	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
+	if test yes = "$module" && test -n "$module_cmds"; then
 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	    eval test_cmds=\"$module_expsym_cmds\"
 	    cmds=$module_expsym_cmds
@@ -7115,7 +9800,7 @@
 	  fi
 	fi
 
-	if test "X$skipped_export" != "X:" &&
+	if test : != "$skipped_export" &&
 	   func_len " $test_cmds" &&
 	   len=$func_len_result &&
 	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -7137,7 +9822,8 @@
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+	  func_basename "$output"
+	  output_la=$func_basename_result
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -7147,37 +9833,42 @@
 	  last_robj=
 	  k=1
 
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
 	    func_verbose "creating GNU ld script: $output"
-	    $ECHO 'INPUT (' > $output
+	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    $ECHO ')' >> $output
-	    delfiles="$delfiles $output"
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
 	    func_verbose "creating linker input file list: $output"
 	    : > $output
 	    set x $save_libobjs
 	    shift
 	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
+	    if test yes = "$compiler_needs_object"; then
 	      firstobj="$1 "
 	      shift
 	    fi
 	    for obj
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
+	      output=$output_objdir/$output_la-$k.$objext
 	      eval test_cmds=\"$reload_cmds\"
 	      func_len " $test_cmds"
 	      len0=$func_len_result
@@ -7189,25 +9880,27 @@
 		func_len " $obj"
 		func_arith $len + $func_len_result
 		len=$func_arith_result
-		if test "X$objlist" = X ||
+		if test -z "$objlist" ||
 		   test "$len" -lt "$max_cmd_len"; then
 		  func_append objlist " $obj"
 		else
 		  # The command $test_cmds is almost too long, add a
 		  # command to the queue.
-		  if test "$k" -eq 1 ; then
+		  if test 1 -eq "$k"; then
 		    # The first file doesn't have a previous command to add.
-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
 		  else
 		    # All subsequent reloadable object files will link in
 		    # the last one created.
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  last_robj=$output_objdir/$output_la-$k.$objext
 		  func_arith $k + 1
 		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=$obj
+		  output=$output_objdir/$output_la-$k.$objext
+		  objlist=" $obj"
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
 		  len=$func_arith_result
@@ -7217,19 +9910,20 @@
 	      # reloadable object file.  All subsequent reloadable object
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
 	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	      delfiles="$delfiles $output"
+	      func_append delfiles " $output"
 
 	    else
 	      output=
 	    fi
 
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
 	      $opt_dry_run || $RM $export_symbols
 	      libobjs=$output
 	      # Append the command to create the export file.
@@ -7238,16 +9932,16 @@
 	      if test -n "$last_robj"; then
 		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	    fi
+	    }
 
 	    test -n "$save_libobjs" &&
 	      func_verbose "creating a temporary reloadable object file: $output"
 
 	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
+	    save_ifs=$IFS; IFS='~'
 	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
+	      IFS=$save_ifs
+	      $opt_quiet || {
 		  func_quote_for_expand "$cmd"
 		  eval "func_echo $func_quote_for_expand_result"
 	      }
@@ -7255,7 +9949,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
+		if test relink = "$opt_mode"; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -7264,7 +9958,7 @@
 		exit $lt_exit
 	      }
 	    done
-	    IFS="$save_ifs"
+	    IFS=$save_ifs
 
 	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -7272,27 +9966,27 @@
 	    fi
 	  fi
 
-          if ${skipped_export-false}; then
+          ${skipped_export-false} && {
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
 	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
 	      # though. Also, the filter scales superlinearly with the number of
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
 	      $opt_dry_run || $SED -e '/ ,DATA/!d;s,$.*$$ \,.*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
-	  fi
+	  }
 
 	  libobjs=$output
 	  # Restore the value of output.
@@ -7306,7 +10000,7 @@
 	  # value of $libobjs for piecewise linking.
 
 	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test yes = "$module" && test -n "$module_cmds"; then
 	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	      cmds=$module_expsym_cmds
 	    else
@@ -7328,19 +10022,20 @@
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
+	  func_append libobjs " $func_extract_archives_result"
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
-	save_ifs="$IFS"; IFS='~'
+	save_ifs=$IFS; IFS='~'
 	for cmd in $cmds; do
-	  IFS="$save_ifs"
+	  IFS=$sp$nl
 	  eval cmd=\"$cmd\"
-	  $opt_silent || {
+	  IFS=$save_ifs
+	  $opt_quiet || {
 	    func_quote_for_expand "$cmd"
 	    eval "func_echo $func_quote_for_expand_result"
 	  }
@@ -7348,7 +10043,7 @@
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
+	    if test relink = "$opt_mode"; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -7357,10 +10052,10 @@
 	    exit $lt_exit
 	  }
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -7380,39 +10075,39 @@
 	done
 
 	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
+	if test yes = "$module" || test yes = "$export_dynamic"; then
 	  # On all known operating systems, these are identical.
-	  dlname="$soname"
+	  dlname=$soname
 	fi
       fi
       ;;
 
     obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+	func_warning "'-l' and '-L' are ignored for objects" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
+	func_warning "'-rpath' is ignored for objects"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
+	func_warning "'-R' is ignored for objects"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
+	func_warning "'-version-info' is ignored for objects"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
+	func_warning "'-release' is ignored for objects"
 
       case $output in
       *.lo)
 	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
 
 	libobj=$output
 	func_lo2o "$libobj"
@@ -7420,7 +10115,7 @@
 	;;
       *)
 	libobj=
-	obj="$output"
+	obj=$output
 	;;
       esac
 
@@ -7433,28 +10128,33 @@
       # the extraction.
       reload_conv_objs=
       gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD\ \$*) wl= ;;
+      esac
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
+	  gentop=$output_objdir/${obj}x
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
+
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
 
-      output="$obj"
+      output=$obj
       func_execute_cmds "$reload_cmds" 'exit $?'
 
       # Exit if we aren't doing a library object file.
@@ -7466,7 +10166,7 @@
 	exit $EXIT_SUCCESS
       fi
 
-      if test "$build_libtool_libs" != yes; then
+      test yes = "$build_libtool_libs" || {
 	if test -n "$gentop"; then
 	  func_show_eval '${RM}r "$gentop"'
 	fi
@@ -7476,12 +10176,12 @@
 	# $show "echo timestamp > $libobj"
 	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 	exit $EXIT_SUCCESS
-      fi
+      }
 
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
+	output=$libobj
 	func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
@@ -7498,22 +10198,20 @@
 	          output=$func_stripname_result.exe;;
       esac
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
+	func_warning "'-version-info' is ignored for programs"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
+	func_warning "'-release' is ignored for programs"
 
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT(dlopen)' not used. Assuming no dlopen support."
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT(dlopen)' not used. Assuming no dlopen support."
 
       case $host in
       *-*-rhapsody* | *-*-darwin1.012)
 	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
 	;;
       esac
 
@@ -7521,17 +10219,17 @@
       *-*-darwin*)
 	# Don't allow lazy linking, it breaks C++ global constructors
 	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
+	if test CXX = "$tagname"; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.0123)
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
 	    ;;
 	  esac
 	fi
 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% $^ $*$.ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% $^ $*$.ltframework% -framework \1%g'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
 	;;
       esac
 
@@ -7545,7 +10243,7 @@
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7555,17 +10253,17 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      compile_deplibs="$new_libs"
+      compile_deplibs=$new_libs
 
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -7573,7 +10271,7 @@
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -7585,39 +10283,39 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  *) func_append dllsearchpath ":$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -7625,10 +10323,10 @@
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      compile_rpath="$rpath"
+      compile_rpath=$rpath
 
       rpath=
       hardcode_libdirs=
@@ -7636,82 +10334,86 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      finalize_rpath="$rpath"
+      finalize_rpath=$rpath
 
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
 
       # template prelinking step
       if test -n "$prelink_cmds"; then
 	func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      wrappers_required=yes
+      wrappers_required=:
       case $host in
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=false
         ;;
-      *cegcc)
-        # Disable wrappers for cegcc, we are cross compiling anyway.
-        wrappers_required=no
+      *cygwin* | *mingw* )
+        test yes = "$build_libtool_libs" || wrappers_required=false
         ;;
       *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
         fi
         ;;
       esac
-      if test "$wrappers_required" = no; then
+      $wrappers_required || {
 	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=$compile_command$compile_rpath
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
 	func_show_eval "$link_command" 'exit_status=$?'
 
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
 	fi
 
 	exit $exit_status
-      fi
+      }
 
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -7727,7 +10429,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7735,54 +10437,68 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
       fi
 
-      if test "$no_install" = yes; then
+      if test yes = "$no_install"; then
 	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
+	link_command=$compile_var$compile_command$compile_rpath
 	# Replace the output file specification.
-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
 	func_show_eval "$link_command" 'exit $?'
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
 
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
 	fi
+
+	exit $EXIT_SUCCESS
       fi
 
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
+
       # Replace the output file specification.
-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
       func_show_eval "$link_command" 'exit $?'
 
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
       # Now create the wrapper script.
       func_verbose "creating $output"
 
@@ -7800,18 +10516,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $ECHO for shipping.
-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	\\/* | A-Za-z:\\/*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       fi
 
       # Only actually do things if not in dry run mode.
@@ -7835,8 +10540,8 @@
 	    func_dirname_and_basename "$output" "" "."
 	    output_name=$func_basename_result
 	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
 	    $RM $cwrappersource $cwrapper
 	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
@@ -7857,7 +10562,7 @@
 	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
 	    $opt_dry_run || {
 	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
+	      if test "x$build" = "x$host"; then
 		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
 	      else
 		func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -7880,43 +10585,45 @@
     # See if we need to build an old-fashioned archive.
     for oldlib in $oldlibs; do
 
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
 	  build_libtool_libs=no
-	else
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
 	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
 
       if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
+	gentop=$output_objdir/${outputname}x
+	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+	func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
 	cmds=$old_archive_from_new_cmds
       else
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
+	  func_append oldobjs " $func_extract_archives_result"
 	fi
 
 	# POSIX demands no paths to be encoded in archives.  We have
@@ -7932,9 +10639,9 @@
 	    done | sort | sort -uc >/dev/null 2>&1); then
 	  :
 	else
-	  $ECHO "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
@@ -7942,7 +10649,7 @@
 	  for obj in $save_oldobjs
 	  do
 	    func_basename "$obj"
-	    objbase="$func_basename_result"
+	    objbase=$func_basename_result
 	    case " $oldobjs " in
 	    " ") oldobjs=$obj ;;
 	    *\ /"$objbase "*)
@@ -7958,18 +10665,30 @@
 		esac
 	      done
 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
 	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
+	    *) func_append oldobjs " $obj" ;;
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
 	len=$func_len_result
 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
 	  func_verbose "using piecewise archive linking..."
@@ -7999,18 +10718,18 @@
 	    else
 	      # the above command should be used before it gets too long
 	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
+	      if test "$obj" = "$last_oldobj"; then
 		RANLIB=$save_RANLIB
 	      fi
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
 	      objlist=
 	      len=$len0
 	    fi
 	  done
 	  RANLIB=$save_RANLIB
 	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
+	  if test -z "$oldobjs"; then
 	    eval cmds=\"\$concat_cmds\"
 	  else
 	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -8027,7 +10746,7 @@
     case $output in
     *.la)
       old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      test yes = "$build_old_libs" && old_library=$libname.$libext
       func_verbose "creating $output"
 
       # Preserve any variables that may affect compiler behavior
@@ -8042,52 +10761,63 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi
 
       # Only create the output if not a dry run.
       $opt_dry_run || {
 	for installed in no yes; do
-	  if test "$installed" = yes; then
+	  if test yes = "$installed"; then
 	    if test -z "$install_libdir"; then
 	      break
 	    fi
-	    output="$output_objdir/$outputname"i
+	    output=$output_objdir/${outputname}i
 	    # Replace all uninstalled libtool libraries with the installed ones
 	    newdependency_libs=
 	    for deplib in $dependency_libs; do
 	      case $deplib in
 	      *.la)
 		func_basename "$deplib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		name=$func_basename_result
+		func_resolve_sysroot "$deplib"
+		eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
-	    dependency_libs="$newdependency_libs"
+	    dependency_libs=$newdependency_libs
 	    newdlfiles=
 
 	    for lib in $dlfiles; do
 	      case $lib in
 	      *.la)
 	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
+	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
@@ -8097,44 +10827,61 @@
 		# didn't already link the preopened objects directly into
 		# the library:
 		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  else
 	    newdlfiles=
 	    for lib in $dlfiles; do
 	      case $lib in
-		\\/* | A-Za-z:\\/*) abs="$lib" ;;
+		\\/* | A-Za-z:\\/*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlfiles="$newdlfiles $abs"
+	      func_append newdlfiles " $abs"
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
-		\\/* | A-Za-z:\\/*) abs="$lib" ;;
+		\\/* | A-Za-z:\\/*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlprefiles="$newdlprefiles $abs"
+	      func_append newdlprefiles " $abs"
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test -n "$bindir"; then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result/$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -8148,7 +10895,7 @@
 # The name of the static archive.
 old_library='$old_library'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags='$new_inherited_linker_flags'
 
 # Libraries that this one depends upon.
@@ -8174,7 +10921,7 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
+	  if test no,yes = "$installed,$need_relink"; then
 	    $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	  fi
@@ -8189,29 +10936,31 @@
     exit $EXIT_SUCCESS
 }
 
-{ test "$mode" = link || test "$mode" = relink; } &&
-    func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
 
 
 # func_mode_uninstall arg...
 func_mode_uninstall ()
 {
-    $opt_debug
-    RM="$nonopt"
+    $debug_cmd
+
+    RM=$nonopt
     files=
-    rmforce=
+    rmforce=false
     exit_status=0
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     for arg
     do
       case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=: ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
@@ -8220,24 +10969,23 @@
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	objdir="$origobjdir"
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
       else
-	objdir="$dir/$origobjdir"
+	odir=$dir/$objdir
       fi
       func_basename "$file"
-      name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
 
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test clean = "$opt_mode"; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
 	esac
       fi
 
@@ -8249,11 +10997,11 @@
       elif test -d "$file"; then
 	exit_status=1
 	continue
-      elif test "$rmforce" = yes; then
+      elif $rmforce; then
 	continue
       fi
 
-      rmfiles="$file"
+      rmfiles=$file
 
       case $name in
       *.la)
@@ -8263,28 +11011,27 @@
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$mode" in
+	  case $opt_mode in
 	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
+	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
 	    ;;
@@ -8300,21 +11047,19 @@
 	  func_source $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
+	  if test -n "$pic_object" && test none != "$pic_object"; then
+	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
+	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$mode" = clean ; then
+	if test clean = "$opt_mode"; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -8324,7 +11069,7 @@
 	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
+	    func_append rmfiles " $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
@@ -8333,7 +11078,7 @@
 	      func_ltwrapper_scriptname "$file"
 	      relink_command=
 	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 	    else
 	      relink_command=
 	      func_source $dir/$noexename
@@ -8341,12 +11086,12 @@
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
 	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
 	    fi
 	  fi
 	fi
@@ -8354,9 +11099,8 @@
       esac
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
-    objdir="$origobjdir"
 
-    # Try to remove the ${objdir}s in the directories where we deleted files
+    # Try to remove the $objdir's in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
 	func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -8366,16 +11110,17 @@
     exit $exit_status
 }
 
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
 
-test -z "$mode" && {
-  help="$generic_help"
+test -z "$opt_mode" && {
+  help=$generic_help
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
+  func_fatal_help "invalid operation mode '$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
@@ -8386,7 +11131,7 @@
 
 
 # The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
+# where we disable both kinds of libraries.  Given conflicting
 # choices, we go for a static library, that is the most portable,
 # since we can't tell whether shared libraries were disabled because
 # the user asked for that or because the platform doesn't support
@@ -8409,5 +11154,3 @@
 # mode:shell-script
 # sh-indentation:2
 # End:
-# vi:sw=2
-

imagination-3.0.tar.bz2/missing -> imagination-3.4.tar.bz2/missing Changed

@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2006-05-10.23
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,9 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -28,66 +25,40 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output =$^ *$.*/\1/p'
-sed_minuso='s/.* -o $^ *$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 OPTION... PROGRAM ARGUMENT...
 
-Handle \`PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM ARGUMENT...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.ch', if possible, from existing .ch
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.ch', if possible, from existing .ch
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -99,269 +70,146 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^ *ACM_CONFIG_HEADER($^)*$).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^^:*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* $^ *$ *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* $^ *$ *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.^.*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

imagination-3.0.tar.bz2/po/LINGUAS -> imagination-3.4.tar.bz2/po/LINGUAS Changed

imagination-3.0.tar.bz2/po/Makefile.in.in -> imagination-3.4.tar.bz2/po/Makefile.in.in Changed

@@ -33,8 +33,7 @@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@@ -49,8 +48,8 @@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
@@ -73,15 +72,20 @@
 .SUFFIXES:
 .SUFFIXES: .po .pox .gmo .mo .msg .cat
 
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+	$(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
@@ -103,7 +107,7 @@
 install-data-yes: all
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
 	  if test -r $$lang.gmo; then \
 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -137,8 +141,8 @@
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 
 check: all $(GETTEXT_PACKAGE).pot

imagination-3.4.tar.bz2/po/Makevars Added

imagination-3.4.tar.bz2/po/ca.po Added

@@ -0,0 +1,939 @@
+# Translation of imagination.po to Catalan
+# Copyright (C) 2009 This_file_is_part_of_Imagination.
+# This file is distributed under the same license as the imagination package.
+#
+# Manuel Tortosa <manutortosa@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2009-11-27 20:18+0100\n"
+"Last-Translator: Manuel Tortosa <manutortosa@gmail.com>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.0\n"
+"X-Language: ca_ES\n"
+
+#: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
+msgid "A DVD slideshow maker"
+msgstr "Un creador de presentacions de diapositives en DVD"
+
+#: ../imagination.desktop.in.h:3
+msgid "A lightweight DVD slideshow maker using GTK+2"
+msgstr "Un creador de presentacions de diapositives en DVD lleuger usant GTK+2"
+
+#: ../src/audio.c:108
+#, c-format
+msgid "Playing %s..."
+msgstr "S'està reproduint %s..."
+
+#: ../src/audio.c:136 ../src/main-window.c:1224
+msgid "Play the selected file"
+msgstr "Reprodueix el fitxer seleccionat"
+
+#: ../src/audio.c:144
+msgid "Stop the playback"
+msgstr "Atura la reproducció"
+
+#: ../src/audio.c:271
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate\n"
+msgstr ""
+"%s:\n"
+"freqüència de mostreig incompatible\n"
+
+#: ../src/audio.c:276
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible number of channels\n"
+msgstr ""
+"%s:\n"
+"nombre de canals incompatible\n"
+
+#: ../src/audio.c:282
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate and number of channels\n"
+msgstr ""
+"%s:\n"
+"freqüència de mostreig y nombre de canals incompatible\n"
+
+#: ../src/audio.c:302
+#, c-format
+msgid ""
+"%s\n"
+"<b>Do you want to continue without these files?</b>"
+msgstr ""
+"%s\n"
+"<b>Voleu continuar sense aquests fitxers?</b>"
+
+#: ../src/audio.c:306 ../src/audio.c:453
+msgid "Audio files mismatch:"
+msgstr "Manca da coincidència de fitxers d'àudio:"
+
+#: ../src/audio.c:400
+msgid "Incompatible sample rate."
+msgstr "Freqüència de mostreig incompatible."
+
+#: ../src/audio.c:407
+msgid "Incompatible number of channels."
+msgstr "Nombre de canals incompatible."
+
+#: ../src/audio.c:414
+msgid "Incompatible sample rate and number of channels."
+msgstr "Freqüència de mostreig i nombre de canals incompatibles."
+
+#: ../src/audio.c:436
+#, c-format
+msgid ""
+"File selection contains %d audio file that is incompatible with other files."
+msgid_plural ""
+"File selection contains %d audio files that are incompatible with other "
+"files."
+msgstr0 ""
+"La selecció de fitxers conté %d fitxer d'àudio que és incompatible amb "
+"altres fitxers."
+msgstr1 ""
+"La selecció de fitxers conté %d fitxers d'àudio que són incompatibles amb "
+"altres fitxers."
+
+#: ../src/audio.c:442
+msgid "Please check audio tab for more information."
+msgstr "Si us plau, comproveu la pestanya àudio per més informació."
+
+#: ../src/main-window.c:218
+msgid "_Slideshow"
+msgstr "Pre_sentació"
+
+#: ../src/main-window.c:232
+#, fuzzy
+msgid "Import slideshow"
+msgstr "S'està exportant la presentació"
+
+#: ../src/main-window.c:256
+msgid "Import p_ictures"
+msgstr "Importa _imatges"
+
+#: ../src/main-window.c:266
+msgid "Import _music"
+msgstr "Importa _música"
+
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Vista prèvia"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "Importa música"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "Importa música"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Continguts"
+
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
+msgstr "Exporta"
+
+#. Slide menu
+#: ../src/main-window.c:330
+msgid "_Slide"
+msgstr "_Diapositiva"
+
+#. Zoom controls
+#: ../src/main-window.c:349
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../src/main-window.c:373
+msgid "Add empt_y slide"
+msgstr "Afegeix una diapositiva b_uida"
+
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "Afegeix una diapositiva b_uida"
+
+#: ../src/main-window.c:392
+msgid "Dele_te"
+msgstr "_Elimina"
+
+#: ../src/main-window.c:400
+msgid "Repor_t"
+msgstr "In_forme"
+
+#: ../src/main-window.c:412
+msgid "Rotate co_unter-clockwise"
+msgstr "Gira en el sentit _antihorari"
+
+#: ../src/main-window.c:423
+msgid "_Rotate clockwise"
+msgstr "Gi_ra en el sentit horari"
+
+#: ../src/main-window.c:435
+msgid "Un_select all"
+msgstr "_Desselecciona-ho tot"
+
+#. View menu
+#: ../src/main-window.c:441
+msgid "_View"
+msgstr "_Visualitza"
+
+#: ../src/main-window.c:447
+msgid "Preview mode"
+msgstr "Mode de vista prèvia"
+
+#: ../src/main-window.c:453
+msgid "Overview mode"
+msgstr "Mode de vista general"
+
+#: ../src/main-window.c:456
+#, fuzzy
+msgid "Preview _frame rate"
+msgstr "Mode de vista prèvia"
+
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
+#, c-format
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr0 ""
+msgstr1 ""
+
+#. Help menu
+#: ../src/main-window.c:497
+msgid "_Help"
+msgstr "Aj_uda"
+
+#: ../src/main-window.c:502
+msgid "Contents"
+msgstr "Continguts"
+
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
+msgid "Create a new slideshow"
+msgstr "Crea una nova presentació amb diapositives"
+
+#: ../src/main-window.c:528
+msgid "Open a slideshow"
+msgstr "Obre una presentació amb diapositives"
+
+#: ../src/main-window.c:533
+msgid "Save the slideshow"
+msgstr "Desa la presentació amb diapositives"
+
+#: ../src/main-window.c:546
+msgid "Import pictures"
+msgstr "Importa imatges"
+
+#: ../src/main-window.c:555
+msgid "Import music"
+msgstr "Importa música"
+
+#: ../src/main-window.c:560
+msgid "Delete the selected slides"
+msgstr "Elimina les diapositives seleccionades"
+
+#: ../src/main-window.c:570
+msgid "Rotate the slide 90 degrees to the left"
+msgstr "Gira la diapositiva 90 graus cap a l'esquerra"
+
+#: ../src/main-window.c:581
+msgid "Rotate the slide 90 degrees to the right"
+msgstr "Gira la diapositiva 90 graus cap a la dreta"
+
+#: ../src/main-window.c:587
+msgid "Zoom In"
+msgstr "Apropa"
+
+#: ../src/main-window.c:592
+msgid "Zoom Out"
+msgstr "Allunya"
+
+#: ../src/main-window.c:597
+msgid "Normal Size"
+msgstr "Mida normal"
+
+#: ../src/main-window.c:602
+msgid "Fit Zoom in Window"
+msgstr ""
+
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
+msgstr "Inicia la vista prèvia"
+
+#: ../src/main-window.c:619
+msgid "Go to the first slide of the slideshow"
+msgstr "Vés a la primera diapositiva de la presentació"
+
+#: ../src/main-window.c:625
+msgid "Go to the previous slide of the slideshow"
+msgstr "Vés a l'anterior diapositiva de la presentació"
+
+#: ../src/main-window.c:641 ../src/main-window.c:847
+msgid " of "
+msgstr " de "
+
+#: ../src/main-window.c:653
+msgid "Go to the next slide of the slideshow"
+msgstr "Vés a la següent diapositiva de la presentació"
+
+#: ../src/main-window.c:659
+msgid "Go to the last slide of the slideshow"
+msgstr "Vés a la última diapositiva de la presentació"
+
+#: ../src/main-window.c:708
+msgid "Video"
+msgstr "Video"
+
+#: ../src/main-window.c:726
+msgid "<b>Slide Settings</b>"
+msgstr "<b>Arranjament de la diapositiva</b>"
+
+#. Transition types label
+#: ../src/main-window.c:736
+msgid "Transition Type:"
+msgstr "Tipus de transició:"
+
+#: ../src/main-window.c:756
+msgid "Random"
+msgstr "Aleatori"
+
+#: ../src/main-window.c:757
+msgid "Imagination randomly decides which transition to apply"
+msgstr "L'imagination decideix aleatòriament quina transició aplicarà"
+
+#. Transition duration
+#: ../src/main-window.c:763
+msgid "Transition Speed:"
+msgstr "Velocitat de la transició:"
+
+#: ../src/main-window.c:774
+msgid "Fast"
+msgstr "Ràpida"
+
+#: ../src/main-window.c:776
+msgid "Normal"
+msgstr "Normal"
+
+#: ../src/main-window.c:778
+msgid "Slow"
+msgstr "Lenta"
+
+#. Slide duration
+#: ../src/main-window.c:785
+msgid "Slide Duration in sec:"
+msgstr "Durada de la diapositiva en segons:"
+
+#. Slide Total Duration
+#: ../src/main-window.c:797
+msgid "Slideshow Length:"
+msgstr "Durada de la presentació:"
+
+#: ../src/main-window.c:814
+msgid "<b>Slide Motion</b>"
+msgstr "<b>Moviment de la diapositiva</b>"
+
+#: ../src/main-window.c:824
+msgid "Stop Point:"
+msgstr "Punt d'aturada:"
+
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Punt d'aturada:"
+
+#: ../src/main-window.c:869
+msgid "Duration:"
+msgstr "Durada:"
+
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Punt d'aturada:"
+
+#: ../src/main-window.c:891
+msgid "Zoom: "
+msgstr "Zoom: "
+
+#: ../src/main-window.c:910
+msgid "<b>Slide Text</b>"
+msgstr "<b>Text de la diapositiva</b>"
+
+#: ../src/main-window.c:944
+msgid "Click to choose the font"
+msgstr "Cliqueu per seleccionar el tipus de lletra"
+
+#: ../src/main-window.c:951 ../src/support.c:1176
+#, fuzzy
+msgid "Click to choose the font color"
+msgstr "Cliqueu per seleccionar el tipus de lletra"
+
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Cliqueu per seleccionar el tipus de lletra"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Cliqueu per seleccionar el tipus de lletra"
+
+#: ../src/main-window.c:1023
+msgid "Animation:"
+msgstr "Animació:"
+
+#: ../src/main-window.c:1035
+msgid "Animation Speed:"
+msgstr "Velocitat de l'animació:"
+
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Moviment de la diapositiva</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Posició del subtítol:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Posició del subtítol:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
+msgid "Placing is relative to:"
+msgstr "L'emplaçament és relatiu a:"
+
+#: ../src/main-window.c:1140
+msgid "Exported video"
+msgstr "Vídeo exportat"
+
+#: ../src/main-window.c:1142
+msgid "Original image"
+msgstr "Imatge original"
+
+#. Background music frame
+#: ../src/main-window.c:1149
+msgid "Audio"
+msgstr "Àudio"
+
+#: ../src/main-window.c:1162
+msgid "<b>Background Music</b>"
+msgstr "<b>Música de fons</b>"
+
+#: ../src/main-window.c:1208
+msgid "Music Duration:"
+msgstr "Durada de la música:"
+
+#: ../src/main-window.c:1232
+msgid "Delete the selected file"
+msgstr "Esborra el fitxer seleccionat"
+
+#: ../src/main-window.c:1239
+msgid "Move the selected file up"
+msgstr "Puja el fitxer seleccionat"
+
+#: ../src/main-window.c:1246
+msgid "Move the selected file down"
+msgstr "Baixa el fitxer seleccionat"
+
+#: ../src/main-window.c:1253
+msgid "Clear all files"
+msgstr "Neteja tots els fitxers"
+
+#. End of Background music frame
+#. Begin of Message tab
+#: ../src/main-window.c:1258
+msgid "Messages"
+msgstr ""
+
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
+msgid "Sorry, I could not perform the operation!"
+msgstr "No he pogut realitzar l'operació!"
+
+#: ../src/main-window.c:1825
+#, c-format
+msgid "File '%s' not found"
+msgstr ""
+
+#: ../src/main-window.c:1834
+msgid "Resolution"
+msgstr "Resolució"
+
+#: ../src/main-window.c:1834
+msgid "Type"
+msgstr "Tipus"
+
+#. No animation function (id = 0)
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
+msgid "None"
+msgstr "Cap"
+
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
+msgid "Slides Transitions Report Dialog"
+msgstr "Diàleg de l'informe de les transicions de les diapositives"
+
+#: ../src/main-window.c:2798
+msgid ""
+"\n"
+"<span weight='bold'>Note:</span>\n"
+"\n"
+"Slides whose transition is applied only once are not shown here.\n"
+"Click on the slide to have Imagination automatically select it."
+msgstr ""
+"\n"
+"<span weight='bold'>Nota:</span>\n"
+"\n"
+"Les diapositives amb una transició que s'aplica només una vegada no es "
+"mostren aquí.\n"
+"Cliqueu en la diapositiva perquè l'imagination la seleccioni automàticament."
+
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
+msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
+msgstr "Encara no heu desat la presentació. Esteu segur que voleu tancar-la?"
+
+#: ../src/callbacks.c:220
+#, c-format
+msgid "Please wait, importing image %d out of %d"
+msgstr "Si us plau espereu, s'està important la imatge %d de %d"
+
+#: ../src/callbacks.c:289
+msgid "Import audio files, use CTRL key for multiple select"
+msgstr ""
+"Importació de fitxers d'àudio, useu la tecla CTRL per fer una selecció "
+"múltiple"
+
+#: ../src/callbacks.c:301
+msgid "All audio files"
+msgstr "Tots els fitxers d'àudio"
+
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
+msgid "All files"
+msgstr "Tots els fitxers"
+
+#: ../src/callbacks.c:365
+msgid "Import images, use SHIFT key for multiple select"
+msgstr "Importació d'imatges. useu la tecla Maj. per fer una selecció múltiple"
+
+#: ../src/callbacks.c:378
+msgid "All image files"
+msgstr "Tots els fitxers d'imatge"
+
+#: ../src/callbacks.c:578
+#, c-format
+msgid "%d x %d pixels"
+msgid_plural "%d x %d pixels"
+msgstr0 "%d x %d pixel"
+msgstr1 "%d x %d pixels"
+
+#: ../src/callbacks.c:853
+msgid "translator-credits"
+msgstr "Manuel Tortosa Moreno <manutortosa@gmail.com>"
+
+#: ../src/callbacks.c:1517
+msgid "Stops the preview"
+msgstr "Atura la vista prèvia"
+
+#: ../src/callbacks.c:1580
+msgid "Load an Imagination slideshow project"
+msgstr "Carrega un projecte de presentació de l'imagination"
+
+#: ../src/callbacks.c:1581
+msgid "Save an Imagination slideshow project"
+msgstr "Desa un projecte de presentació de l'imagination"
+
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Imagination"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "Afegeix una diapositiva b_uida"
+
+#: ../src/callbacks.c:2498
+msgid "Create empty slide"
+msgstr "Crea una diapositiva buida"
+
+#: ../src/callbacks.c:2509
+msgid "Empty slide options:"
+msgstr "Opcions de la diapositiva buida:"
+
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
+msgstr "Usa un color _sòlid"
+
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
+msgstr "Usa un degradat _lineal"
+
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
+msgstr "Usa un degradat _radial"
+
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "Usa un degradat _radial"
+
+#: ../src/callbacks.c:3253
+msgid "Please choose a PNG file"
+msgstr ""
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Tots els fitxers"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
+
+#. Display propert title depending on the callback that is calling this function.
+#: ../src/new_slideshow.c:66
+msgid "Project properties"
+msgstr "Propietats del projecte"
+
+#: ../src/new_slideshow.c:86
+msgid "<b>Slideshow Settings</b>"
+msgstr "<b>Arranjament de la presentació</b>"
+
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "<b>Format del vídeo</b>"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+#, fuzzy
+msgid "Video Size:"
+msgstr "<b>Mida del vídeo</b>"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr ""
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Format de televisió</b>"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
+msgid "<b>Advanced Settings</b>"
+msgstr "<b>Arranjament avançat</b>"
+
+#: ../src/new_slideshow.c:178
+msgid "Rescale images to fit desired aspect ratio"
+msgstr "Reescala les imatges per ajustar-les a la relació d'aspecte desitjada"
+
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
+msgstr "Seleccioneu un color de fons:"
+
+#: ../src/slideshow_project.c:265
+msgid "This is not an Imagination project file!"
+msgstr "Aquest no és un fitxer de projecte de l'imagination!"
+
+#: ../src/slideshow_project.c:442
+#, c-format
+msgid "Slide %i: can't load image %s\n"
+msgstr ""
+
+#: ../src/slideshow_project.c:585
+#, c-format
+msgid "Can't load image %s\n"
+msgstr ""
+
+#: ../src/support.c:134
+#, c-format
+msgid "Welcome to Imagination - %d transition loaded."
+msgid_plural "Welcome to Imagination - %d transitions loaded."
+msgstr0 "Benvingut a l'Imagination - s'ha carregat %d transició."
+msgstr1 "Benvingut a l'Imagination - s'han carregat %d transicions."
+
+#: ../src/support.c:145
+#, c-format
+msgid "%d slide selected"
+msgid_plural "%d slides selected"
+msgstr0 "S'ha seleccionat %d diapositiva"
+msgstr1 "S'han seleccionat %d diapositives"
+
+#: ../src/support.c:156
+#, c-format
+msgid "%d slide loaded %s"
+msgid_plural "%d slides loaded %s"
+msgstr0 "S'ha carregat %d diapositiva %s"
+msgstr1 "S'han carregat %d diapositives %s"
+
+#: ../src/support.c:160
+msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
+msgstr ""
+" - Useu la tecla CTRL per seleccionar/desseleccionar o Maj. per selecció "
+"múltiple"
+
+#: ../src/support.c:327
+msgid "Please choose the slideshow project filename"
+msgstr ""
+"Si us plau, seleccioneu el nom pel fitxer del projecte de la presentació"
+
+#: ../src/subtitles.c:243
+msgid "Fade"
+msgstr ""
+
+#: ../src/subtitles.c:247
+msgid "Slide from left"
+msgstr ""
+
+#: ../src/subtitles.c:251
+msgid "Slide from right"
+msgstr ""
+
+#: ../src/subtitles.c:255
+msgid "Slide from top"
+msgstr ""
+
+#: ../src/subtitles.c:259
+msgid "Slide from bottom"
+msgstr ""
+
+#: ../src/subtitles.c:263
+msgid "Grow"
+msgstr ""
+
+#: ../src/subtitles.c:267
+msgid "Slide bottom to top"
+msgstr ""
+
+#: ../src/subtitles.c:271
+msgid "Slide right to left"
+msgstr ""
+
+#: ../src/export.c:144
+msgid "<b>Export Settings</b>"
+msgstr "<b>Arranjament de la exportació</b>"
+
+#: ../src/export.c:158
+msgid "Filename:"
+msgstr "Nom de fitxer:"
+
+#: ../src/export.c:306
+msgid "Exporting the slideshow"
+msgstr "S'està exportant la presentació"
+
+#: ../src/export.c:318
+msgid "Preparing for export ..."
+msgstr "S'està preparant per exportar..."
+
+#: ../src/export.c:329
+msgid "Overall progress:"
+msgstr "Progrés global:"
+
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
+#, c-format
+msgid "Slide %d export progress:"
+msgstr "Progrés d'exportació de la diapositiva %d:"
+
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
+msgid "Failed to launch the encoder!"
+msgstr "Ha fallat en iniciar el codificador!"
+
+#: ../src/export.c:902
+#, c-format
+msgid "Final transition export progress:"
+msgstr "Progrés d'exportació de la transició final:"
+
+#~ msgid "Click to expand the area"
+#~ msgstr "Cliqueu per expandir l'àrea"
+
+#~ msgid "Click to shrink the area"
+#~ msgstr "Cliqueu per contreure l'àrea"
+
+#~ msgid "_Preview"
+#~ msgstr "Vista p_rèvia"
+
+#~ msgid "Preview quality"
+#~ msgstr "Qualitat de la vista prèvia"
+
+#~ msgid "_Low"
+#~ msgstr "_Baixa"
+
+#~ msgid "High"
+#~ msgstr "Alta"
+
+#~ msgid "Add"
+#~ msgstr "Afegeix"
+
+#~ msgid "Update"
+#~ msgstr "Actualitza"
+
+#~ msgid "Remove"
+#~ msgstr "Elimina"
+
+#, fuzzy
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Cliqueu per seleccionar el tipus de lletra"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "<b>Moviment de la diapositiva</b>"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Qualitat del vídeo:</b>"
+
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (DVD de vídeo)"
+
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (vídeo Flash)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (Telèfons mòbils)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Normal 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Panoràmic 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Qualitat del vídeo:</b>"
+
+#~ msgid "Low"
+#~ msgstr "Baixa"
+
+#~ msgid "Medium"
+#~ msgstr "Mitjana"
+
+#, fuzzy
+#~ msgid "VOB (DVD Video)"
+#~ msgstr "VOB (DVD de vídeo)"
+
+#, fuzzy
+#~ msgid "OGV (Theora Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#, fuzzy
+#~ msgid "FLV (Flash Video)"
+#~ msgstr "FLV (vídeo Flash)"

imagination-3.0.tar.bz2/po/cs.po -> imagination-3.4.tar.bz2/po/cs.po Changed

@@ -2,9 +2,9 @@
 msgstr ""
 "Project-Id-Version: imagination 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 20:10+0100\n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Michal Várady <miko.vaji@gmail.com>\n"
+"Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
 "Language-Team: \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -16,32 +16,32 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
 msgid "A DVD slideshow maker"
 msgstr "Aplikace pro vytváření prezentací na disky DVD"
 
-#: ../imagination.desktop.in.h:2
+#: ../imagination.desktop.in.h:3
 msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr ""
 "Odlehčená aplikace pro vytváření prezentací na disky DVD používající GTK+2"
 
-#: ../imagination.desktop.in.h:3
-msgid "Imagination"
-msgstr "Imagination"
-
-#: ../src/audio.c:109
+#: ../src/audio.c:108
 #, c-format
 msgid "Playing %s..."
 msgstr "Přehrávání %s..."
 
-#: ../src/audio.c:137 ../src/main-window.c:1130
+#: ../src/audio.c:136 ../src/main-window.c:1224
 msgid "Play the selected file"
 msgstr "Přehrát vybraný soubor"
 
-#: ../src/audio.c:145
+#: ../src/audio.c:144
 msgid "Stop the playback"
 msgstr "Zastavit přehrávání"
 
-#: ../src/audio.c:272
+#: ../src/audio.c:271
 #, c-format
 msgid ""
 "%s:\n"
@@ -50,7 +50,7 @@
 "%s:\n"
 "nekompatibilní vzorkovací frekvence\n"
 
-#: ../src/audio.c:277
+#: ../src/audio.c:276
 #, c-format
 msgid ""
 "%s:\n"
@@ -59,7 +59,7 @@
 "%s:\n"
 "nekompatibilní počet kanálů\n"
 
-#: ../src/audio.c:283
+#: ../src/audio.c:282
 #, c-format
 msgid ""
 "%s:\n"
@@ -68,7 +68,7 @@
 "%s:\n"
 "nekompatibilní vzorkovací frekvence a počet kanálů\n"
 
-#: ../src/audio.c:303
+#: ../src/audio.c:302
 #, c-format
 msgid ""
 "%s\n"
@@ -77,23 +77,23 @@
 "%s\n"
 "<b>Chcete pokračovat bez těchto souborů?</b>"
 
-#: ../src/audio.c:307 ../src/audio.c:454
+#: ../src/audio.c:306 ../src/audio.c:453
 msgid "Audio files mismatch:"
 msgstr "Neshoda ve zvukových souborech:"
 
-#: ../src/audio.c:401
+#: ../src/audio.c:400
 msgid "Incompatible sample rate."
 msgstr "Nekompatibilní vzorkovací frekvence."
 
-#: ../src/audio.c:408
+#: ../src/audio.c:407
 msgid "Incompatible number of channels."
 msgstr "Nekompatibilní počet kanálů."
 
-#: ../src/audio.c:415
+#: ../src/audio.c:414
 msgid "Incompatible sample rate and number of channels."
 msgstr "Nekompatibilní vzorkovací frekvence a počet kanálů."
 
-#: ../src/audio.c:437
+#: ../src/audio.c:436
 #, c-format
 msgid ""
 "File selection contains %d audio file that is incompatible with other files."
@@ -110,54 +110,57 @@
 "Výběr souborů obsahuje %d zvukových souborů, které nejsou kompatibilní s "
 "ostatními soubory."
 
-#: ../src/audio.c:443
+#: ../src/audio.c:442
 msgid "Please check audio tab for more information."
 msgstr "Více informací naleznete na kartě zvuk."
 
-#: ../src/main-window.c:222
+#: ../src/main-window.c:218
 msgid "_Slideshow"
 msgstr "_Prezentace"
 
-#: ../src/main-window.c:236
+#: ../src/main-window.c:232
 msgid "Import slideshow"
 msgstr "Importování prezentace"
 
-#: ../src/main-window.c:260
+#: ../src/main-window.c:256
 msgid "Import p_ictures"
 msgstr "Importovat _obrázky"
 
-#: ../src/main-window.c:270
+#: ../src/main-window.c:266
 msgid "Import _music"
 msgstr "Importovat _hudbu"
 
-#: ../src/main-window.c:287
-msgid "_Preview"
-msgstr "_Náhled"
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Náhled"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "Importovat hudbu"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "Importovat hudbu"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Obsah"
 
-#: ../src/main-window.c:295
-msgid "Export"
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
 msgstr "Export"
 
 #. Slide menu
-#: ../src/main-window.c:310
+#: ../src/main-window.c:330
 msgid "_Slide"
 msgstr "_Snímek"
 
-#. Preview quality menu
-#: ../src/main-window.c:332
-msgid "Preview quality"
-msgstr "Kvalita náhledu"
-
-#: ../src/main-window.c:338
-msgid "_Low"
-msgstr "_Nízká"
-
-#: ../src/main-window.c:342 ../src/export.c:1389 ../src/export.c:1573
-msgid "High"
-msgstr "Vysoká"
-
 #. Zoom controls
-#: ../src/main-window.c:346
+#: ../src/main-window.c:349
 msgid "_Zoom"
 msgstr "_Přiblížení"
 
@@ -165,44 +168,53 @@
 msgid "Add empt_y slide"
 msgstr "Přidat prá_zdný snímek"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "Přidat prá_zdný snímek"
+
+#: ../src/main-window.c:392
 msgid "Dele_te"
 msgstr "_Smazat"
 
-#: ../src/main-window.c:390
+#: ../src/main-window.c:400
 msgid "Repor_t"
 msgstr "_Hlášení"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:412
 msgid "Rotate co_unter-clockwise"
 msgstr "Otočit p_roti směru hodinových ručiček"
 
-#: ../src/main-window.c:413
+#: ../src/main-window.c:423
 msgid "_Rotate clockwise"
 msgstr "_Otočit ve směru hodinových ručiček"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:435
 msgid "Un_select all"
 msgstr "O_dznačit vše"
 
 #. View menu
-#: ../src/main-window.c:434
+#: ../src/main-window.c:441
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../src/main-window.c:440
+#: ../src/main-window.c:447
 msgid "Preview mode"
 msgstr "Režim náhledu"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:453
 msgid "Overview mode"
 msgstr "Režim celkového pohledu"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:456
 msgid "Preview _frame rate"
 msgstr "Náhled _frekvence snímků"
 
-#: ../src/main-window.c:469
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
@@ -211,273 +223,329 @@
 msgstr2 "%d snímků za sekundu"
 
 #. Help menu
-#: ../src/main-window.c:486
+#: ../src/main-window.c:497
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/main-window.c:491
+#: ../src/main-window.c:502
 msgid "Contents"
 msgstr "Obsah"
 
-#: ../src/main-window.c:512 ../src/new_slideshow.c:65
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
 msgid "Create a new slideshow"
 msgstr "Vytvořit novou prezentaci"
 
-#: ../src/main-window.c:517
+#: ../src/main-window.c:528
 msgid "Open a slideshow"
 msgstr "Otevřít prezentaci"
 
-#: ../src/main-window.c:522
+#: ../src/main-window.c:533
 msgid "Save the slideshow"
 msgstr "Uložit prezentaci"
 
-#: ../src/main-window.c:535
+#: ../src/main-window.c:546
 msgid "Import pictures"
 msgstr "Importovat obrázky"
 
-#: ../src/main-window.c:544
+#: ../src/main-window.c:555
 msgid "Import music"
 msgstr "Importovat hudbu"
 
-#: ../src/main-window.c:549
+#: ../src/main-window.c:560
 msgid "Delete the selected slides"
 msgstr "Smazat vybrané snímky"
 
-#: ../src/main-window.c:559
+#: ../src/main-window.c:570
 msgid "Rotate the slide 90 degrees to the left"
 msgstr "Otočit snímek o 90 stupňů doleva"
 
-#: ../src/main-window.c:570
+#: ../src/main-window.c:581
 msgid "Rotate the slide 90 degrees to the right"
 msgstr "Otočit snímek o 90 stupňů doprava"
 
-#: ../src/main-window.c:576
+#: ../src/main-window.c:587
 msgid "Zoom In"
 msgstr "Přiblížit"
 
-#: ../src/main-window.c:581
+#: ../src/main-window.c:592
 msgid "Zoom Out"
 msgstr "Oddálit"
 
-#: ../src/main-window.c:586
+#: ../src/main-window.c:597
 msgid "Normal Size"
 msgstr "Běžná velikost"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:602
 msgid "Fit Zoom in Window"
 msgstr "Přizpůsobit přiblížení velikosti okna"
 
-#: ../src/main-window.c:599 ../src/callbacks.c:1362
-msgid "Starts the preview"
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
 msgstr "Spouští náhled"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:619
 msgid "Go to the first slide of the slideshow"
 msgstr "Přejít na první snímek prezentace:"
 
-#: ../src/main-window.c:614
+#: ../src/main-window.c:625
 msgid "Go to the previous slide of the slideshow"
 msgstr "Přejít na předchozí snímek prezentace:"
 
-#: ../src/main-window.c:630 ../src/main-window.c:837
+#: ../src/main-window.c:641 ../src/main-window.c:847
 msgid " of "
 msgstr " z"
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:653
 msgid "Go to the next slide of the slideshow"
 msgstr "Přejít na následující snímek prezentace:"
 
-#: ../src/main-window.c:648
+#: ../src/main-window.c:659
 msgid "Go to the last slide of the slideshow"
 msgstr "Přejít na poslední snímek prezentace:"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:708
 msgid "Video"
 msgstr "Video"
 
-#: ../src/main-window.c:717
+#: ../src/main-window.c:726
 msgid "<b>Slide Settings</b>"
 msgstr "<b>Nastavení snímku</b>"
 
 #. Transition types label
-#: ../src/main-window.c:727
+#: ../src/main-window.c:736
 msgid "Transition Type:"
 msgstr "Typ přechodu:"
 
-#: ../src/main-window.c:747
+#: ../src/main-window.c:756
 msgid "Random"
 msgstr "Náhodný"
 
-#: ../src/main-window.c:748
+#: ../src/main-window.c:757
 msgid "Imagination randomly decides which transition to apply"
 msgstr "Aplikace Transition náhodně zvolí použitý přechod"
 
 #. Transition duration
-#: ../src/main-window.c:754
+#: ../src/main-window.c:763
 msgid "Transition Speed:"
 msgstr "Rychlost přechodu:"
 
-#: ../src/main-window.c:765
+#: ../src/main-window.c:774
 msgid "Fast"
 msgstr "Rychlý"
 
-#: ../src/main-window.c:767
+#: ../src/main-window.c:776
 msgid "Normal"
 msgstr "Střední"
 
-#: ../src/main-window.c:769
+#: ../src/main-window.c:778
 msgid "Slow"
 msgstr "Pomalý"
 
 #. Slide duration
-#: ../src/main-window.c:776
+#: ../src/main-window.c:785
 msgid "Slide Duration in sec:"
 msgstr "Délka zobrazení snímku v sekundách:"
 
 #. Slide Total Duration
-#: ../src/main-window.c:787
+#: ../src/main-window.c:797
 msgid "Slideshow Length:"
 msgstr "Délka prezentace:"
 
-#: ../src/main-window.c:804
+#: ../src/main-window.c:814
 msgid "<b>Slide Motion</b>"
 msgstr "<b>Pohyb snímku</b>"
 
-#: ../src/main-window.c:814
+#: ../src/main-window.c:824
 msgid "Stop Point:"
 msgstr "Bod zastavení:"
 
-#: ../src/main-window.c:851
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Bod zastavení:"
+
+#: ../src/main-window.c:869
 msgid "Duration:"
 msgstr "Délka:"
 
-#: ../src/main-window.c:860
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Bod zastavení:"
+
+#: ../src/main-window.c:891
 msgid "Zoom: "
 msgstr "Přiblížení:"
 
-#: ../src/main-window.c:874
-msgid "Add"
-msgstr "Přidat"
-
-#: ../src/main-window.c:878
-msgid "Update"
-msgstr "Aktualizovat"
-
-#: ../src/main-window.c:883
-msgid "Remove"
-msgstr "Odebrat"
-
-#: ../src/main-window.c:897
+#: ../src/main-window.c:910
 msgid "<b>Slide Text</b>"
 msgstr "<b>Text snímku</b>"
 
-#: ../src/main-window.c:926 ../src/main-window.c:1562
-msgid "Click to expand the area"
-msgstr "Klikněte pro zvětšení oblasti"
-
-#: ../src/main-window.c:943
+#: ../src/main-window.c:944
 msgid "Click to choose the font"
 msgstr "Klikněte pro výběr písma"
 
-#: ../src/main-window.c:950
+#: ../src/main-window.c:951 ../src/support.c:1176
 msgid "Click to choose the font color"
 msgstr "Klikněte pro výběr barvy písma"
 
-#: ../src/main-window.c:957
-msgid "Click to choose the font background color"
-msgstr "Klikněte pro výběr barvy pozadí písma"
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Klikněte pro výběr písma"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Klikněte pro výběr barvy písma"
 
-#: ../src/main-window.c:961
+#: ../src/main-window.c:1023
 msgid "Animation:"
 msgstr "Animace:"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:1035
 msgid "Animation Speed:"
 msgstr "Rychlost animace:"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Pohyb snímku</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Pozice titulků:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Pozice titulků:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
 msgid "Placing is relative to:"
 msgstr "Umístění je relativní k:"
 
-#: ../src/main-window.c:1003
+#: ../src/main-window.c:1140
 msgid "Exported video"
 msgstr "Exportované video"
 
-#: ../src/main-window.c:1005
+#: ../src/main-window.c:1142
 msgid "Original image"
 msgstr "Původní obrázek"
 
-#: ../src/main-window.c:1014
-msgid "Subtitle position:"
-msgstr "Pozice titulků:"
-
 #. Background music frame
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:1149
 msgid "Audio"
 msgstr "Zvuk"
 
-#: ../src/main-window.c:1068
+#: ../src/main-window.c:1162
 msgid "<b>Background Music</b>"
 msgstr "<b>Hudba na pozadí</b>"
 
-#: ../src/main-window.c:1114
+#: ../src/main-window.c:1208
 msgid "Music Duration:"
 msgstr "Délka přehrávání hudby:"
 
-#: ../src/main-window.c:1138
+#: ../src/main-window.c:1232
 msgid "Delete the selected file"
 msgstr "Smazat vybraný soubor"
 
-#: ../src/main-window.c:1145
+#: ../src/main-window.c:1239
 msgid "Move the selected file up"
 msgstr "Přesunout vybraný soubor nahoru"
 
-#: ../src/main-window.c:1152
+#: ../src/main-window.c:1246
 msgid "Move the selected file down"
 msgstr "Přesunou vybraný soubor dolů"
 
-#: ../src/main-window.c:1159
+#: ../src/main-window.c:1253
 msgid "Clear all files"
 msgstr "Odebrat všechny soubory"
 
 #. End of Background music frame
 #. Begin of Message tab
-#: ../src/main-window.c:1164
+#: ../src/main-window.c:1258
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../src/main-window.c:1557
-msgid "Click to shrink the area"
-msgstr "Klikněte pro zmenšení oblasti"
-
-#: ../src/main-window.c:1589 ../src/callbacks.c:1120
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
 msgid "Sorry, I could not perform the operation!"
 msgstr "Operaci nelze provést."
 
-#: ../src/main-window.c:1738
+#: ../src/main-window.c:1825
 #, c-format
 msgid "File '%s' not found"
 msgstr "Soubor '%s' nenalezen"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Type"
 msgstr "Typ"
 
 #. No animation function (id = 0)
-#: ../src/main-window.c:2062 ../src/main-window.c:2064 ../src/support.c:179
-#: ../src/subtitles.c:162
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
 msgid "None"
 msgstr "Žádný"
 
-#: ../src/main-window.c:2605
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
 msgid "Slides Transitions Report Dialog"
 msgstr "Dialogové okno pro výpis hlášení o přechodech snímků"
 
-#: ../src/main-window.c:2685
+#: ../src/main-window.c:2798
 msgid ""
 "\n"
 "<span weight='bold'>Note:</span>\n"
@@ -491,38 +559,38 @@
 "Snímky, jejichž přechod se použije pouze jednou, se zde nezobrazují.\n"
 "Aplikace Imagination snímek automaticky vybere po kliknutí na něj."
 
-#: ../src/callbacks.c:124 ../src/callbacks.c:469 ../src/callbacks.c:1421
-#: ../src/callbacks.c:1499
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
 msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
 msgstr "Dosud jste prezentaci neuložili. Opravdu ji chcete zavřít?"
 
-#: ../src/callbacks.c:210
+#: ../src/callbacks.c:220
 #, c-format
 msgid "Please wait, importing image %d out of %d"
 msgstr "Čekejte prosím, importuje se %d snímek z %d"
 
-#: ../src/callbacks.c:279
+#: ../src/callbacks.c:289
 msgid "Import audio files, use CTRL key for multiple select"
 msgstr "Import zvukových souborů, více souborů vyberete použitím klávesy CTRL"
 
-#: ../src/callbacks.c:291
+#: ../src/callbacks.c:301
 msgid "All audio files"
 msgstr "Všechny zvukové soubory"
 
-#: ../src/callbacks.c:300 ../src/callbacks.c:375 ../src/callbacks.c:1449
-#: ../src/support.c:370
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/callbacks.c:356
+#: ../src/callbacks.c:365
 msgid "Import images, use SHIFT key for multiple select"
 msgstr "Import obrázků, více souborů vyberete použitím klávesy SHIFT"
 
-#: ../src/callbacks.c:369
+#: ../src/callbacks.c:378
 msgid "All image files"
 msgstr "Všechny obrázky"
 
-#: ../src/callbacks.c:529
+#: ../src/callbacks.c:578
 #, c-format
 msgid "%d x %d pixels"
 msgid_plural "%d x %d pixels"
@@ -530,96 +598,153 @@
 msgstr1 "%d x %d obrazové body"
 msgstr2 "%d x %d obrazových bodů"
 
-#: ../src/callbacks.c:805
+#: ../src/callbacks.c:853
 msgid "translator-credits"
 msgstr "Michal Várady <miko.vaji@gmail.com>"
 
-#: ../src/callbacks.c:1372
+#: ../src/callbacks.c:1517
 msgid "Stops the preview"
 msgstr "Zastaví náhled"
 
-#: ../src/callbacks.c:1432
+#: ../src/callbacks.c:1580
 msgid "Load an Imagination slideshow project"
 msgstr "Načtení projektu prezentace aplikace Imagination"
 
-#: ../src/callbacks.c:1433
+#: ../src/callbacks.c:1581
 msgid "Save an Imagination slideshow project"
 msgstr "Uložení projektu prezentace aplikace Imagination"
 
-#: ../src/callbacks.c:1443
-msgid "Imagination projects"
-msgstr "Projekty aplikace Imagination"
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Projekty aplikace Imagination (*.img)"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
 
-#: ../src/callbacks.c:2195
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "Přidat prá_zdný snímek"
+
+#: ../src/callbacks.c:2498
 msgid "Create empty slide"
 msgstr "Vytvořit prázdný snímek"
 
-#: ../src/callbacks.c:2206
+#: ../src/callbacks.c:2509
 msgid "Empty slide options:"
 msgstr "Možnosti prázdného snímku:"
 
-#: ../src/callbacks.c:2216
-msgid "Use _solid color"
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
 msgstr "Použít _jednu barvu"
 
-#: ../src/callbacks.c:2222
-msgid "Use _linear gradient"
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
 msgstr "Použít _lineární přechod"
 
-#: ../src/callbacks.c:2228
-msgid "Use _radial gradient"
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
 msgstr "Použít _radiální přechod"
 
-#: ../src/callbacks.c:2258
-msgid "Preview"
-msgstr "Náhled"
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "Použít _radiální přechod"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "Zvolte zvukové soubory pro import"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Všechny soubory"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
 
 #. Display propert title depending on the callback that is calling this function.
-#: ../src/new_slideshow.c:65
+#: ../src/new_slideshow.c:66
 msgid "Project properties"
 msgstr "Vlastnosti projektu"
 
-#: ../src/new_slideshow.c:85
+#: ../src/new_slideshow.c:86
 msgid "<b>Slideshow Settings</b>"
 msgstr "<b>Nastavení prezentace</b>"
 
-#: ../src/new_slideshow.c:130
-msgid "<b>Video Format</b>"
-msgstr "<b>Formát videa</b>"
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "Formát videa:"
 
-#: ../src/new_slideshow.c:152 ../src/export.c:1337 ../src/export.c:1524
-#: ../src/export.c:1705
-msgid "<b>Video Size</b>"
-msgstr "<b>Velikost videa</b>"
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "Velikost videa:"
 
-#: ../src/new_slideshow.c:166
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr "Snímek za sekundu:"
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Televizní formát</b>"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
 msgid "<b>Advanced Settings</b>"
 msgstr "<b>Pokročilá nastavení</b>"
 
-#: ../src/new_slideshow.c:173
+#: ../src/new_slideshow.c:178
 msgid "Rescale images to fit desired aspect ratio"
 msgstr ""
 "Změnit poměry stran obrázků tak, aby odpovídaly požadovanému poměru stran"
 
-#: ../src/new_slideshow.c:179
-msgid "Select background color:"
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
 msgstr "Vybrat barvu pozadí:"
 
-#: ../src/slideshow_project.c:213
+#: ../src/slideshow_project.c:265
 msgid "This is not an Imagination project file!"
 msgstr "Toto není soubor projektu aplikace Imagination."
 
-#: ../src/slideshow_project.c:371
+#: ../src/slideshow_project.c:442
 #, c-format
 msgid "Slide %i: can't load image %s\n"
 msgstr "Snímek %i: nelze načíst obrázek %s\n"
 
-#: ../src/slideshow_project.c:493
+#: ../src/slideshow_project.c:585
 #, c-format
 msgid "Can't load image %s\n"
 msgstr "Nelze načíst obrázek %s\n"
 
-#: ../src/support.c:130
+#: ../src/support.c:134
 #, c-format
 msgid "Welcome to Imagination - %d transition loaded."
 msgid_plural "Welcome to Imagination - %d transitions loaded."
@@ -627,7 +752,7 @@
 msgstr1 "Vítejte v aplikaci Imagination - byly načteny %d přechody."
 msgstr2 "Vítejte v aplikaci Imagination - bylo načteno %d přechodů."
 
-#: ../src/support.c:141
+#: ../src/support.c:145
 #, c-format
 msgid "%d slide selected"
 msgid_plural "%d slides selected"
@@ -635,7 +760,7 @@
 msgstr1 "Nalezeny %d snímky"
 msgstr2 "Nalezeno %d snímků"
 
-#: ../src/support.c:152
+#: ../src/support.c:156
 #, c-format
 msgid "%d slide loaded %s"
 msgid_plural "%d slides loaded %s"
@@ -643,143 +768,184 @@
 msgstr1 "%d snímky načteny %s"
 msgstr2 "%d snímků načteno %s"
 
-#: ../src/support.c:156
+#: ../src/support.c:160
 msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 msgstr ""
 " - Pro označení nebo odznačení použijte klávesu CTRL, pomocí klávesy SHIFT "
 "vyberete více položek"
 
-#: ../src/support.c:322
+#: ../src/support.c:327
 msgid "Please choose the slideshow project filename"
 msgstr "Zvolte název souboru projektu prezentace"
 
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures and also switches mode into
-#. * preview if needed.
-#: ../src/support.c:337 ../src/export.c:1183
-msgid "VOB (DVD video)"
-msgstr "VOB (DVD video)"
-
-#: ../src/support.c:343
-msgid "MP4 (MPEG-4)"
-msgstr "MP4 (MPEG-4)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:349 ../src/export.c:1299
-msgid "OGV (Theora/Vorbis)"
-msgstr "OGV (Theora/Vorbis)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:355 ../src/export.c:1486
-msgid "FLV (Flash video)"
-msgstr "FLV (Flash video)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:361 ../src/export.c:1690
-msgid "3GP (Mobile Phones)"
-msgstr "3GP (Mobilní telefony)"
-
-#: ../src/subtitles.c:166
+#: ../src/subtitles.c:243
 msgid "Fade"
 msgstr "Ztmavení"
 
-#: ../src/subtitles.c:170
+#: ../src/subtitles.c:247
 msgid "Slide from left"
 msgstr "Přesun zleva"
 
-#: ../src/subtitles.c:174
+#: ../src/subtitles.c:251
 msgid "Slide from right"
 msgstr "Přesun zprava"
 
-#: ../src/subtitles.c:178
+#: ../src/subtitles.c:255
 msgid "Slide from top"
 msgstr "Přesun shora"
 
-#: ../src/subtitles.c:182
+#: ../src/subtitles.c:259
 msgid "Slide from bottom"
 msgstr "Přesun zdola"
 
-#: ../src/subtitles.c:186
+#: ../src/subtitles.c:263
 msgid "Grow"
 msgstr "Růst"
 
-#: ../src/export.c:150
+#: ../src/subtitles.c:267
+#, fuzzy
+msgid "Slide bottom to top"
+msgstr "Přesun shora"
+
+#: ../src/subtitles.c:271
+#, fuzzy
+msgid "Slide right to left"
+msgstr "Přesun zleva"
+
+#: ../src/export.c:144
 msgid "<b>Export Settings</b>"
 msgstr "<b>Nastavení exportu</b>"
 
-#: ../src/export.c:164
+#: ../src/export.c:158
 msgid "Filename:"
 msgstr "Název souboru:"
 
-#: ../src/export.c:312
+#: ../src/export.c:306
 msgid "Exporting the slideshow"
 msgstr "Exportování prezentace"
 
-#: ../src/export.c:323
+#: ../src/export.c:318
 msgid "Preparing for export ..."
 msgstr "Příprava na export..."
 
-#: ../src/export.c:334
+#: ../src/export.c:329
 msgid "Overall progress:"
 msgstr "Celkový průběh:"
 
-#: ../src/export.c:424 ../src/export.c:807
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
 #, c-format
 msgid "Slide %d export progress:"
 msgstr "Průběh exportu snímku %d:"
 
-#: ../src/export.c:661
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
 msgid "Failed to launch the encoder!"
 msgstr "Nepodařilo se spustit enkodér."
 
-#: ../src/export.c:805
+#: ../src/export.c:902
 #, c-format
 msgid "Final transition export progress:"
 msgstr "Průběh exportu hotových přechodů"
 
-#: ../src/export.c:1195
-msgid "<b>Television Format</b>"
-msgstr "<b>Televizní formát</b>"
+#, fuzzy
+#~ msgid "Border Bottom"
+#~ msgstr "Přesun zdola"
 
-#: ../src/export.c:1202 ../src/export.c:1326 ../src/export.c:1513
-msgid "Normal 4:3"
-msgstr "Běžný 4:3"
+#~ msgid "Click to expand the area"
+#~ msgstr "Klikněte pro zvětšení oblasti"
 
-#: ../src/export.c:1207 ../src/export.c:1330 ../src/export.c:1517
-msgid "Widescreen 16:9"
-msgstr "Širokoúhlý 16:9"
+#~ msgid "Click to shrink the area"
+#~ msgstr "Klikněte pro zmenšení oblasti"
 
-#: ../src/export.c:1315 ../src/export.c:1502
-msgid "<b>Aspect Ratio</b>"
-msgstr "<b>Poměr stran</b>"
+#~ msgid "_Preview"
+#~ msgstr "_Náhled"
 
-#: ../src/export.c:1373 ../src/export.c:1557
-msgid "<b>Video Quality:</b>"
-msgstr "<b>Kvalita videa:</b>"
+#~ msgid "Preview quality"
+#~ msgstr "Kvalita náhledu"
 
-#: ../src/export.c:1380 ../src/export.c:1564
-msgid "Low"
-msgstr "Nízká"
+#~ msgid "_Low"
+#~ msgstr "_Nízká"
 
-#: ../src/export.c:1384 ../src/export.c:1568
-msgid "Medium"
-msgstr "Střední"
+#~ msgid "High"
+#~ msgstr "Vysoká"
+
+#~ msgid "Add"
+#~ msgstr "Přidat"
+
+#~ msgid "Update"
+#~ msgstr "Aktualizovat"
+
+#~ msgid "Remove"
+#~ msgstr "Odebrat"
+
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Klikněte pro výběr barvy pozadí písma"
 
 #, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "Poměr stran:"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Kvalita videa:</b>"
+
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (DVD video)"
+
+#~ msgid "MP4 (MPEG-4)"
+#~ msgstr "MP4 (MPEG-4)"
+
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (Flash video)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (Mobilní telefony)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Běžný 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Širokoúhlý 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Kvalita videa:</b>"
+
+#~ msgid "Low"
+#~ msgstr "Nízká"
+
+#~ msgid "Medium"
+#~ msgstr "Střední"
+
 #~ msgid "VOB (DVD Video)"
 #~ msgstr "VOB (DVD video)"
 
-#, fuzzy
 #~ msgid "OGV (Theora Vorbis)"
 #~ msgstr "OGV (Theora/Vorbis)"
 
-#, fuzzy
 #~ msgid "FLV (Flash Video)"
 #~ msgstr "FLV (Flash video)"
 
+#, fuzzy
+#~ msgid "low"
+#~ msgstr "Pomalý"
+
 #~ msgid "Rotate the slide clockwise"
 #~ msgstr "Otočit snímek ve směru hodinových ručiček"
 
@@ -789,9 +955,6 @@
 #~ msgid "Goto last slide"
 #~ msgstr "Přejít na poslední snímek"
 
-#~ msgid "Please choose the audio files to import"
-#~ msgstr "Zvolte zvukové soubory pro import"
-
 #~ msgid "VOB export"
 #~ msgstr "Export do formátu VOB"

imagination-3.0.tar.bz2/po/de.po -> imagination-3.4.tar.bz2/po/de.po Changed

@@ -16,13 +16,13 @@
 msgstr ""
 "Project-Id-Version: imagination 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 20:10+0100\n"
-"PO-Revision-Date: 2011-02-13 23:27+0100\n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2011-06-11 20:43+0100\n"
 "Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
 "Language-Team: German\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Country: GERMANY\n"
@@ -30,31 +30,31 @@
 "X-Poedit-Language: German\n"
 
 #: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
 msgid "A DVD slideshow maker"
 msgstr "Programm zum Erzeugen einer DVD-Diaschau"
 
-#: ../imagination.desktop.in.h:2
+#: ../imagination.desktop.in.h:3
 msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr "Ein kleines und schnelles GTK-Programm zum Erzeugen einer DVD-Diaschau"
 
-#: ../imagination.desktop.in.h:3
-msgid "Imagination"
-msgstr "Imagination"
-
-#: ../src/audio.c:109
+#: ../src/audio.c:108
 #, c-format
 msgid "Playing %s..."
 msgstr "Spiele »%s« ab ..."
 
-#: ../src/audio.c:137 ../src/main-window.c:1130
+#: ../src/audio.c:136 ../src/main-window.c:1224
 msgid "Play the selected file"
 msgstr "Ausgewählte Datei abspielen"
 
-#: ../src/audio.c:145
+#: ../src/audio.c:144
 msgid "Stop the playback"
 msgstr "Widergabe anhalten"
 
-#: ../src/audio.c:272
+#: ../src/audio.c:271
 #, c-format
 msgid ""
 "%s:\n"
@@ -63,7 +63,7 @@
 "%s:\n"
 "Inkompatible Abspielrate\n"
 
-#: ../src/audio.c:277
+#: ../src/audio.c:276
 #, c-format
 msgid ""
 "%s:\n"
@@ -72,7 +72,7 @@
 "%s:\n"
 "Inkompatible Kanalanzahl\n"
 
-#: ../src/audio.c:283
+#: ../src/audio.c:282
 #, c-format
 msgid ""
 "%s:\n"
@@ -81,7 +81,7 @@
 "%s:\n"
 "Inkompatible Abspielrate und Kanalanzahl\n"
 
-#: ../src/audio.c:303
+#: ../src/audio.c:302
 #, c-format
 msgid ""
 "%s\n"
@@ -90,23 +90,23 @@
 "%s:\n"
 "<b>Möchten Sie ohne diese Dateien fortfahren?</b>"
 
-#: ../src/audio.c:307 ../src/audio.c:454
+#: ../src/audio.c:306 ../src/audio.c:453
 msgid "Audio files mismatch:"
 msgstr "Fehlende Übereinstimmung bei Musikdateien:"
 
-#: ../src/audio.c:401
+#: ../src/audio.c:400
 msgid "Incompatible sample rate."
 msgstr "Inkompatible Abspielrate."
 
-#: ../src/audio.c:408
+#: ../src/audio.c:407
 msgid "Incompatible number of channels."
 msgstr "Inkompatible Kanalanzahl"
 
-#: ../src/audio.c:415
+#: ../src/audio.c:414
 msgid "Incompatible sample rate and number of channels."
 msgstr "Inkompatible Abspielrate und Kanalanzahl"
 
-#: ../src/audio.c:437
+#: ../src/audio.c:436
 #, c-format
 msgid ""
 "File selection contains %d audio file that is incompatible with other files."
@@ -120,54 +120,57 @@
 "Dateiauswahl enthält %d Audiodateien, die inkompatibel zu den anderen "
 "Dateien sind."
 
-#: ../src/audio.c:443
+#: ../src/audio.c:442
 msgid "Please check audio tab for more information."
 msgstr "Wählen Sie den Musikreiter für weitere Information."
 
-#: ../src/main-window.c:222
+#: ../src/main-window.c:218
 msgid "_Slideshow"
 msgstr "_Diaschau"
 
-#: ../src/main-window.c:236
+#: ../src/main-window.c:232
 msgid "Import slideshow"
 msgstr "Diaschau importieren"
 
-#: ../src/main-window.c:260
+#: ../src/main-window.c:256
 msgid "Import p_ictures"
 msgstr "_Bilder importieren"
 
-#: ../src/main-window.c:270
+#: ../src/main-window.c:266
 msgid "Import _music"
 msgstr "_Musik importieren"
 
-#: ../src/main-window.c:287
-msgid "_Preview"
-msgstr "_Vorschau"
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Vorschau"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "Musik importieren"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "Musik importieren"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Inhalte"
 
-#: ../src/main-window.c:295
-msgid "Export"
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
 msgstr "_Exportieren"
 
 #. Slide menu
-#: ../src/main-window.c:310
+#: ../src/main-window.c:330
 msgid "_Slide"
 msgstr "_Dia"
 
-#. Preview quality menu
-#: ../src/main-window.c:332
-msgid "Preview quality"
-msgstr "Darstellungsqualität der Vorschau"
-
-#: ../src/main-window.c:338
-msgid "_Low"
-msgstr "_Niedrig"
-
-#: ../src/main-window.c:342 ../src/export.c:1389 ../src/export.c:1573
-msgid "High"
-msgstr "Hoch"
-
 #. Zoom controls
-#: ../src/main-window.c:346
+#: ../src/main-window.c:349
 msgid "_Zoom"
 msgstr "_Zoom"
 
@@ -175,44 +178,53 @@
 msgid "Add empt_y slide"
 msgstr "_Leeres Dia hinzufügen"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "_Leeres Dia hinzufügen"
+
+#: ../src/main-window.c:392
 msgid "Dele_te"
 msgstr "Lö_schen"
 
-#: ../src/main-window.c:390
+#: ../src/main-window.c:400
 msgid "Repor_t"
 msgstr "_Bericht"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:412
 msgid "Rotate co_unter-clockwise"
 msgstr "_Gegen den Uhrzeigersinn drehen"
 
-#: ../src/main-window.c:413
+#: ../src/main-window.c:423
 msgid "_Rotate clockwise"
 msgstr "Im Uh_rzeigersinn drehen"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:435
 msgid "Un_select all"
 msgstr "A_uswahl afheben"
 
 #. View menu
-#: ../src/main-window.c:434
+#: ../src/main-window.c:441
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/main-window.c:440
+#: ../src/main-window.c:447
 msgid "Preview mode"
 msgstr "Vorschau"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:453
 msgid "Overview mode"
 msgstr "Übersicht"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:456
 msgid "Preview _frame rate"
 msgstr "Bildfrequenz Vorschau"
 
-#: ../src/main-window.c:469
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
@@ -220,273 +232,329 @@
 msgstr1 "%d Frames pro Sekunde"
 
 #. Help menu
-#: ../src/main-window.c:486
+#: ../src/main-window.c:497
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/main-window.c:491
+#: ../src/main-window.c:502
 msgid "Contents"
 msgstr "Inhalte"
 
-#: ../src/main-window.c:512 ../src/new_slideshow.c:65
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
 msgid "Create a new slideshow"
 msgstr "Neue Diaschau anlegen"
 
-#: ../src/main-window.c:517
+#: ../src/main-window.c:528
 msgid "Open a slideshow"
 msgstr "Eine Diaschau öffnen"
 
-#: ../src/main-window.c:522
+#: ../src/main-window.c:533
 msgid "Save the slideshow"
 msgstr "Die Diaschau speichern"
 
-#: ../src/main-window.c:535
+#: ../src/main-window.c:546
 msgid "Import pictures"
 msgstr "Bilder importieren"
 
-#: ../src/main-window.c:544
+#: ../src/main-window.c:555
 msgid "Import music"
 msgstr "Musik importieren"
 
-#: ../src/main-window.c:549
+#: ../src/main-window.c:560
 msgid "Delete the selected slides"
 msgstr "Ausgewählte Dias löschen"
 
-#: ../src/main-window.c:559
+#: ../src/main-window.c:570
 msgid "Rotate the slide 90 degrees to the left"
 msgstr "Das Dia gegen den Uhrzeigersinn drehen"
 
-#: ../src/main-window.c:570
+#: ../src/main-window.c:581
 msgid "Rotate the slide 90 degrees to the right"
 msgstr "Das Dia in den Uhrzeigersinn drehen"
 
-#: ../src/main-window.c:576
+#: ../src/main-window.c:587
 msgid "Zoom In"
 msgstr "Vergrößern"
 
-#: ../src/main-window.c:581
+#: ../src/main-window.c:592
 msgid "Zoom Out"
 msgstr "Verkleinern"
 
-#: ../src/main-window.c:586
+#: ../src/main-window.c:597
 msgid "Normal Size"
 msgstr "Normale Größe"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:602
 msgid "Fit Zoom in Window"
 msgstr "Zoom an Fenster anpassen"
 
-#: ../src/main-window.c:599 ../src/callbacks.c:1362
-msgid "Starts the preview"
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
 msgstr "Startet die Vorschau"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:619
 msgid "Go to the first slide of the slideshow"
 msgstr "Zum ersten Dia"
 
-#: ../src/main-window.c:614
+#: ../src/main-window.c:625
 msgid "Go to the previous slide of the slideshow"
 msgstr "Zum vorigen Dia"
 
-#: ../src/main-window.c:630 ../src/main-window.c:837
+#: ../src/main-window.c:641 ../src/main-window.c:847
 msgid " of "
 msgstr " von "
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:653
 msgid "Go to the next slide of the slideshow"
 msgstr "Zum nächsten Dia"
 
-#: ../src/main-window.c:648
+#: ../src/main-window.c:659
 msgid "Go to the last slide of the slideshow"
 msgstr "Zum letzten Dia"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:708
 msgid "Video"
 msgstr "Video"
 
-#: ../src/main-window.c:717
+#: ../src/main-window.c:726
 msgid "<b>Slide Settings</b>"
 msgstr "<b>Dia-Einstellungen</b>"
 
 #. Transition types label
-#: ../src/main-window.c:727
+#: ../src/main-window.c:736
 msgid "Transition Type:"
 msgstr "Überblend-Effekt:"
 
-#: ../src/main-window.c:747
+#: ../src/main-window.c:756
 msgid "Random"
 msgstr "Zufällig"
 
-#: ../src/main-window.c:748
+#: ../src/main-window.c:757
 msgid "Imagination randomly decides which transition to apply"
 msgstr "Imagination wählt einen Effekt zufällig aus"
 
 #. Transition duration
-#: ../src/main-window.c:754
+#: ../src/main-window.c:763
 msgid "Transition Speed:"
 msgstr "Überblendgeschwindigkeit:"
 
-#: ../src/main-window.c:765
+#: ../src/main-window.c:774
 msgid "Fast"
 msgstr "Schnell"
 
-#: ../src/main-window.c:767
+#: ../src/main-window.c:776
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/main-window.c:769
+#: ../src/main-window.c:778
 msgid "Slow"
 msgstr "Langsam"
 
 #. Slide duration
-#: ../src/main-window.c:776
+#: ../src/main-window.c:785
 msgid "Slide Duration in sec:"
 msgstr "Dia-Anzeigedauer (in Sek.):"
 
 #. Slide Total Duration
-#: ../src/main-window.c:787
+#: ../src/main-window.c:797
 msgid "Slideshow Length:"
 msgstr "Länge der Diaschau:"
 
-#: ../src/main-window.c:804
+#: ../src/main-window.c:814
 msgid "<b>Slide Motion</b>"
 msgstr "<b>Dia-Bewegung</b>"
 
-#: ../src/main-window.c:814
+#: ../src/main-window.c:824
 msgid "Stop Point:"
 msgstr "Anhaltepunkt:"
 
-#: ../src/main-window.c:851
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Anhaltepunkt:"
+
+#: ../src/main-window.c:869
 msgid "Duration:"
 msgstr "Dauer:"
 
-#: ../src/main-window.c:860
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Anhaltepunkt:"
+
+#: ../src/main-window.c:891
 msgid "Zoom: "
 msgstr "Zoom: "
 
-#: ../src/main-window.c:874
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../src/main-window.c:878
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: ../src/main-window.c:883
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../src/main-window.c:897
+#: ../src/main-window.c:910
 msgid "<b>Slide Text</b>"
 msgstr "<b>Dia-Text</b>"
 
-#: ../src/main-window.c:926 ../src/main-window.c:1562
-msgid "Click to expand the area"
-msgstr "Klicken, um die Fläche zu erweitern"
-
-#: ../src/main-window.c:943
+#: ../src/main-window.c:944
 msgid "Click to choose the font"
 msgstr "Klicken, um die Schriftart zu wählen"
 
-#: ../src/main-window.c:950
+#: ../src/main-window.c:951 ../src/support.c:1176
 msgid "Click to choose the font color"
 msgstr "Klicken, um die Schriftfarbe zu wählen"
 
-#: ../src/main-window.c:957
-msgid "Click to choose the font background color"
-msgstr "Klicken, um die Schriftkonturfarbe zu wählen"
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Klicken, um die Schriftart zu wählen"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
 
-#: ../src/main-window.c:961
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Klicken, um die Schriftfarbe zu wählen"
+
+#: ../src/main-window.c:1023
 msgid "Animation:"
 msgstr "Animation:"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:1035
 msgid "Animation Speed:"
 msgstr "Animationsgeschwindigkeit:"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Dia-Bewegung</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Position des Untertitels"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Position des Untertitels"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
 msgid "Placing is relative to:"
 msgstr "Plazierung relativ zu:"
 
-#: ../src/main-window.c:1003
+#: ../src/main-window.c:1140
 msgid "Exported video"
 msgstr "Exportiertes Video"
 
-#: ../src/main-window.c:1005
+#: ../src/main-window.c:1142
 msgid "Original image"
 msgstr "Ursprüngliches Bild"
 
-#: ../src/main-window.c:1014
-msgid "Subtitle position:"
-msgstr "Position des Untertitels"
-
 #. Background music frame
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:1149
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/main-window.c:1068
+#: ../src/main-window.c:1162
 msgid "<b>Background Music</b>"
 msgstr "<b>Hintergrundmusik</b>"
 
-#: ../src/main-window.c:1114
+#: ../src/main-window.c:1208
 msgid "Music Duration:"
 msgstr "Musikdauer:"
 
-#: ../src/main-window.c:1138
+#: ../src/main-window.c:1232
 msgid "Delete the selected file"
 msgstr "Die ausgewählte Datei löschen"
 
-#: ../src/main-window.c:1145
+#: ../src/main-window.c:1239
 msgid "Move the selected file up"
 msgstr "Die ausgewählte Datei nach oben verschieben"
 
-#: ../src/main-window.c:1152
+#: ../src/main-window.c:1246
 msgid "Move the selected file down"
 msgstr "Die ausgewählte Datei nach unten verschieben"
 
-#: ../src/main-window.c:1159
+#: ../src/main-window.c:1253
 msgid "Clear all files"
 msgstr "Alle Dateien entfernen"
 
 #. End of Background music frame
 #. Begin of Message tab
-#: ../src/main-window.c:1164
+#: ../src/main-window.c:1258
 msgid "Messages"
 msgstr "Meldungen"
 
-#: ../src/main-window.c:1557
-msgid "Click to shrink the area"
-msgstr "Klicken, um die Fläche zu verkleinern"
-
-#: ../src/main-window.c:1589 ../src/callbacks.c:1120
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
 msgid "Sorry, I could not perform the operation!"
 msgstr "Entschuldigung, die Operation konnte nicht durchgeführt werden!"
 
-#: ../src/main-window.c:1738
+#: ../src/main-window.c:1825
 #, c-format
 msgid "File '%s' not found"
 msgstr "Datei '%s' nicht gefunden"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Type"
 msgstr "Typ"
 
 #. No animation function (id = 0)
-#: ../src/main-window.c:2062 ../src/main-window.c:2064 ../src/support.c:179
-#: ../src/subtitles.c:162
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
 msgid "None"
 msgstr "Keiner"
 
-#: ../src/main-window.c:2605
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
 msgid "Slides Transitions Report Dialog"
 msgstr "Diaübergänge"
 
-#: ../src/main-window.c:2685
+#: ../src/main-window.c:2798
 msgid ""
 "\n"
 "<span weight='bold'>Note:</span>\n"
@@ -501,281 +569,403 @@
 "aufgeführt.\n"
 "Klicken Sie das Dia an, damit Imagination dieses automatisch auswählt."
 
-#: ../src/callbacks.c:124 ../src/callbacks.c:469 ../src/callbacks.c:1421
-#: ../src/callbacks.c:1499
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
 msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
 msgstr ""
 "Sie haben die Diaschau noch nicht gespeichert. Sind Sie sicher, dass Sie "
 "diese schließen möchten?"
 
-#: ../src/callbacks.c:210
+#: ../src/callbacks.c:220
 #, c-format
 msgid "Please wait, importing image %d out of %d"
 msgstr "Bitte warten Sie, während Dia %d von %d importiert wird"
 
-#: ../src/callbacks.c:279
+#: ../src/callbacks.c:289
 msgid "Import audio files, use CTRL key for multiple select"
 msgstr "Musiku Importieren (Shift-Taste für Mehrfachauswahl benutzen)"
 
-#: ../src/callbacks.c:291
+#: ../src/callbacks.c:301
 msgid "All audio files"
 msgstr "Alle Musikdateien"
 
-#: ../src/callbacks.c:300 ../src/callbacks.c:375 ../src/callbacks.c:1449
-#: ../src/support.c:370
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/callbacks.c:356
+#: ../src/callbacks.c:365
 msgid "Import images, use SHIFT key for multiple select"
 msgstr "Dias Importieren (Shift-Taste für Mehrfachauswahl benutzen)"
 
-#: ../src/callbacks.c:369
+#: ../src/callbacks.c:378
 msgid "All image files"
 msgstr "Alle Bilddateien"
 
-#: ../src/callbacks.c:529
+#: ../src/callbacks.c:578
 #, c-format
 msgid "%d x %d pixels"
 msgid_plural "%d x %d pixels"
 msgstr0 "%d x %d Bildpunkte"
 msgstr1 "%d x %d Bildpunkte"
 
-#: ../src/callbacks.c:805
+#: ../src/callbacks.c:853
 msgid "translator-credits"
 msgstr ""
 "Enrico Tröger <enrico@xfce.org>\n"
 "Fabian Nowak <timystery@arcor.de>"
 
-#: ../src/callbacks.c:1372
+#: ../src/callbacks.c:1517
 msgid "Stops the preview"
 msgstr "Hält die Vorschau an"
 
-#: ../src/callbacks.c:1432
+#: ../src/callbacks.c:1580
 msgid "Load an Imagination slideshow project"
 msgstr "Eine Imagination Diaschau laden"
 
-#: ../src/callbacks.c:1433
+#: ../src/callbacks.c:1581
 msgid "Save an Imagination slideshow project"
 msgstr "Eine Imagination Diaschau speichern"
 
-#: ../src/callbacks.c:1443
-msgid "Imagination projects"
-msgstr "Imagination Diaschauen"
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Imagination Diaschauen (*.img)"
 
-#: ../src/callbacks.c:2195
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "_Leeres Dia hinzufügen"
+
+#: ../src/callbacks.c:2498
 msgid "Create empty slide"
 msgstr "Leeres Dia anlegen"
 
-#: ../src/callbacks.c:2206
+#: ../src/callbacks.c:2509
 msgid "Empty slide options:"
 msgstr "Einstellungen für leeres Dia:"
 
-#: ../src/callbacks.c:2216
-msgid "Use _solid color"
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
 msgstr "_Feste Hintergrundfarbe"
 
-#: ../src/callbacks.c:2222
-msgid "Use _linear gradient"
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
 msgstr "_Linearer Farbverlauf"
 
-#: ../src/callbacks.c:2228
-msgid "Use _radial gradient"
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
 msgstr "_Radialer Farbverlauf"
 
-#: ../src/callbacks.c:2258
-msgid "Preview"
-msgstr "Vorschau"
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "_Radialer Farbverlauf"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "Wählen Sie Musikdateien zum Importieren"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Alle Dateien"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
 
 #. Display propert title depending on the callback that is calling this function.
-#: ../src/new_slideshow.c:65
+#: ../src/new_slideshow.c:66
 msgid "Project properties"
 msgstr "Projekteigenschaften"
 
-#: ../src/new_slideshow.c:85
+#: ../src/new_slideshow.c:86
 msgid "<b>Slideshow Settings</b>"
 msgstr "<b>Diaschau-Einstellungen</b>"
 
-#: ../src/new_slideshow.c:130
-msgid "<b>Video Format</b>"
-msgstr "<b>Videoformat</b>"
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "Videoformat:"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "Videogröße:"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr "Frame pro Sekunde (FPS):"
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Fernsehformat</b>"
 
-#: ../src/new_slideshow.c:152 ../src/export.c:1337 ../src/export.c:1524
-#: ../src/export.c:1705
-msgid "<b>Video Size</b>"
-msgstr "<b>Videogröße</b>"
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr "Datenrate:"
 
-#: ../src/new_slideshow.c:166
+#: ../src/new_slideshow.c:171
 msgid "<b>Advanced Settings</b>"
 msgstr "<b>Erweiterte Einstellungen</b>"
 
-#: ../src/new_slideshow.c:173
+#: ../src/new_slideshow.c:178
 msgid "Rescale images to fit desired aspect ratio"
 msgstr "Bilder in das Format einpassen"
 
-#: ../src/new_slideshow.c:179
-msgid "Select background color:"
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
 msgstr "Hintergrundfarbe:"
 
-#: ../src/slideshow_project.c:213
+#: ../src/slideshow_project.c:265
 msgid "This is not an Imagination project file!"
 msgstr "Dies ist keine Projektdatei für Imagination."
 
-#: ../src/slideshow_project.c:371
+#: ../src/slideshow_project.c:442
 #, c-format
 msgid "Slide %i: can't load image %s\n"
 msgstr "Dia %i: kann Bild %s nicht laden\n"
 
-#: ../src/slideshow_project.c:493
+#: ../src/slideshow_project.c:585
 #, c-format
 msgid "Can't load image %s\n"
 msgstr "Kann Bild %s nicht laden\n"
 
-#: ../src/support.c:130
+#: ../src/support.c:134
 #, c-format
 msgid "Welcome to Imagination - %d transition loaded."
 msgid_plural "Welcome to Imagination - %d transitions loaded."
 msgstr0 "Willkommen zu Imagination - %d Überblend-Effekt geladen"
 msgstr1 "Willkommen zu Imagination - %d Überblend-Effekte geladen"
 
-#: ../src/support.c:141
+#: ../src/support.c:145
 #, c-format
 msgid "%d slide selected"
 msgid_plural "%d slides selected"
 msgstr0 "%d Dias ausgewählt"
 msgstr1 "%d Dias ausgewählt"
 
-#: ../src/support.c:152
+#: ../src/support.c:156
 #, c-format
 msgid "%d slide loaded %s"
 msgid_plural "%d slides loaded %s"
 msgstr0 "%d Dia geladen %s"
 msgstr1 "%d Dias importiert %s"
 
-#: ../src/support.c:156
+#: ../src/support.c:160
 msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 msgstr ""
 " - Benutzen Sie zum Auswählen die Strg-Taste und die Shift-Taste für eine "
 "Mehrfachauswahl"
 
-#: ../src/support.c:322
+#: ../src/support.c:327
 msgid "Please choose the slideshow project filename"
 msgstr "Projektnamen für die Diaschau wählen"
 
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures and also switches mode into
-#. * preview if needed.
-#: ../src/support.c:337 ../src/export.c:1183
-msgid "VOB (DVD video)"
-msgstr "VOB (DVD video)"
-
-#: ../src/support.c:343
-msgid "MP4 (MPEG-4)"
-msgstr "MP4 (MPEG-4)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:349 ../src/export.c:1299
-msgid "OGV (Theora/Vorbis)"
-msgstr "OGV (Theora/Vorbis)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:355 ../src/export.c:1486
-msgid "FLV (Flash video)"
-msgstr "FLV (Flash video)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:361 ../src/export.c:1690
-msgid "3GP (Mobile Phones)"
-msgstr "3GP (Mobile Phones)"
-
-#: ../src/subtitles.c:166
+#: ../src/subtitles.c:243
 msgid "Fade"
 msgstr "verfärben"
 
-#: ../src/subtitles.c:170
+#: ../src/subtitles.c:247
 msgid "Slide from left"
 msgstr "von links gleiten"
 
-#: ../src/subtitles.c:174
+#: ../src/subtitles.c:251
 msgid "Slide from right"
 msgstr "von rechts gleiten"
 
-#: ../src/subtitles.c:178
+#: ../src/subtitles.c:255
 msgid "Slide from top"
 msgstr "von oben gleiten"
 
-#: ../src/subtitles.c:182
+#: ../src/subtitles.c:259
 msgid "Slide from bottom"
 msgstr "von unten gleiten"
 
-#: ../src/subtitles.c:186
+#: ../src/subtitles.c:263
 msgid "Grow"
 msgstr "zunehmen"
 
-#: ../src/export.c:150
+#: ../src/subtitles.c:267
+#, fuzzy
+msgid "Slide bottom to top"
+msgstr "von oben gleiten"
+
+#: ../src/subtitles.c:271
+#, fuzzy
+msgid "Slide right to left"
+msgstr "von links gleiten"
+
+#: ../src/export.c:144
 msgid "<b>Export Settings</b>"
 msgstr "<b>Export-Einstellungen</b>"
 
-#: ../src/export.c:164
+#: ../src/export.c:158
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: ../src/export.c:312
+#: ../src/export.c:306
 msgid "Exporting the slideshow"
 msgstr "Diaschau wird exportiert"
 
-#: ../src/export.c:323
+#: ../src/export.c:318
 msgid "Preparing for export ..."
 msgstr "Export vorbereiten ..."
 
-#: ../src/export.c:334
+#: ../src/export.c:329
 msgid "Overall progress:"
 msgstr "Gesamtfortschritt: "
 
-#: ../src/export.c:424 ../src/export.c:807
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
 #, c-format
 msgid "Slide %d export progress:"
 msgstr "Exportfortschritt bei Dia %d:"
 
-#: ../src/export.c:661
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
 msgid "Failed to launch the encoder!"
 msgstr "Konnte den Encoder nicht starten."
 
-#: ../src/export.c:805
+#: ../src/export.c:902
 #, c-format
 msgid "Final transition export progress:"
 msgstr "Exportfortschritt beim letzten Dia:"
 
-#: ../src/export.c:1195
-msgid "<b>Television Format</b>"
-msgstr "<b>Fernsehformat</b>"
+#, fuzzy
+#~ msgid "Border Bottom"
+#~ msgstr "von unten gleiten"
+
+#~ msgid "Click to expand the area"
+#~ msgstr "Klicken, um die Fläche zu erweitern"
+
+#~ msgid "Click to shrink the area"
+#~ msgstr "Klicken, um die Fläche zu verkleinern"
+
+#~ msgid "_Preview"
+#~ msgstr "_Vorschau"
+
+#~ msgid "Preview quality"
+#~ msgstr "Darstellungsqualität der Vorschau"
+
+#~ msgid "_Low"
+#~ msgstr "_Niedrig"
+
+#~ msgid "High"
+#~ msgstr "Hoch"
+
+#~ msgid "Add"
+#~ msgstr "Hinzufügen"
+
+#~ msgid "Update"
+#~ msgstr "Aktualisieren"
 
-#: ../src/export.c:1202 ../src/export.c:1326 ../src/export.c:1513
-msgid "Normal 4:3"
-msgstr "Normal 4:3"
+#~ msgid "Remove"
+#~ msgstr "Entfernen"
 
-#: ../src/export.c:1207 ../src/export.c:1330 ../src/export.c:1517
-msgid "Widescreen 16:9"
-msgstr "Breitbild 16:9"
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Klicken, um die Schriftkonturfarbe zu wählen"
 
-#: ../src/export.c:1315 ../src/export.c:1502
-msgid "<b>Aspect Ratio</b>"
-msgstr "<b>Aspektverhältnis</b>"
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "Aspektverhältnis:"
 
-#: ../src/export.c:1373 ../src/export.c:1557
-msgid "<b>Video Quality:</b>"
-msgstr "<b>Videoqualität</b>"
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Videoqualität</b>"
 
-#: ../src/export.c:1380 ../src/export.c:1564
-msgid "Low"
-msgstr "Niedrig"
+#, fuzzy
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (DVD video)"
 
-#: ../src/export.c:1384 ../src/export.c:1568
-msgid "Medium"
-msgstr "Mittel"
+#~ msgid "MP4 (MPEG-4)"
+#~ msgstr "MP4 (MPEG-4)"
+
+#, fuzzy
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#, fuzzy
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (Flash video)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (Mobile Phones)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Normal 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Breitbild 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Videoqualität</b>"
+
+#~ msgid "Low"
+#~ msgstr "Niedrig"
+
+#~ msgid "Medium"
+#~ msgstr "Mittel"
+
+#~ msgid "512 kbps (low)"
+#~ msgstr "512 kbps (niedrig)"
+
+#~ msgid "1024 kbps (medium)"
+#~ msgstr "1024 kbps (mittel)"
+
+#~ msgid "2048 kbps (high)"
+#~ msgstr "2048 kbps (hoch)"
+
+#~ msgid "384 kbps (low)"
+#~ msgstr "384 kbps (niedrig)"
+
+#~ msgid "768 kbps (medium)"
+#~ msgstr "768 kbps (mittel)"
+
+#~ msgid "1536 kbps (high)"
+#~ msgstr "1536 kbps (hoch)"
+
+#, fuzzy
+#~ msgid "low"
+#~ msgstr "Langsam"
 
 #~ msgid "Rotate the slide clockwise"
 #~ msgstr "Das Dia im Uhrzeigersinn drehen"
@@ -786,9 +976,6 @@
 #~ msgid "Goto last slide"
 #~ msgstr "Zum letzten Dia"
 
-#~ msgid "Please choose the audio files to import"
-#~ msgstr "Wählen Sie Musikdateien zum Importieren"
-
 #~ msgid "VOB export"
 #~ msgstr "VOB exportieren"

imagination-3.0.tar.bz2/po/en_GB.po -> imagination-3.4.tar.bz2/po/en_GB.po Changed

@@ -1,5 +1,5 @@
 # English translations for imagination package.
-# Copyright (C) 2009 THE imagination'S COPYRIGHT HOLDER
+# Copyright (C) 2009-2018 THE imagination'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the imagination package.
 # colossus73 <colossus73@gmail.com>, 2009.
 #
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: imagination 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 20:10+0100\n"
-"PO-Revision-Date: 2011-03-06 09:46+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2011-06-11 20:44+0100\n"
+"Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
 "Language-Team: English (British)\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -18,31 +18,31 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
 msgid "A DVD slideshow maker"
 msgstr "A DVD slideshow maker"
 
-#: ../imagination.desktop.in.h:2
+#: ../imagination.desktop.in.h:3
 msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr "A lightweight DVD slideshow maker using GTK+2"
 
-#: ../imagination.desktop.in.h:3
-msgid "Imagination"
-msgstr "Imagination"
-
-#: ../src/audio.c:109
+#: ../src/audio.c:108
 #, c-format
 msgid "Playing %s..."
 msgstr "Playing %s..."
 
-#: ../src/audio.c:137 ../src/main-window.c:1130
+#: ../src/audio.c:136 ../src/main-window.c:1224
 msgid "Play the selected file"
 msgstr "Play the selected file"
 
-#: ../src/audio.c:145
+#: ../src/audio.c:144
 msgid "Stop the playback"
 msgstr "Stop the playback"
 
-#: ../src/audio.c:272
+#: ../src/audio.c:271
 #, c-format
 msgid ""
 "%s:\n"
@@ -51,7 +51,7 @@
 "%s:\n"
 "incompatible sample rate\n"
 
-#: ../src/audio.c:277
+#: ../src/audio.c:276
 #, c-format
 msgid ""
 "%s:\n"
@@ -60,7 +60,7 @@
 "%s:\n"
 "incompatible number of channels\n"
 
-#: ../src/audio.c:283
+#: ../src/audio.c:282
 #, c-format
 msgid ""
 "%s:\n"
@@ -69,7 +69,7 @@
 "%s:\n"
 "incompatible sample rate and number of channels\n"
 
-#: ../src/audio.c:303
+#: ../src/audio.c:302
 #, c-format
 msgid ""
 "%s\n"
@@ -78,23 +78,23 @@
 "%s\n"
 "<b>Do you want to continue without these files?</b>"
 
-#: ../src/audio.c:307 ../src/audio.c:454
+#: ../src/audio.c:306 ../src/audio.c:453
 msgid "Audio files mismatch:"
 msgstr "Audio files mismatch:"
 
-#: ../src/audio.c:401
+#: ../src/audio.c:400
 msgid "Incompatible sample rate."
 msgstr "Incompatible sample rate."
 
-#: ../src/audio.c:408
+#: ../src/audio.c:407
 msgid "Incompatible number of channels."
 msgstr "Incompatible number of channels."
 
-#: ../src/audio.c:415
+#: ../src/audio.c:414
 msgid "Incompatible sample rate and number of channels."
 msgstr "Incompatible sample rate and number of channels."
 
-#: ../src/audio.c:437
+#: ../src/audio.c:436
 #, c-format
 msgid ""
 "File selection contains %d audio file that is incompatible with other files."
@@ -107,54 +107,53 @@
 "File selection contains %d audio files that are incompatible with other "
 "files."
 
-#: ../src/audio.c:443
+#: ../src/audio.c:442
 msgid "Please check audio tab for more information."
 msgstr "Please check audio tab for more information."
 
-#: ../src/main-window.c:222
+#: ../src/main-window.c:218
 msgid "_Slideshow"
 msgstr "_Slideshow"
 
-#: ../src/main-window.c:236
+#: ../src/main-window.c:232
 msgid "Import slideshow"
 msgstr "Import slideshow"
 
-#: ../src/main-window.c:260
+#: ../src/main-window.c:256
 msgid "Import p_ictures"
 msgstr "Import p_ictures"
 
-#: ../src/main-window.c:270
+#: ../src/main-window.c:266
 msgid "Import _music"
 msgstr "Import _music"
 
-#: ../src/main-window.c:287
-msgid "_Preview"
-msgstr "_Preview"
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Preview"
 
-#: ../src/main-window.c:295
-msgid "Export"
-msgstr "Export"
+#: ../src/main-window.c:291
+msgid "With music"
+msgstr "With music"
 
-#. Slide menu
-#: ../src/main-window.c:310
-msgid "_Slide"
-msgstr "_Slide"
+#: ../src/main-window.c:300
+msgid "Without music"
+msgstr "Without music"
 
-#. Preview quality menu
-#: ../src/main-window.c:332
-msgid "Preview quality"
-msgstr "Preview quality"
+#: ../src/main-window.c:307
+msgid "Continuos"
+msgstr "Continuos"
 
-#: ../src/main-window.c:338
-msgid "_Low"
-msgstr "_Low"
+#: ../src/main-window.c:314
+msgid "Ex_port"
+msgstr "Ex_port"
 
-#: ../src/main-window.c:342 ../src/export.c:1389 ../src/export.c:1573
-msgid "High"
-msgstr "High"
+#. Slide menu
+#: ../src/main-window.c:330
+msgid "_Slide"
+msgstr "_Slide"
 
 #. Zoom controls
-#: ../src/main-window.c:346
+#: ../src/main-window.c:349
 msgid "_Zoom"
 msgstr "_Zoom"
 
@@ -162,44 +161,52 @@
 msgid "Add empt_y slide"
 msgstr "Add empt_y slide"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:379
+msgid "Edit _empty slide"
+msgstr "Edit empty slide"
+
+#: ../src/main-window.c:392
 msgid "Dele_te"
 msgstr "Dele_te"
 
-#: ../src/main-window.c:390
+#: ../src/main-window.c:400
 msgid "Repor_t"
 msgstr "Repor_t"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:412
 msgid "Rotate co_unter-clockwise"
 msgstr "Rotate co_unter-clockwise"
 
-#: ../src/main-window.c:413
+#: ../src/main-window.c:423
 msgid "_Rotate clockwise"
 msgstr "_Rotate clockwise"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:435
 msgid "Un_select all"
 msgstr "Un_select all"
 
 #. View menu
-#: ../src/main-window.c:434
+#: ../src/main-window.c:441
 msgid "_View"
 msgstr "_View"
 
-#: ../src/main-window.c:440
+#: ../src/main-window.c:447
 msgid "Preview mode"
 msgstr "Preview mode"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:453
 msgid "Overview mode"
 msgstr "Overview mode"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:456
 msgid "Preview _frame rate"
 msgstr "Preview _frame rate"
 
-#: ../src/main-window.c:469
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr "Fullscreen"
+
+#: ../src/main-window.c:480
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
@@ -207,273 +214,325 @@
 msgstr1 "%d frames per second"
 
 #. Help menu
-#: ../src/main-window.c:486
+#: ../src/main-window.c:497
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/main-window.c:491
+#: ../src/main-window.c:502
 msgid "Contents"
 msgstr "Contents"
 
-#: ../src/main-window.c:512 ../src/new_slideshow.c:65
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
 msgid "Create a new slideshow"
 msgstr "Create a new slideshow"
 
-#: ../src/main-window.c:517
+#: ../src/main-window.c:528
 msgid "Open a slideshow"
 msgstr "Open a slideshow"
 
-#: ../src/main-window.c:522
+#: ../src/main-window.c:533
 msgid "Save the slideshow"
 msgstr "Save the slideshow"
 
-#: ../src/main-window.c:535
+#: ../src/main-window.c:546
 msgid "Import pictures"
 msgstr "Import pictures"
 
-#: ../src/main-window.c:544
+#: ../src/main-window.c:555
 msgid "Import music"
 msgstr "Import music"
 
-#: ../src/main-window.c:549
+#: ../src/main-window.c:560
 msgid "Delete the selected slides"
 msgstr "Delete the selected slides"
 
-#: ../src/main-window.c:559
+#: ../src/main-window.c:570
 msgid "Rotate the slide 90 degrees to the left"
 msgstr "Rotate the slide 90 degrees to the left"
 
-#: ../src/main-window.c:570
+#: ../src/main-window.c:581
 msgid "Rotate the slide 90 degrees to the right"
 msgstr "Rotate the slide 90 degrees to the right"
 
-#: ../src/main-window.c:576
+#: ../src/main-window.c:587
 msgid "Zoom In"
 msgstr "Zoom In"
 
-#: ../src/main-window.c:581
+#: ../src/main-window.c:592
 msgid "Zoom Out"
 msgstr "Zoom Out"
 
-#: ../src/main-window.c:586
+#: ../src/main-window.c:597
 msgid "Normal Size"
 msgstr "Normal Size"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:602
 msgid "Fit Zoom in Window"
 msgstr "Fit Zoom in Window"
 
-#: ../src/main-window.c:599 ../src/callbacks.c:1362
-msgid "Starts the preview"
-msgstr "Starts the preview"
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+msgid "Starts the preview without music"
+msgstr "Starts the preview without music"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:619
 msgid "Go to the first slide of the slideshow"
 msgstr "Go to the first slide of the slideshow"
 
-#: ../src/main-window.c:614
+#: ../src/main-window.c:625
 msgid "Go to the previous slide of the slideshow"
 msgstr "Go to the previous slide of the slideshow"
 
-#: ../src/main-window.c:630 ../src/main-window.c:837
+#: ../src/main-window.c:641 ../src/main-window.c:847
 msgid " of "
 msgstr " of "
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:653
 msgid "Go to the next slide of the slideshow"
 msgstr "Go to the next slide of the slideshow"
 
-#: ../src/main-window.c:648
+#: ../src/main-window.c:659
 msgid "Go to the last slide of the slideshow"
 msgstr "Go to the last slide of the slideshow"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:708
 msgid "Video"
 msgstr "Video"
 
-#: ../src/main-window.c:717
+#: ../src/main-window.c:726
 msgid "<b>Slide Settings</b>"
 msgstr "<b>Slide Settings</b>"
 
 #. Transition types label
-#: ../src/main-window.c:727
+#: ../src/main-window.c:736
 msgid "Transition Type:"
 msgstr "Transition Type:"
 
-#: ../src/main-window.c:747
+#: ../src/main-window.c:756
 msgid "Random"
 msgstr "Random"
 
-#: ../src/main-window.c:748
+#: ../src/main-window.c:757
 msgid "Imagination randomly decides which transition to apply"
 msgstr "Imagination randomly decides which transition to apply"
 
 #. Transition duration
-#: ../src/main-window.c:754
+#: ../src/main-window.c:763
 msgid "Transition Speed:"
 msgstr "Transition Speed:"
 
-#: ../src/main-window.c:765
+#: ../src/main-window.c:774
 msgid "Fast"
 msgstr "Fast"
 
-#: ../src/main-window.c:767
+#: ../src/main-window.c:776
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/main-window.c:769
+#: ../src/main-window.c:778
 msgid "Slow"
 msgstr "Slow"
 
 #. Slide duration
-#: ../src/main-window.c:776
+#: ../src/main-window.c:785
 msgid "Slide Duration in sec:"
 msgstr "Slide Duration in sec:"
 
 #. Slide Total Duration
-#: ../src/main-window.c:787
+#: ../src/main-window.c:797
 msgid "Slideshow Length:"
 msgstr "Slideshow Length:"
 
-#: ../src/main-window.c:804
+#: ../src/main-window.c:814
 msgid "<b>Slide Motion</b>"
 msgstr "<b>Slide Motion</b>"
 
-#: ../src/main-window.c:814
+#: ../src/main-window.c:824
 msgid "Stop Point:"
 msgstr "Stop Point:"
 
-#: ../src/main-window.c:851
+#: ../src/main-window.c:865
+msgid "Add Stop point"
+msgstr "Add Stop Point"
+
+#: ../src/main-window.c:869
 msgid "Duration:"
 msgstr "Duration:"
 
-#: ../src/main-window.c:860
+#: ../src/main-window.c:886
+msgid "Remove Stop point"
+msgstr "Remove Stop Point"
+
+#: ../src/main-window.c:891
 msgid "Zoom: "
 msgstr "Zoom: "
 
-#: ../src/main-window.c:874
-msgid "Add"
-msgstr "Add"
-
-#: ../src/main-window.c:878
-msgid "Update"
-msgstr "Update"
-
-#: ../src/main-window.c:883
-msgid "Remove"
-msgstr "Remove"
-
-#: ../src/main-window.c:897
+#: ../src/main-window.c:910
 msgid "<b>Slide Text</b>"
 msgstr "<b>Slide Text</b>"
 
-#: ../src/main-window.c:926 ../src/main-window.c:1562
-msgid "Click to expand the area"
-msgstr "Click to expand the area"
-
-#: ../src/main-window.c:943
+#: ../src/main-window.c:944
 msgid "Click to choose the font"
 msgstr "Click to choose the font"
 
-#: ../src/main-window.c:950
+#: ../src/main-window.c:951 ../src/support.c:1176
 msgid "Click to choose the font color"
 msgstr "Click to choose the font color"
 
-#: ../src/main-window.c:957
-msgid "Click to choose the font background color"
-msgstr "Click to choose the font background color"
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr "Text pattern:"
+
+#: ../src/main-window.c:984
+msgid "Click to choose the text pattern"
+msgstr "Click to choose the text pattern"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr "Top Border"
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr "Bottom Border"
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr "Border Width:"
+
+#: ../src/main-window.c:1018
+msgid "Click to choose the slide text borders color"
+msgstr "Click to choose the slide text borders color"
 
-#: ../src/main-window.c:961
+#: ../src/main-window.c:1023
 msgid "Animation:"
 msgstr "Animation:"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:1035
 msgid "Animation Speed:"
 msgstr "Animation Speed:"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:1061
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Slide Text Position</b>"
+
+#: ../src/main-window.c:1071
+msgid "Horizontal Position: "
+msgstr "Horizontal Position:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr "Center the text horizontally"
+
+#: ../src/main-window.c:1090
+msgid "Vertical Position: "
+msgstr "Vertical Position:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr "Center the text vertically"
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr "Angle"
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr "Reset the angle"
+
+#: ../src/main-window.c:1127
 msgid "Placing is relative to:"
 msgstr "Placing is relative to:"
 
-#: ../src/main-window.c:1003
+#: ../src/main-window.c:1140
 msgid "Exported video"
 msgstr "Exported video"
 
-#: ../src/main-window.c:1005
+#: ../src/main-window.c:1142
 msgid "Original image"
 msgstr "Original image"
 
-#: ../src/main-window.c:1014
-msgid "Subtitle position:"
-msgstr "Subtitle position:"
-
 #. Background music frame
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:1149
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/main-window.c:1068
+#: ../src/main-window.c:1162
 msgid "<b>Background Music</b>"
 msgstr "<b>Background Music</b>"
 
-#: ../src/main-window.c:1114
+#: ../src/main-window.c:1208
 msgid "Music Duration:"
 msgstr "Music Duration:"
 
-#: ../src/main-window.c:1138
+#: ../src/main-window.c:1232
 msgid "Delete the selected file"
 msgstr "Delete the selected file"
 
-#: ../src/main-window.c:1145
+#: ../src/main-window.c:1239
 msgid "Move the selected file up"
 msgstr "Move the selected file up"
 
-#: ../src/main-window.c:1152
+#: ../src/main-window.c:1246
 msgid "Move the selected file down"
 msgstr "Move the selected file down"
 
-#: ../src/main-window.c:1159
+#: ../src/main-window.c:1253
 msgid "Clear all files"
 msgstr "Clear all files"
 
 #. End of Background music frame
 #. Begin of Message tab
-#: ../src/main-window.c:1164
+#: ../src/main-window.c:1258
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/main-window.c:1557
-msgid "Click to shrink the area"
-msgstr "Click to shrink the area"
-
-#: ../src/main-window.c:1589 ../src/callbacks.c:1120
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
 msgid "Sorry, I could not perform the operation!"
 msgstr "Sorry, I could not perform the operation!"
 
-#: ../src/main-window.c:1738
+#: ../src/main-window.c:1825
 #, c-format
 msgid "File '%s' not found"
 msgstr "File '%s' not found"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Resolution"
 msgstr "Resolution"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Type"
 msgstr "Type"
 
 #. No animation function (id = 0)
-#: ../src/main-window.c:2062 ../src/main-window.c:2064 ../src/support.c:179
-#: ../src/subtitles.c:162
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
 msgid "None"
 msgstr "None"
 
-#: ../src/main-window.c:2605
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr "Please delete the pattern to choose the color"
+
+#: ../src/main-window.c:2718
 msgid "Slides Transitions Report Dialog"
 msgstr "Slides Transitions Report Dialog"
 
-#: ../src/main-window.c:2685
+#: ../src/main-window.c:2798
 msgid ""
 "\n"
 "<span weight='bold'>Note:</span>\n"
@@ -487,321 +546,346 @@
 "Slides whose transition is applied only once are not shown here.\n"
 "Click on the slide to have Imagination automatically select it."
 
-#: ../src/callbacks.c:124 ../src/callbacks.c:469 ../src/callbacks.c:1421
-#: ../src/callbacks.c:1499
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
 msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
 msgstr "You didn't save your slideshow yet. Are you sure you want to close it?"
 
-#: ../src/callbacks.c:210
+#: ../src/callbacks.c:220
 #, c-format
 msgid "Please wait, importing image %d out of %d"
 msgstr "Please wait, importing image %d out of %d"
 
-#: ../src/callbacks.c:279
+#: ../src/callbacks.c:289
 msgid "Import audio files, use CTRL key for multiple select"
 msgstr "Import audio files, use CTRL key for multiple select"
 
-#: ../src/callbacks.c:291
+#: ../src/callbacks.c:301
 msgid "All audio files"
 msgstr "All audio files"
 
-#: ../src/callbacks.c:300 ../src/callbacks.c:375 ../src/callbacks.c:1449
-#: ../src/support.c:370
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
 msgid "All files"
 msgstr "All files"
 
-#: ../src/callbacks.c:356
+#: ../src/callbacks.c:365
 msgid "Import images, use SHIFT key for multiple select"
 msgstr "Import images, use SHIFT key for multiple select"
 
-#: ../src/callbacks.c:369
+#: ../src/callbacks.c:378
 msgid "All image files"
 msgstr "All image files"
 
-#: ../src/callbacks.c:529
+#: ../src/callbacks.c:578
 #, c-format
 msgid "%d x %d pixels"
 msgid_plural "%d x %d pixels"
 msgstr0 "%d x %d pixels"
 msgstr1 "%d x %d pixels"
 
-#: ../src/callbacks.c:805
+#: ../src/callbacks.c:853
 msgid "translator-credits"
 msgstr "Giuseppe Torelli <colossus73@gmail.com>"
 
-#: ../src/callbacks.c:1372
+#: ../src/callbacks.c:1517
 msgid "Stops the preview"
 msgstr "Stops the preview"
 
-#: ../src/callbacks.c:1432
+#: ../src/callbacks.c:1580
 msgid "Load an Imagination slideshow project"
 msgstr "Load an Imagination slideshow project"
 
-#: ../src/callbacks.c:1433
+#: ../src/callbacks.c:1581
 msgid "Save an Imagination slideshow project"
 msgstr "Save an Imagination slideshow project"
 
-#: ../src/callbacks.c:1443
-msgid "Imagination projects"
-msgstr "Imagination projects"
+#: ../src/callbacks.c:1591
+msgid "Imagination projects (*.img)"
+msgstr "Imagination projects (*.img)"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr "Don't include folder names in the filenames"
 
-#: ../src/callbacks.c:2195
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+
+#: ../src/callbacks.c:2498
+msgid "Edit empty slide"
+msgstr "Edit empty slide"
+
+#: ../src/callbacks.c:2498
 msgid "Create empty slide"
 msgstr "Create empty slide"
 
-#: ../src/callbacks.c:2206
+#: ../src/callbacks.c:2509
 msgid "Empty slide options:"
 msgstr "Empty slide options:"
 
-#: ../src/callbacks.c:2216
-msgid "Use _solid color"
-msgstr "Use _solid colour"
+#: ../src/callbacks.c:2519
+msgid "_Solid color"
+msgstr "_Solid colour"
 
-#: ../src/callbacks.c:2222
-msgid "Use _linear gradient"
-msgstr "Use _linear gradient"
+#: ../src/callbacks.c:2525
+msgid "_Linear gradient"
+msgstr "_Linear gradient"
 
-#: ../src/callbacks.c:2228
-msgid "Use _radial gradient"
-msgstr "Use _radial gradient"
+#: ../src/callbacks.c:2531
+msgid "_Radial gradient"
+msgstr "_Radial gradient"
 
-#: ../src/callbacks.c:2258
-msgid "Preview"
-msgstr "Preview"
+#: ../src/callbacks.c:2537
+msgid "_Fade gradient"
+msgstr "_Fade gradient"
+
+#: ../src/callbacks.c:3253
+msgid "Please choose a PNG file"
+msgstr "Please choose a PNG file"
+
+#: ../src/callbacks.c:3267
+msgid "PNG files"
+msgstr "PNG files"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr "Delete current pattern"
 
 #. Display propert title depending on the callback that is calling this function.
-#: ../src/new_slideshow.c:65
+#: ../src/new_slideshow.c:66
 msgid "Project properties"
 msgstr "Project properties"
 
-#: ../src/new_slideshow.c:85
+#: ../src/new_slideshow.c:86
 msgid "<b>Slideshow Settings</b>"
 msgstr "<b>Slideshow Settings</b>"
 
-#: ../src/new_slideshow.c:130
-msgid "<b>Video Format</b>"
-msgstr "<b>Video Format</b>"
+#. Video Format
+#: ../src/new_slideshow.c:101
+msgid "Video Format:"
+msgstr "Video Format:"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "Video Size:"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr "Frames per Second (FPS):"
 
-#: ../src/new_slideshow.c:152 ../src/export.c:1337 ../src/export.c:1524
-#: ../src/export.c:1705
-msgid "<b>Video Size</b>"
-msgstr "<b>Video Size:</b>"
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+msgid "Television Format:"
+msgstr "Television Format:"
 
-#: ../src/new_slideshow.c:166
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../src/new_slideshow.c:171
 msgid "<b>Advanced Settings</b>"
 msgstr "<b>Advanced Settings</b>"
 
-#: ../src/new_slideshow.c:173
+#: ../src/new_slideshow.c:178
 msgid "Rescale images to fit desired aspect ratio"
 msgstr "Rescale images to fit desired aspect ratio"
 
-#: ../src/new_slideshow.c:179
-msgid "Select background color:"
-msgstr "Select background colour:"
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr "End slideshow with blank slide"
+
+#: ../src/new_slideshow.c:187
+msgid "Select blank slide color:"
+msgstr "Select blank slide color:"
 
-#: ../src/slideshow_project.c:213
+#: ../src/slideshow_project.c:265
 msgid "This is not an Imagination project file!"
 msgstr "This is not an Imagination project file!"
 
-#: ../src/slideshow_project.c:371
+#: ../src/slideshow_project.c:442
 #, c-format
 msgid "Slide %i: can't load image %s\n"
 msgstr "Slide %i: can't load image %s\n"
 
-#: ../src/slideshow_project.c:493
+#: ../src/slideshow_project.c:585
 #, c-format
 msgid "Can't load image %s\n"
 msgstr "Can't load image %s\n"
 
-#: ../src/support.c:130
+#: ../src/support.c:134
 #, c-format
 msgid "Welcome to Imagination - %d transition loaded."
 msgid_plural "Welcome to Imagination - %d transitions loaded."
 msgstr0 "Welcome to Imagination - %d transition loaded."
 msgstr1 "Welcome to Imagination - %d transitions loaded."
 
-#: ../src/support.c:141
+#: ../src/support.c:145
 #, c-format
 msgid "%d slide selected"
 msgid_plural "%d slides selected"
 msgstr0 "%d slide selected"
 msgstr1 "%d slides selected"
 
-#: ../src/support.c:152
+#: ../src/support.c:156
 #, c-format
 msgid "%d slide loaded %s"
 msgid_plural "%d slides loaded %s"
 msgstr0 "%d slide loaded %s"
 msgstr1 "%d slides loaded %s"
 
-#: ../src/support.c:156
+#: ../src/support.c:160
 msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 msgstr " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 
-#: ../src/support.c:322
+#: ../src/support.c:327
 msgid "Please choose the slideshow project filename"
 msgstr "Please choose the slideshow project filename"
 
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures and also switches mode into
-#. * preview if needed.
-#: ../src/support.c:337 ../src/export.c:1183
-msgid "VOB (DVD video)"
-msgstr "VOB (DVD video)"
-
-#: ../src/support.c:343
-msgid "MP4 (MPEG-4)"
-msgstr "MP4 (MPEG-4)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:349 ../src/export.c:1299
-msgid "OGV (Theora/Vorbis)"
-msgstr "OGV (Theora/Vorbis)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:355 ../src/export.c:1486
-msgid "FLV (Flash video)"
-msgstr "FLV (Flash video)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:361 ../src/export.c:1690
-msgid "3GP (Mobile Phones)"
-msgstr "3GP (Mobile Phones)"
-
-#: ../src/subtitles.c:166
+#: ../src/subtitles.c:243
 msgid "Fade"
 msgstr "Fade"
 
-#: ../src/subtitles.c:170
+#: ../src/subtitles.c:247
 msgid "Slide from left"
 msgstr "Slide from left"
 
-#: ../src/subtitles.c:174
+#: ../src/subtitles.c:251
 msgid "Slide from right"
 msgstr "Slide from right"
 
-#: ../src/subtitles.c:178
+#: ../src/subtitles.c:255
 msgid "Slide from top"
 msgstr "Slide from top"
 
-#: ../src/subtitles.c:182
+#: ../src/subtitles.c:259
 msgid "Slide from bottom"
 msgstr "Slide from bottom"
 
-#: ../src/subtitles.c:186
+#: ../src/subtitles.c:263
 msgid "Grow"
 msgstr "Grow"
 
-#: ../src/export.c:150
+#: ../src/subtitles.c:267
+msgid "Slide bottom to top"
+msgstr "Slide bottom to top"
+
+#: ../src/subtitles.c:271
+msgid "Slide right to left"
+msgstr "Slide right to left"
+
+#: ../src/export.c:144
 msgid "<b>Export Settings</b>"
 msgstr "<b>Export Settings</b>"
 
-#: ../src/export.c:164
+#: ../src/export.c:158
 msgid "Filename:"
 msgstr "Filename:"
 
-#: ../src/export.c:312
+#: ../src/export.c:306
 msgid "Exporting the slideshow"
 msgstr "Exporting the slideshow"
 
-#: ../src/export.c:323
+#: ../src/export.c:318
 msgid "Preparing for export ..."
 msgstr "Preparing for export ..."
 
-#: ../src/export.c:334
+#: ../src/export.c:329
 msgid "Overall progress:"
 msgstr "Overall progress:"
 
-#: ../src/export.c:424 ../src/export.c:807
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr "Elapsed time:"
+
+#: ../src/export.c:452 ../src/export.c:904
 #, c-format
 msgid "Slide %d export progress:"
 msgstr "Slide %d export progress:"
 
-#: ../src/export.c:661
+#: ../src/export.c:481
+msgid "Close"
+msgstr "Close"
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+"Elapsed time: %s\n"
+"\n"
+
+#: ../src/export.c:754
 msgid "Failed to launch the encoder!"
 msgstr "Failed to launch the encoder!"
 
-#: ../src/export.c:805
+#: ../src/export.c:902
 #, c-format
 msgid "Final transition export progress:"
 msgstr "Final transition export progress:"
 
-#: ../src/export.c:1195
-msgid "<b>Television Format</b>"
-msgstr "<b>Television Format</b>"
-
-#: ../src/export.c:1202 ../src/export.c:1326 ../src/export.c:1513
-msgid "Normal 4:3"
-msgstr "Normal 4:3"
-
-#: ../src/export.c:1207 ../src/export.c:1330 ../src/export.c:1517
-msgid "Widescreen 16:9"
-msgstr "Widescreen 16:9"
-
-#: ../src/export.c:1315 ../src/export.c:1502
-msgid "<b>Aspect Ratio</b>"
-msgstr "<b>Aspect Ratio</b>"
+#~ msgid "Border Bottom"
+#~ msgstr "Border Bottom"
 
-#: ../src/export.c:1373 ../src/export.c:1557
-msgid "<b>Video Quality:</b>"
-msgstr "<b>Video Quality:</b>"
-
-#: ../src/export.c:1380 ../src/export.c:1564
-msgid "Low"
-msgstr "Low"
+#~ msgid ""
+#~ "Click to choose the borders color. If the opacity value is set to 0, "
+#~ "Imagination will not render any border."
+#~ msgstr ""
+#~ "Click to choose the borders color. If the opacity value is set to 0, "
+#~ "Imagination will not render any border."
 
-#: ../src/export.c:1384 ../src/export.c:1568
-msgid "Medium"
-msgstr "Medium"
+#~ msgid "Click to expand the area"
+#~ msgstr "Click to expand the area"
 
-#~ msgid "Rotate the slide clockwise"
-#~ msgstr "Rotate the slide clockwise"
+#~ msgid "Click to shrink the area"
+#~ msgstr "Click to shrink the area"
 
-#~ msgid "Goto first slide"
-#~ msgstr "Goto first slide"
+#~ msgid "_Preview"
+#~ msgstr "_Preview"
 
-#~ msgid "Goto last slide"
-#~ msgstr "Goto last slide"
+#~ msgid "Preview quality"
+#~ msgstr "Preview quality"
 
-#~ msgid "Please choose the audio files to import"
-#~ msgstr "Please choose the audio files to import"
+#~ msgid "_Low"
+#~ msgstr "_Low"
 
-#~ msgid "VOB export"
-#~ msgstr "VOB Export"
+#~ msgid "High"
+#~ msgstr "High"
 
-#~ msgid "OGG export"
-#~ msgstr "OGG Export"
+#~ msgid "Add"
+#~ msgstr "Add"
 
-#~ msgid "FLV export"
-#~ msgstr "FLV Export"
+#~ msgid "Update"
+#~ msgstr "Update"
 
-#~ msgid "An error occurred while trying to rotate the slide:"
-#~ msgstr "An error occurred while trying to rotate the slide:"
+#~ msgid "Remove"
+#~ msgstr "Remove"
 
-#~ msgid "Slide Number:"
-#~ msgstr "Slide Number:"
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Click to choose the font background color"
 
-#~ msgid "Jump to the entered slide number"
-#~ msgstr "Jump to the entered slide number"
+#~ msgid "Aspect Ratio:"
+#~ msgstr "Aspect Ratio:"
 
-#~ msgid "Export the DVD slideshow"
-#~ msgstr "Export the DVD slideshow"
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Video Size:</b>"
 
-#~ msgid ""
-#~ "The length of the audio track is longer than the video one. Do you want "
-#~ "to continue?"
-#~ msgstr ""
-#~ "The lenght of the audio track is longer than the video one. Do you want "
-#~ "to continue?"
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (DVD video)"
 
-#~ msgid "Export the slideshow as:"
-#~ msgstr "Export the slideshow as:"
+#~ msgid "MP4 (MPEG-4)"
+#~ msgstr "MP4 (MPEG-4)"
 
-#~ msgid "Can't read file header!"
-#~ msgstr "Can't read file header!"
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
 
-#~ msgid "Import the audio files"
-#~ msgstr "Import the audio files"
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (Flash video)"

imagination-3.4.tar.bz2/po/es.po Added

@@ -0,0 +1,981 @@
+# English translations for imagination package.
+# Copyright (C) 2009 THE imagination'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the imagination package.
+# colossus73 <colossus73@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: imagination 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2011-06-11 20:46+0100\n"
+"Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
+"Language-Team: Spanish\n"
+"Language: Spanish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
+msgid "A DVD slideshow maker"
+msgstr "Creador de DVD slideshow"
+
+#: ../imagination.desktop.in.h:3
+msgid "A lightweight DVD slideshow maker using GTK+2"
+msgstr "Creador de DVD slideshow usando GTK+2"
+
+#: ../src/audio.c:108
+#, c-format
+msgid "Playing %s..."
+msgstr "Reproduciendo %s..."
+
+#: ../src/audio.c:136 ../src/main-window.c:1224
+msgid "Play the selected file"
+msgstr "Reproducir archivo seleccionado"
+
+#: ../src/audio.c:144
+msgid "Stop the playback"
+msgstr "Parar reproducción"
+
+#: ../src/audio.c:271
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate\n"
+msgstr ""
+"%s:\n"
+"incompatible 'sample rate'\n"
+
+#: ../src/audio.c:276
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible number of channels\n"
+msgstr ""
+"%s:\n"
+"incompatible número de canales\n"
+
+#: ../src/audio.c:282
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate and number of channels\n"
+msgstr ""
+"%s:\n"
+"incompatible 'sample rate' y número de canales\n"
+
+#: ../src/audio.c:302
+#, c-format
+msgid ""
+"%s\n"
+"<b>Do you want to continue without these files?</b>"
+msgstr ""
+"%s\n"
+"<b>¿quiere seguir sin estos archivos?</b>"
+
+#: ../src/audio.c:306 ../src/audio.c:453
+msgid "Audio files mismatch:"
+msgstr "Desajuste de archivos de audio:"
+
+#: ../src/audio.c:400
+msgid "Incompatible sample rate."
+msgstr "Incompatible sample rate."
+
+#: ../src/audio.c:407
+msgid "Incompatible number of channels."
+msgstr "Incompatible number of channels."
+
+#: ../src/audio.c:414
+msgid "Incompatible sample rate and number of channels."
+msgstr "Incompatible sample rate and number of channels."
+
+#: ../src/audio.c:436
+#, c-format
+msgid ""
+"File selection contains %d audio file that is incompatible with other files."
+msgid_plural ""
+"File selection contains %d audio files that are incompatible with other "
+"files."
+msgstr0 ""
+"File selection contains %d audio file that is incompatible with other files."
+msgstr1 ""
+"File selection contains %d audio files that are incompatible with other "
+"files."
+
+#: ../src/audio.c:442
+msgid "Please check audio tab for more information."
+msgstr "Please check audio tab for more information."
+
+#: ../src/main-window.c:218
+msgid "_Slideshow"
+msgstr "_Presentación"
+
+#: ../src/main-window.c:232
+msgid "Import slideshow"
+msgstr "Importar presentación"
+
+#: ../src/main-window.c:256
+msgid "Import p_ictures"
+msgstr "Importar imágenes"
+
+#: ../src/main-window.c:266
+msgid "Import _music"
+msgstr "Importar audio"
+
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Previo"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "Importar audio"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "Importar audio"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Contenidos"
+
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
+msgstr "Exportar"
+
+#. Slide menu
+#: ../src/main-window.c:330
+msgid "_Slide"
+msgstr "_Diapositiva"
+
+#. Zoom controls
+#: ../src/main-window.c:349
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../src/main-window.c:373
+msgid "Add empt_y slide"
+msgstr "Añadir presentación vacía"
+
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "Añadir presentación vacía"
+
+#: ../src/main-window.c:392
+msgid "Dele_te"
+msgstr "_Eliminar"
+
+#: ../src/main-window.c:400
+msgid "Repor_t"
+msgstr "Informe"
+
+#: ../src/main-window.c:412
+msgid "Rotate co_unter-clockwise"
+msgstr "Rotar sentido inverso reloj"
+
+#: ../src/main-window.c:423
+msgid "_Rotate clockwise"
+msgstr "_Rotar sentido horario reloj"
+
+#: ../src/main-window.c:435
+msgid "Un_select all"
+msgstr "_Deshacer"
+
+#. View menu
+#: ../src/main-window.c:441
+msgid "_View"
+msgstr "_Ver"
+
+#: ../src/main-window.c:447
+msgid "Preview mode"
+msgstr "Modo Vista Previa"
+
+#: ../src/main-window.c:453
+msgid "Overview mode"
+msgstr "Modo descriptivo"
+
+#: ../src/main-window.c:456
+msgid "Preview _frame rate"
+msgstr "Preview _frame rate"
+
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
+#, c-format
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr0 "%d cuadro por segundo"
+msgstr1 "%d cuadros por segundo"
+
+#. Help menu
+#: ../src/main-window.c:497
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: ../src/main-window.c:502
+msgid "Contents"
+msgstr "Contenidos"
+
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
+msgid "Create a new slideshow"
+msgstr "Crear presentación nueva"
+
+#: ../src/main-window.c:528
+msgid "Open a slideshow"
+msgstr "Abrir presentación"
+
+#: ../src/main-window.c:533
+msgid "Save the slideshow"
+msgstr "Guardar presentación"
+
+#: ../src/main-window.c:546
+msgid "Import pictures"
+msgstr "Importar imágenes"
+
+#: ../src/main-window.c:555
+msgid "Import music"
+msgstr "Importar audio"
+
+#: ../src/main-window.c:560
+msgid "Delete the selected slides"
+msgstr "Eliminar diapositivas seleccionadas"
+
+#: ../src/main-window.c:570
+msgid "Rotate the slide 90 degrees to the left"
+msgstr "Rotar diapositiva 90 grados a la izquierda"
+
+#: ../src/main-window.c:581
+msgid "Rotate the slide 90 degrees to the right"
+msgstr "Rotar diapositiva 90 grados a la derecha"
+
+#: ../src/main-window.c:587
+msgid "Zoom In"
+msgstr "Zoom dentro"
+
+#: ../src/main-window.c:592
+msgid "Zoom Out"
+msgstr "Zoom fuera"
+
+#: ../src/main-window.c:597
+msgid "Normal Size"
+msgstr "Tamaño Normal"
+
+#: ../src/main-window.c:602
+msgid "Fit Zoom in Window"
+msgstr "Fijar Zoom en Ventana"
+
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
+msgstr "Reproducir vista previa"
+
+#: ../src/main-window.c:619
+msgid "Go to the first slide of the slideshow"
+msgstr "Ir a la primera diapositiva"
+
+#: ../src/main-window.c:625
+msgid "Go to the previous slide of the slideshow"
+msgstr "Ir a la diapositiva anterior"
+
+#: ../src/main-window.c:641 ../src/main-window.c:847
+msgid " of "
+msgstr "de"
+
+#: ../src/main-window.c:653
+msgid "Go to the next slide of the slideshow"
+msgstr "Ir a la siguiente diapositiva"
+
+#: ../src/main-window.c:659
+msgid "Go to the last slide of the slideshow"
+msgstr "Ir a la última diapositiva"
+
+#: ../src/main-window.c:708
+msgid "Video"
+msgstr "Video"
+
+#: ../src/main-window.c:726
+msgid "<b>Slide Settings</b>"
+msgstr "<b>Ajustes de diapositiva</b>"
+
+#. Transition types label
+#: ../src/main-window.c:736
+msgid "Transition Type:"
+msgstr "Tipo de Transición:"
+
+#: ../src/main-window.c:756
+msgid "Random"
+msgstr "Aleatorio"
+
+#: ../src/main-window.c:757
+msgid "Imagination randomly decides which transition to apply"
+msgstr ""
+"Imagination decide aleatoriamente la tImagination decide aleatoriamente "
+"laImaginatio decide aleatoriamente la transición"
+
+#. Transition duration
+#: ../src/main-window.c:763
+msgid "Transition Speed:"
+msgstr "Velocidad de la Transición:"
+
+#: ../src/main-window.c:774
+msgid "Fast"
+msgstr "Rápido"
+
+#: ../src/main-window.c:776
+msgid "Normal"
+msgstr "Normal"
+
+#: ../src/main-window.c:778
+msgid "Slow"
+msgstr "Lento"
+
+#. Slide duration
+#: ../src/main-window.c:785
+msgid "Slide Duration in sec:"
+msgstr "Duración de diapositiva en sec:"
+
+#. Slide Total Duration
+#: ../src/main-window.c:797
+msgid "Slideshow Length:"
+msgstr "Longitud de Presentación:"
+
+#: ../src/main-window.c:814
+msgid "<b>Slide Motion</b>"
+msgstr "<b>Movimiento de diapositiva</b>"
+
+#: ../src/main-window.c:824
+msgid "Stop Point:"
+msgstr "Punto de parada:"
+
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Punto de parada:"
+
+#: ../src/main-window.c:869
+msgid "Duration:"
+msgstr "Duración:"
+
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Punto de parada:"
+
+#: ../src/main-window.c:891
+msgid "Zoom: "
+msgstr "Zoom: "
+
+#: ../src/main-window.c:910
+msgid "<b>Slide Text</b>"
+msgstr "<b>Texto en diapositiva</b>"
+
+#: ../src/main-window.c:944
+msgid "Click to choose the font"
+msgstr "Click para escoger  fuente"
+
+#: ../src/main-window.c:951 ../src/support.c:1176
+msgid "Click to choose the font color"
+msgstr "Click para escoger color de fuente"
+
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Click para escoger  fuente"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Click para escoger color de fuente"
+
+#: ../src/main-window.c:1023
+msgid "Animation:"
+msgstr "Animación:"
+
+#: ../src/main-window.c:1035
+msgid "Animation Speed:"
+msgstr "Velocidad de Animación:"
+
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Movimiento de diapositiva</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Posición de Subtítulo:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Posición de Subtítulo:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
+msgid "Placing is relative to:"
+msgstr "Situación es en relación a:"
+
+#: ../src/main-window.c:1140
+msgid "Exported video"
+msgstr "Video Exportado"
+
+#: ../src/main-window.c:1142
+msgid "Original image"
+msgstr "Original image"
+
+#. Background music frame
+#: ../src/main-window.c:1149
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/main-window.c:1162
+msgid "<b>Background Music</b>"
+msgstr "<b>Música de fondo</b>"
+
+#: ../src/main-window.c:1208
+msgid "Music Duration:"
+msgstr "Duración de Audio:"
+
+#: ../src/main-window.c:1232
+msgid "Delete the selected file"
+msgstr "Elimina archivo seleccionado"
+
+#: ../src/main-window.c:1239
+msgid "Move the selected file up"
+msgstr "Mueve archivo seleccionado hacia arriba"
+
+#: ../src/main-window.c:1246
+msgid "Move the selected file down"
+msgstr "Mueve archivo selleccionado hacia abajo"
+
+#: ../src/main-window.c:1253
+msgid "Clear all files"
+msgstr "Limpiar todos los archivos"
+
+#. End of Background music frame
+#. Begin of Message tab
+#: ../src/main-window.c:1258
+msgid "Messages"
+msgstr "Informes"
+
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
+msgid "Sorry, I could not perform the operation!"
+msgstr "Lo siento, no puedo ejecutar la acción"
+
+#: ../src/main-window.c:1825
+#, c-format
+msgid "File '%s' not found"
+msgstr "Archivo '%s' no encontrado"
+
+#: ../src/main-window.c:1834
+msgid "Resolution"
+msgstr "Resolución"
+
+#: ../src/main-window.c:1834
+msgid "Type"
+msgstr "Tipo"
+
+#. No animation function (id = 0)
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
+msgid "None"
+msgstr "Nada"
+
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
+msgid "Slides Transitions Report Dialog"
+msgstr "Diálogo de Informe sobre la Transición"
+
+#: ../src/main-window.c:2798
+msgid ""
+"\n"
+"<span weight='bold'>Note:</span>\n"
+"\n"
+"Slides whose transition is applied only once are not shown here.\n"
+"Click on the slide to have Imagination automatically select it."
+msgstr ""
+"\n"
+"<span weight='bold'>Nota:</span>\n"
+"\n"
+"Las diapositivas cuya transición es aplicada sólo una vez no son mostradas "
+"aquí.\n"
+"Click sobre la diapositiva para  seleccionarla automáticamente."
+
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
+msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
+msgstr "Usted no guardó su presenatción aún. ¿está seguro que quiere cerrarlo?"
+
+#: ../src/callbacks.c:220
+#, c-format
+msgid "Please wait, importing image %d out of %d"
+msgstr "Espere, por favor, importando imagen %d de %d"
+
+#: ../src/callbacks.c:289
+msgid "Import audio files, use CTRL key for multiple select"
+msgstr "Importar archivos de audio, usa CTRL para seleccionar varios"
+
+#: ../src/callbacks.c:301
+msgid "All audio files"
+msgstr "Todos los archivos de audio"
+
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
+msgid "All files"
+msgstr "Todos los archivos"
+
+#: ../src/callbacks.c:365
+msgid "Import images, use SHIFT key for multiple select"
+msgstr "Import images, use SHIFT key for multiple select"
+
+#: ../src/callbacks.c:378
+msgid "All image files"
+msgstr "Todos los archivos de imagen"
+
+#: ../src/callbacks.c:578
+#, c-format
+msgid "%d x %d pixels"
+msgid_plural "%d x %d pixels"
+msgstr0 "%d x %d pixels"
+msgstr1 "%d x %d pixels"
+
+#: ../src/callbacks.c:853
+msgid "translator-credits"
+msgstr "Giuseppe Torelli <colossus73@gmail.com>"
+
+#: ../src/callbacks.c:1517
+msgid "Stops the preview"
+msgstr "Parar vista previa"
+
+#: ../src/callbacks.c:1580
+msgid "Load an Imagination slideshow project"
+msgstr "Cargar un proyecto de presentación"
+
+#: ../src/callbacks.c:1581
+msgid "Save an Imagination slideshow project"
+msgstr "Guardar proyecto de presentación"
+
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "proyectos de Imagination (*.img)"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "Añadir presentación vacía"
+
+#: ../src/callbacks.c:2498
+msgid "Create empty slide"
+msgstr "Crear una diapositiva vacía"
+
+#: ../src/callbacks.c:2509
+msgid "Empty slide options:"
+msgstr "Opciones de diapositiva vacía:"
+
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
+msgstr "Usar color sólido"
+
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
+msgstr "Usar degradado linear"
+
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
+msgstr "Usar degradado radial"
+
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "Usar degradado radial"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "Please choose the audio files to import"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Todos los archivos"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
+
+#. Display propert title depending on the callback that is calling this function.
+#: ../src/new_slideshow.c:66
+msgid "Project properties"
+msgstr "Propiedades del Proyecto"
+
+#: ../src/new_slideshow.c:86
+msgid "<b>Slideshow Settings</b>"
+msgstr "<b>Ajustes de Presentación</b>"
+
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "Formato de Video:"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "Tamaño de Video:"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr "Cuadro por segundo:"
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Formato de Television</b>"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
+msgid "<b>Advanced Settings</b>"
+msgstr "<b>Ajustes Avanzados</b>"
+
+#: ../src/new_slideshow.c:178
+msgid "Rescale images to fit desired aspect ratio"
+msgstr "Reescalar imágenes para ajustar proporción"
+
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
+msgstr "Selecciona color de fondo:"
+
+#: ../src/slideshow_project.c:265
+msgid "This is not an Imagination project file!"
+msgstr "¡No es un proyecto de Imagination!"
+
+#: ../src/slideshow_project.c:442
+#, c-format
+msgid "Slide %i: can't load image %s\n"
+msgstr "Diapositiva %i: no se puede cargar imagen %s\n"
+
+#: ../src/slideshow_project.c:585
+#, c-format
+msgid "Can't load image %s\n"
+msgstr "No se puede cargar imagen %s\n"
+
+#: ../src/support.c:134
+#, c-format
+msgid "Welcome to Imagination - %d transition loaded."
+msgid_plural "Welcome to Imagination - %d transitions loaded."
+msgstr0 "Bienvenido a Imagination - %d transición cargada."
+msgstr1 "Bienvenido a Imagination - %d transiciones cargadas."
+
+#: ../src/support.c:145
+#, c-format
+msgid "%d slide selected"
+msgid_plural "%d slides selected"
+msgstr0 "%d diapositiva seleccionada"
+msgstr1 "%d diapositivas seleccionadas"
+
+#: ../src/support.c:156
+#, c-format
+msgid "%d slide loaded %s"
+msgid_plural "%d slides loaded %s"
+msgstr0 "%d diapositiva cargada %s"
+msgstr1 "%d diapositivas cargadas %s"
+
+#: ../src/support.c:160
+msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
+msgstr ""
+" - Usar  CTRL para seleccionar/no seleccionar  o SHIFT para múltiples "
+"selecciones."
+
+#: ../src/support.c:327
+msgid "Please choose the slideshow project filename"
+msgstr "Elige nombre para el proyecto"
+
+#: ../src/subtitles.c:243
+msgid "Fade"
+msgstr "Fundido"
+
+#: ../src/subtitles.c:247
+msgid "Slide from left"
+msgstr "Entrar desde la izquierda"
+
+#: ../src/subtitles.c:251
+msgid "Slide from right"
+msgstr "Entrar desde la derecha"
+
+#: ../src/subtitles.c:255
+msgid "Slide from top"
+msgstr "Entrar desde arriba"
+
+#: ../src/subtitles.c:259
+msgid "Slide from bottom"
+msgstr "Entrar desde abajo"
+
+#: ../src/subtitles.c:263
+msgid "Grow"
+msgstr "Crecer"
+
+#: ../src/subtitles.c:267
+#, fuzzy
+msgid "Slide bottom to top"
+msgstr "Entrar desde arriba"
+
+#: ../src/subtitles.c:271
+#, fuzzy
+msgid "Slide right to left"
+msgstr "Entrar desde la izquierda"
+
+#: ../src/export.c:144
+msgid "<b>Export Settings</b>"
+msgstr "<b>Configuración para Exportar</b>"
+
+#: ../src/export.c:158
+msgid "Filename:"
+msgstr "Archivo:"
+
+#: ../src/export.c:306
+msgid "Exporting the slideshow"
+msgstr "Exportar presentación"
+
+#: ../src/export.c:318
+msgid "Preparing for export ..."
+msgstr "Preparando para exportar ..."
+
+#: ../src/export.c:329
+msgid "Overall progress:"
+msgstr "Progreso general:"
+
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
+#, c-format
+msgid "Slide %d export progress:"
+msgstr "Diapositiva %d progreso exportar:"
+
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
+msgid "Failed to launch the encoder!"
+msgstr "¡Errar al lanzar el codificador!"
+
+#: ../src/export.c:902
+#, c-format
+msgid "Final transition export progress:"
+msgstr "Fin de transición:"
+
+#, fuzzy
+#~ msgid "Border Bottom"
+#~ msgstr "Entrar desde abajo"
+
+#~ msgid "Click to expand the area"
+#~ msgstr "Click para expandir area"
+
+#~ msgid "Click to shrink the area"
+#~ msgstr "Click para encoger el área"
+
+#~ msgid "_Preview"
+#~ msgstr "_Previo"
+
+#~ msgid "Preview quality"
+#~ msgstr "Previo calidad"
+
+#~ msgid "_Low"
+#~ msgstr "_Baja"
+
+#~ msgid "High"
+#~ msgstr "Alta"
+
+#~ msgid "Add"
+#~ msgstr "Añade"
+
+#~ msgid "Update"
+#~ msgstr "Actualiza"
+
+#~ msgid "Remove"
+#~ msgstr "Elimina"
+
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Click para escoger color de fondo de fuente"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "Proporción Aspecto:"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Calidad del Vídeo:</b>"
+
+#, fuzzy
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (DVD video)"
+
+#~ msgid "MP4 (MPEG-4)"
+#~ msgstr "MP4 (MPEG-4)"
+
+#, fuzzy
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#, fuzzy
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (Flash video)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (Teléfonos Móviles)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Normal 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Panorámico 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Calidad del Vídeo:</b>"
+
+#~ msgid "Low"
+#~ msgstr "Bajo"
+
+#~ msgid "Medium"
+#~ msgstr "Medio"
+
+#, fuzzy
+#~ msgid "low"
+#~ msgstr "Lento"
+
+#~ msgid "Rotate the slide clockwise"
+#~ msgstr "Rotate the slide clockwise"
+
+#~ msgid "Goto first slide"
+#~ msgstr "Goto first slide"
+
+#~ msgid "Goto last slide"
+#~ msgstr "Goto last slide"
+
+#~ msgid "VOB export"
+#~ msgstr "VOB Export"
+
+#~ msgid "OGG export"
+#~ msgstr "OGG Export"
+
+#~ msgid "FLV export"
+#~ msgstr "FLV Export"
+
+#~ msgid "An error occurred while trying to rotate the slide:"
+#~ msgstr "An error occurred while trying to rotate the slide:"
+
+#~ msgid "Slide Number:"
+#~ msgstr "Slide Number:"
+
+#~ msgid "Jump to the entered slide number"
+#~ msgstr "Jump to the entered slide number"
+
+#~ msgid "Export the DVD slideshow"
+#~ msgstr "Export the DVD slideshow"
+
+#~ msgid ""
+#~ "The length of the audio track is longer than the video one. Do you want "
+#~ "to continue?"
+#~ msgstr ""
+#~ "The lenght of the audio track is longer than the video one. Do you want "
+#~ "to continue?"
+
+#~ msgid "Export the slideshow as:"
+#~ msgstr "Export the slideshow as:"
+
+#~ msgid "Can't read file header!"
+#~ msgstr "Can't read file header!"
+
+#~ msgid "Import the audio files"
+#~ msgstr "Import the audio files"

imagination-3.0.tar.bz2/po/fr.po -> imagination-3.4.tar.bz2/po/fr.po Changed

@@ -3,57 +3,59 @@
 # This file is distributed under the same license as the imagination package.
 # Jean-Pierre Redonnet <redonnetbrouk@aol.com>, 2009.
 # Laurent Coudeur <laurentc@iol.ie>, 2009.
-# Robert Chéramy <robert@cheramy.net>, 2011.
-#
+# Philippe Bénézech <pengouin@laposte.net>, 2018
+# 
+
 msgid ""
 msgstr ""
-"Project-Id-Version: imagination 1.5\n"
+"Project-Id-Version: imagination 3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 20:10+0100\n"
-"PO-Revision-Date: 2011-02-13 23:20+0100\n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2018-12-11 15:01+0100\n"
 "Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
-"Language: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.2\n"
 
 #: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
 msgid "A DVD slideshow maker"
 msgstr "Un programme de création de présentation DVD"
 
-#: ../imagination.desktop.in.h:2
+#: ../imagination.desktop.in.h:3
 msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr "Un programme léger de création de présentation DVD qui utilise GTK+2"
 
-#: ../imagination.desktop.in.h:3
-msgid "Imagination"
-msgstr "Imagination"
-
-#: ../src/audio.c:109
+#: ../src/audio.c:108
 #, c-format
 msgid "Playing %s..."
 msgstr "Lecture de %s..."
 
-#: ../src/audio.c:137 ../src/main-window.c:1130
+#: ../src/audio.c:136 ../src/main-window.c:1224
 msgid "Play the selected file"
 msgstr "Lit le fichier sélectionné"
 
-#: ../src/audio.c:145
+#: ../src/audio.c:144
 msgid "Stop the playback"
 msgstr "Arrête la lecture"
 
-#: ../src/audio.c:272
+#: ../src/audio.c:271
 #, c-format
 msgid ""
 "%s:\n"
 "incompatible sample rate\n"
 msgstr ""
 "%s :\n"
-"taux d'échantillonnage non compatible\n"
+"taux d'échantillonnage incompatible\n"
 
-#: ../src/audio.c:277
+#: ../src/audio.c:276
 #, c-format
 msgid ""
 "%s:\n"
@@ -62,16 +64,16 @@
 "%s :\n"
 "nombre de canaux incompatible\n"
 
-#: ../src/audio.c:283
+#: ../src/audio.c:282
 #, c-format
 msgid ""
 "%s:\n"
 "incompatible sample rate and number of channels\n"
 msgstr ""
 "%s :\n"
-"Taux d'échantillonnage et nombre de canaux incompatibles\n"
+"taux d'échantillonnage et nombre de canaux incompatibles\n"
 
-#: ../src/audio.c:303
+#: ../src/audio.c:302
 #, c-format
 msgid ""
 "%s\n"
@@ -80,23 +82,23 @@
 "%s\n"
 "<b>Voulez vous continuer sans ces fichiers ?</b>"
 
-#: ../src/audio.c:307 ../src/audio.c:454
+#: ../src/audio.c:306 ../src/audio.c:453
 msgid "Audio files mismatch:"
-msgstr "Fichiers audio incompatibles :"
+msgstr "Fichiers audio non-concordants :"
 
-#: ../src/audio.c:401
+#: ../src/audio.c:400
 msgid "Incompatible sample rate."
-msgstr "Taux d'échantillonnage non compatible."
+msgstr "Taux d'échantillonnage incompatible."
 
-#: ../src/audio.c:408
+#: ../src/audio.c:407
 msgid "Incompatible number of channels."
 msgstr "Nombre de canaux incompatible."
 
-#: ../src/audio.c:415
+#: ../src/audio.c:414
 msgid "Incompatible sample rate and number of channels."
 msgstr "Taux d'échantillonnage et nombre de canaux incompatibles."
 
-#: ../src/audio.c:437
+#: ../src/audio.c:436
 #, c-format
 msgid ""
 "File selection contains %d audio file that is incompatible with other files."
@@ -104,60 +106,59 @@
 "File selection contains %d audio files that are incompatible with other "
 "files."
 msgstr0 ""
-"Les fichiers sélectionnés contiennent %d fichier audio incompatible avec les "
+"La sélection de fichiers contient %d fichier audio incompatible avec les "
 "autres."
 msgstr1 ""
-"Les fichiers sélectionnés contiennent %d fichiers audio incompatibles avec "
-"les autres."
+"La sélection de fichiers contient %d fichiers audio incompatibles avec les "
+"autres."
 
-#: ../src/audio.c:443
+#: ../src/audio.c:442
 msgid "Please check audio tab for more information."
-msgstr "Vérifiez l'onglet audio pour plus d'informations."
+msgstr "Vérifiez l'onglet Audio pour plus d'informations."
 
-#: ../src/main-window.c:222
+#: ../src/main-window.c:218
 msgid "_Slideshow"
 msgstr "_Présentation"
 
-#: ../src/main-window.c:236
+#: ../src/main-window.c:232
 msgid "Import slideshow"
 msgstr "Importer la présentation"
 
-#: ../src/main-window.c:260
+#: ../src/main-window.c:256
 msgid "Import p_ictures"
 msgstr "Importer des _images"
 
-#: ../src/main-window.c:270
+#: ../src/main-window.c:266
 msgid "Import _music"
 msgstr "Importer de la _musique"
 
-#: ../src/main-window.c:287
-msgid "_Preview"
-msgstr "A_perçu"
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Aperçu"
 
-#: ../src/main-window.c:295
-msgid "Export"
-msgstr "Exporter"
+#: ../src/main-window.c:291
+msgid "With music"
+msgstr "Avec la musique"
 
-#. Slide menu
-#: ../src/main-window.c:310
-msgid "_Slide"
-msgstr "Diapo_sitive"
+#: ../src/main-window.c:300
+msgid "Without music"
+msgstr "Sans la musique"
 
-#. Preview quality menu
-#: ../src/main-window.c:332
-msgid "Preview quality"
-msgstr "Qualité de la prévisualisation"
+#: ../src/main-window.c:307
+msgid "Continuos"
+msgstr "En continu"
 
-#: ../src/main-window.c:338
-msgid "_Low"
-msgstr "_Faible"
+#: ../src/main-window.c:314
+msgid "Ex_port"
+msgstr "Ex_porter"
 
-#: ../src/main-window.c:342 ../src/export.c:1389 ../src/export.c:1573
-msgid "High"
-msgstr "Élevée"
+#. Slide menu
+#: ../src/main-window.c:330
+msgid "_Slide"
+msgstr "Diapo_sitive"
 
 #. Zoom controls
-#: ../src/main-window.c:346
+#: ../src/main-window.c:349
 msgid "_Zoom"
 msgstr "_Zoom"
 
@@ -165,44 +166,52 @@
 msgid "Add empt_y slide"
 msgstr "A_jouter une diapositive vierge"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:379
+msgid "Edit _empty slide"
+msgstr "Modifi_er une diapositive vierge"
+
+#: ../src/main-window.c:392
 msgid "Dele_te"
 msgstr "_Supprimer"
 
-#: ../src/main-window.c:390
+#: ../src/main-window.c:400
 msgid "Repor_t"
-msgstr "Rappor_ter"
+msgstr "Rapport de transition"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:412
 msgid "Rotate co_unter-clockwise"
 msgstr "Rotatio_n sens anti-horaire"
 
-#: ../src/main-window.c:413
+#: ../src/main-window.c:423
 msgid "_Rotate clockwise"
 msgstr "_Rotation sens horaire"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:435
 msgid "Un_select all"
-msgstr "Désé_lectionne tout"
+msgstr "Tout désé_lectionner"
 
 #. View menu
-#: ../src/main-window.c:434
+#: ../src/main-window.c:441
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../src/main-window.c:440
+#: ../src/main-window.c:447
 msgid "Preview mode"
-msgstr "Mode de prévisualisation"
+msgstr "Mode aperçu"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:453
 msgid "Overview mode"
-msgstr "Vue d'ensemble"
+msgstr "Mode vue d'ensemble"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:456
 msgid "Preview _frame rate"
-msgstr "Images par seconde pour la prévisualisation"
+msgstr "Fréquence d'images en mode aperçu"
 
-#: ../src/main-window.c:469
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr "Plein écran"
+
+#: ../src/main-window.c:480
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
@@ -210,273 +219,325 @@
 msgstr1 "%d images par seconde"
 
 #. Help menu
-#: ../src/main-window.c:486
+#: ../src/main-window.c:497
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../src/main-window.c:491
+#: ../src/main-window.c:502
 msgid "Contents"
 msgstr "Contenu"
 
-#: ../src/main-window.c:512 ../src/new_slideshow.c:65
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
 msgid "Create a new slideshow"
 msgstr "Crée une nouvelle présentation"
 
-#: ../src/main-window.c:517
+#: ../src/main-window.c:528
 msgid "Open a slideshow"
 msgstr "Ouvre une présentation"
 
-#: ../src/main-window.c:522
+#: ../src/main-window.c:533
 msgid "Save the slideshow"
 msgstr "Sauvegarde la présentation"
 
-#: ../src/main-window.c:535
+#: ../src/main-window.c:546
 msgid "Import pictures"
-msgstr "Importe les photos"
+msgstr "Importe des photos"
 
-#: ../src/main-window.c:544
+#: ../src/main-window.c:555
 msgid "Import music"
-msgstr "Importe la musique"
+msgstr "Importe de la musique"
 
-#: ../src/main-window.c:549
+#: ../src/main-window.c:560
 msgid "Delete the selected slides"
-msgstr "Supprime les transparents sélectionnés "
+msgstr "Supprime les diapositives sélectionnées"
 
-#: ../src/main-window.c:559
+#: ../src/main-window.c:570
 msgid "Rotate the slide 90 degrees to the left"
-msgstr "Rotation de la diapositive dans le sens anti-horaire"
+msgstr "Tourne la diapositive dans le sens anti-horaire"
 
-#: ../src/main-window.c:570
+#: ../src/main-window.c:581
 msgid "Rotate the slide 90 degrees to the right"
-msgstr "Rotation de la diapositive dans le sens horaire"
+msgstr "Tourne la diapositive dans le sens horaire"
 
-#: ../src/main-window.c:576
+#: ../src/main-window.c:587
 msgid "Zoom In"
 msgstr "Zoom avant"
 
-#: ../src/main-window.c:581
+#: ../src/main-window.c:592
 msgid "Zoom Out"
 msgstr "Zoom arrière"
 
-#: ../src/main-window.c:586
+#: ../src/main-window.c:597
 msgid "Normal Size"
 msgstr "Taille normale"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:602
 msgid "Fit Zoom in Window"
-msgstr "Ajuster le zoom à la fenêtre"
+msgstr "Ajuste le zoom à la fenêtre"
 
-#: ../src/main-window.c:599 ../src/callbacks.c:1362
-msgid "Starts the preview"
-msgstr "Démarre la prévisualisation"
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+msgid "Starts the preview without music"
+msgstr "Démarre l'aperçu sans la musique"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:619
 msgid "Go to the first slide of the slideshow"
-msgstr "Aller à la première diapositive"
+msgstr "Va à la première diapositive"
 
-#: ../src/main-window.c:614
+#: ../src/main-window.c:625
 msgid "Go to the previous slide of the slideshow"
-msgstr "Aller à la diapositive précédente"
+msgstr "Va à la diapositive précédente"
 
-#: ../src/main-window.c:630 ../src/main-window.c:837
+#: ../src/main-window.c:641 ../src/main-window.c:847
 msgid " of "
 msgstr " de "
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:653
 msgid "Go to the next slide of the slideshow"
-msgstr "Aller à la diapositive suivante"
+msgstr "Va à la diapositive suivante"
 
-#: ../src/main-window.c:648
+#: ../src/main-window.c:659
 msgid "Go to the last slide of the slideshow"
-msgstr "Aller à la dernière diapositive"
+msgstr "Va à la dernière diapositive"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:708
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../src/main-window.c:717
+#: ../src/main-window.c:726
 msgid "<b>Slide Settings</b>"
 msgstr "<b>Paramètres de diapositives</b>"
 
 #. Transition types label
-#: ../src/main-window.c:727
+#: ../src/main-window.c:736
 msgid "Transition Type:"
 msgstr "Type de transition :"
 
-#: ../src/main-window.c:747
+#: ../src/main-window.c:756
 msgid "Random"
 msgstr "Aléatoire"
 
-#: ../src/main-window.c:748
+#: ../src/main-window.c:757
 msgid "Imagination randomly decides which transition to apply"
-msgstr "Imagination choisie une transition au hasard"
+msgstr "Imagination choisis au hasard la transition à appliquer"
 
 #. Transition duration
-#: ../src/main-window.c:754
+#: ../src/main-window.c:763
 msgid "Transition Speed:"
-msgstr "Vitesse de transition"
+msgstr "Vitesse de transition :"
 
-#: ../src/main-window.c:765
+#: ../src/main-window.c:774
 msgid "Fast"
 msgstr "Rapide"
 
-#: ../src/main-window.c:767
+#: ../src/main-window.c:776
 msgid "Normal"
 msgstr "Normale"
 
-#: ../src/main-window.c:769
+#: ../src/main-window.c:778
 msgid "Slow"
 msgstr "Lente"
 
 #. Slide duration
-#: ../src/main-window.c:776
+#: ../src/main-window.c:785
 msgid "Slide Duration in sec:"
 msgstr "Durée de la diapositive en sec. :"
 
 #. Slide Total Duration
-#: ../src/main-window.c:787
+#: ../src/main-window.c:797
 msgid "Slideshow Length:"
 msgstr "Durée de la présentation :"
 
-#: ../src/main-window.c:804
+#: ../src/main-window.c:814
 msgid "<b>Slide Motion</b>"
 msgstr "<b>Mouvement de la diapositive</b>"
 
-#: ../src/main-window.c:814
+#: ../src/main-window.c:824
 msgid "Stop Point:"
 msgstr "Point d'arrêt :"
 
-#: ../src/main-window.c:851
+#: ../src/main-window.c:865
+msgid "Add Stop point"
+msgstr "Ajouter un Point d'arrêt"
+
+#: ../src/main-window.c:869
 msgid "Duration:"
 msgstr "Durée :"
 
-#: ../src/main-window.c:860
-msgid "Zoom: "
-msgstr "Zoom :"
-
-#: ../src/main-window.c:874
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../src/main-window.c:878
-msgid "Update"
-msgstr "Mettre à jour"
+#: ../src/main-window.c:886
+msgid "Remove Stop point"
+msgstr "Supprimer le Point d'arrêt"
 
-#: ../src/main-window.c:883
-msgid "Remove"
-msgstr "Supprimer"
+#: ../src/main-window.c:891
+msgid "Zoom: "
+msgstr "Zoom : "
 
-#: ../src/main-window.c:897
+#: ../src/main-window.c:910
 msgid "<b>Slide Text</b>"
 msgstr "<b>Texte de la diapositive</b>"
 
-#: ../src/main-window.c:926 ../src/main-window.c:1562
-msgid "Click to expand the area"
-msgstr "Cliquer pour agrandir la zone"
-
-#: ../src/main-window.c:943
+#: ../src/main-window.c:944
 msgid "Click to choose the font"
 msgstr "Cliquer pour choisir la police de caractères"
 
-#: ../src/main-window.c:950
+#: ../src/main-window.c:951 ../src/support.c:1176
 msgid "Click to choose the font color"
 msgstr "Cliquer pour choisir la couleur des caractères"
 
-#: ../src/main-window.c:957
-msgid "Click to choose the font background color"
-msgstr "Cliquer pour choisir la couleur du contour des caractères"
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+"Cliquer pour choisir la couleur du contour des caractères. Si l'opacité est "
+"mise à 0, Imagination ne mettra aucun contour."
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+"Cliquer pour choisir la couleur de fond des caractères. Si l'opacité est "
+"mise à 0, Imagination ne mettra pas de couleur de fond."
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr "Motif du texte :"
+
+#: ../src/main-window.c:984
+msgid "Click to choose the text pattern"
+msgstr "Cliquer pour choisir le motif du texte"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr "Bordure du haut"
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr "Bordure inférieure"
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr "Largeur de la Bordure :"
+
+#: ../src/main-window.c:1018
+msgid "Click to choose the slide text borders color"
+msgstr "Cliquer pour choisir la couleur des bordures du texte"
 
-#: ../src/main-window.c:961
+#: ../src/main-window.c:1023
 msgid "Animation:"
 msgstr "Animation :"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:1035
 msgid "Animation Speed:"
 msgstr "Vitesse de l'animation :"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:1061
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Position du texte de la diapositive</b>"
+
+#: ../src/main-window.c:1071
+msgid "Horizontal Position: "
+msgstr "Position Horizontale : "
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr "Centre le texte horizontalement"
+
+#: ../src/main-window.c:1090
+msgid "Vertical Position: "
+msgstr "Position Verticale : "
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr "Centrer le texte verticalement"
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr "Angle : "
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr "Remise à zéro de l'angle"
+
+#: ../src/main-window.c:1127
 msgid "Placing is relative to:"
 msgstr "L'emplacement est relatif à :"
 
-#: ../src/main-window.c:1003
+#: ../src/main-window.c:1140
 msgid "Exported video"
 msgstr "Vidéo exportée"
 
-#: ../src/main-window.c:1005
+#: ../src/main-window.c:1142
 msgid "Original image"
 msgstr "Image originale"
 
-#: ../src/main-window.c:1014
-msgid "Subtitle position:"
-msgstr "Position du sous-titrage :"
-
 #. Background music frame
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:1149
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/main-window.c:1068
+#: ../src/main-window.c:1162
 msgid "<b>Background Music</b>"
 msgstr "<b>Musique de fond</b>"
 
-#: ../src/main-window.c:1114
+#: ../src/main-window.c:1208
 msgid "Music Duration:"
 msgstr "Durée de la musique :"
 
-#: ../src/main-window.c:1138
+#: ../src/main-window.c:1232
 msgid "Delete the selected file"
 msgstr "Supprime le fichier sélectionné"
 
-#: ../src/main-window.c:1145
+#: ../src/main-window.c:1239
 msgid "Move the selected file up"
-msgstr "Déplace le fichier sélectionné en haut"
+msgstr "Déplace le fichier sélectionné vers le haut"
 
-#: ../src/main-window.c:1152
+#: ../src/main-window.c:1246
 msgid "Move the selected file down"
-msgstr "Déplace le fichier sélectionné en bas"
+msgstr "Déplace le fichier sélectionné vers le bas"
 
-#: ../src/main-window.c:1159
+#: ../src/main-window.c:1253
 msgid "Clear all files"
 msgstr "Efface tous les fichiers"
 
 #. End of Background music frame
 #. Begin of Message tab
-#: ../src/main-window.c:1164
+#: ../src/main-window.c:1258
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/main-window.c:1557
-msgid "Click to shrink the area"
-msgstr "Cliquer pour réduire la zone"
-
-#: ../src/main-window.c:1589 ../src/callbacks.c:1120
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
 msgid "Sorry, I could not perform the operation!"
 msgstr "Désolé, je ne peux pas faire l'opération !"
 
-#: ../src/main-window.c:1738
+#: ../src/main-window.c:1825
 #, c-format
 msgid "File '%s' not found"
 msgstr "Fichier '%s' non trouvé"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Resolution"
 msgstr "Résolution"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Type"
 msgstr "Type"
 
 #. No animation function (id = 0)
-#: ../src/main-window.c:2062 ../src/main-window.c:2064 ../src/support.c:179
-#: ../src/subtitles.c:162
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/main-window.c:2605
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr "S'il vous plaît, supprimer le motif pour choisir la couleur"
+
+#: ../src/main-window.c:2718
 msgid "Slides Transitions Report Dialog"
-msgstr "Boîte de dialogue rapport de transition de diapositives"
+msgstr "Rapport de transition"
 
-#: ../src/main-window.c:2685
+#: ../src/main-window.c:2798
 msgid ""
 "\n"
 "<span weight='bold'>Note:</span>\n"
@@ -488,328 +549,318 @@
 "<span weight='bold'>Note :</span>\n"
 "\n"
 "Les diapositives dont la transition n'est appliquée qu'une fois ne sont pas "
-"prise en compte.\n"
+"prises en compte.\n"
 "Cliquez sur la diapositive pour qu'Imagination la sélectionne "
 "automatiquement."
 
 # there is a full stop coming from the source
-#: ../src/callbacks.c:124 ../src/callbacks.c:469 ../src/callbacks.c:1421
-#: ../src/callbacks.c:1499
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
 msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
 msgstr ""
-"Vous n'avez pas encore sauvegardé. Êtes-vous certain de vouloir fermer?"
+"Vous n'avez pas sauvegardé votre présentation. Êtes-vous certain de vouloir "
+"fermer?"
 
-#: ../src/callbacks.c:210
+#: ../src/callbacks.c:220
 #, c-format
 msgid "Please wait, importing image %d out of %d"
-msgstr "Attendez, importation la diapositive %d sur %d"
+msgstr "Attendez, importation de la diapositive %d sur %d"
 
-#: ../src/callbacks.c:279
+#: ../src/callbacks.c:289
 msgid "Import audio files, use CTRL key for multiple select"
-msgstr "Importe la musique, utilisez la touche Maj pour une sélection multiple"
+msgstr ""
+"Importe les fichiers audio, utilisez la touche CTRL pour une sélection "
+"multiple"
 
-#: ../src/callbacks.c:291
+#: ../src/callbacks.c:301
 msgid "All audio files"
 msgstr "Tous les fichiers audio"
 
-#: ../src/callbacks.c:300 ../src/callbacks.c:375 ../src/callbacks.c:1449
-#: ../src/support.c:370
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/callbacks.c:356
+#: ../src/callbacks.c:365
 msgid "Import images, use SHIFT key for multiple select"
-msgstr ""
-"Importe les diapositives, utilisez la touche Maj pour une sélection multiple"
+msgstr "Importe les images, utilisez la touche Maj pour une sélection multiple"
 
-#: ../src/callbacks.c:369
+#: ../src/callbacks.c:378
 msgid "All image files"
 msgstr "Tous les fichiers d'images"
 
-#: ../src/callbacks.c:529
+#: ../src/callbacks.c:578
 #, c-format
 msgid "%d x %d pixels"
 msgid_plural "%d x %d pixels"
 msgstr0 "%d x %d pixels"
 msgstr1 "%d x %d pixels"
 
-#: ../src/callbacks.c:805
+#: ../src/callbacks.c:853
 msgid "translator-credits"
-msgstr "Laurent Coudeur <laurentc@iol.ie>, 2009"
+msgstr ""
+"Philippe Bénézech <pengouin@laposte.net>, 2018\n"
+"Laurent Coudeur <laurentc@iol.ie>, 2009"
 
-#: ../src/callbacks.c:1372
+#: ../src/callbacks.c:1517
 msgid "Stops the preview"
-msgstr "Arrête la prévisulalisation"
+msgstr "Arrête l'aperçu"
 
-#: ../src/callbacks.c:1432
+#: ../src/callbacks.c:1580
 msgid "Load an Imagination slideshow project"
-msgstr "Charge un projet Imagination"
+msgstr "Charge un projet de présentation Imagination"
 
-#: ../src/callbacks.c:1433
+#: ../src/callbacks.c:1581
 msgid "Save an Imagination slideshow project"
-msgstr "Sauvegarde un projet Imagination"
+msgstr "Sauvegarde un projet de présentation Imagination"
 
-#: ../src/callbacks.c:1443
-msgid "Imagination projects"
-msgstr "Projets Imagination"
+#: ../src/callbacks.c:1591
+msgid "Imagination projects (*.img)"
+msgstr "Projets Imagination (*.img)"
 
-#: ../src/callbacks.c:2195
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr "Ne pas inclure les noms de dossier dans les noms de fichier"
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+"Si vous cochez ce bouton, soyez sûr d'inclure TOUS les fichiers du projet "
+"dans le MÈME dossier avant de tenter de l'ouvrir à nouveau."
+
+#: ../src/callbacks.c:2498
+msgid "Edit empty slide"
+msgstr "Modifier une diapositive vierge"
+
+#: ../src/callbacks.c:2498
 msgid "Create empty slide"
 msgstr "Crée une diapositive vide"
 
-#: ../src/callbacks.c:2206
+#: ../src/callbacks.c:2509
 msgid "Empty slide options:"
-msgstr "Supprime les options de la diapositive :"
+msgstr "Options de la diapositive vide :"
 
-#: ../src/callbacks.c:2216
-msgid "Use _solid color"
-msgstr "Utili_ser une couleur uniforme"
+#: ../src/callbacks.c:2519
+msgid "_Solid color"
+msgstr "Couleur _uniforme"
 
-#: ../src/callbacks.c:2222
-msgid "Use _linear gradient"
-msgstr "Utiliser un gradient _linéaire"
+#: ../src/callbacks.c:2525
+msgid "_Linear gradient"
+msgstr "Dégradé _linéaire"
 
-#: ../src/callbacks.c:2228
-msgid "Use _radial gradient"
-msgstr "Utiliser un gradient _radial"
+#: ../src/callbacks.c:2531
+msgid "_Radial gradient"
+msgstr "Dégradé _radial"
 
-#: ../src/callbacks.c:2258
-msgid "Preview"
-msgstr "Aperçu"
+#: ../src/callbacks.c:2537
+msgid "_Fade gradient"
+msgstr "_Fondu en dégradé"
+
+#: ../src/callbacks.c:3253
+msgid "Please choose a PNG file"
+msgstr "Choisissez un fichier PNG"
+
+#: ../src/callbacks.c:3267
+msgid "PNG files"
+msgstr "Fichiers PNG"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr "Supprime le motif actuel"
 
 #. Display propert title depending on the callback that is calling this function.
-#: ../src/new_slideshow.c:65
+#: ../src/new_slideshow.c:66
 msgid "Project properties"
 msgstr "Propriétés du projet"
 
-#: ../src/new_slideshow.c:85
+#: ../src/new_slideshow.c:86
 msgid "<b>Slideshow Settings</b>"
 msgstr "<b>Paramètres de la présentation</b>"
 
-#: ../src/new_slideshow.c:130
-msgid "<b>Video Format</b>"
-msgstr "<b>Format vidéo</b>"
+#. Video Format
+#: ../src/new_slideshow.c:101
+msgid "Video Format:"
+msgstr "Format Vidéo :"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "Taille de la Vidéo :"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr "Images par seconde (FPS):"
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+msgid "Television Format:"
+msgstr "Format Télévision :"
 
-#: ../src/new_slideshow.c:152 ../src/export.c:1337 ../src/export.c:1524
-#: ../src/export.c:1705
-msgid "<b>Video Size</b>"
-msgstr "<b>Taille de la vidéo</b>"
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr "Débit :"
 
-#: ../src/new_slideshow.c:166
+#: ../src/new_slideshow.c:171
 msgid "<b>Advanced Settings</b>"
 msgstr "<b>Paramètres avancés</b>"
 
-#: ../src/new_slideshow.c:173
+#: ../src/new_slideshow.c:178
 msgid "Rescale images to fit desired aspect ratio"
-msgstr "Redimensionne les images dans les proportions souhaitées"
+msgstr "Redimensionner les images dans les proportions souhaitées"
 
-#: ../src/new_slideshow.c:179
-msgid "Select background color:"
-msgstr "Sélectionnez la couleur de l'arrière plan :"
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr "Terminer la présentation par une diapositive vide"
 
-#: ../src/slideshow_project.c:213
+#: ../src/new_slideshow.c:187
+msgid "Select blank slide color:"
+msgstr "Couleur de l'arrière plan :"
+
+#: ../src/slideshow_project.c:265
 msgid "This is not an Imagination project file!"
 msgstr "Ce n'est pas un fichier de projet Imagination !"
 
-#: ../src/slideshow_project.c:371
+#: ../src/slideshow_project.c:442
 #, c-format
 msgid "Slide %i: can't load image %s\n"
 msgstr "Diapositive %i: ne peut lire l'image %s\n"
 
-#: ../src/slideshow_project.c:493
+#: ../src/slideshow_project.c:585
 #, c-format
 msgid "Can't load image %s\n"
-msgstr "Ne peut lire l'image %s\n"
+msgstr "Ne peut pas lire l'image %s\n"
 
-#: ../src/support.c:130
+#: ../src/support.c:134
 #, c-format
 msgid "Welcome to Imagination - %d transition loaded."
 msgid_plural "Welcome to Imagination - %d transitions loaded."
 msgstr0 "Bienvenue à Imagination - %d transition chargée."
 msgstr1 "Bienvenue à Imagination - %d transitions chargées."
 
-#: ../src/support.c:141
+#: ../src/support.c:145
 #, c-format
 msgid "%d slide selected"
 msgid_plural "%d slides selected"
-msgstr0 "%d diapositive selectionnée"
+msgstr0 "%d diapositive sélectionnée"
 msgstr1 "%d diapositives selectionnées"
 
-#: ../src/support.c:152
+#: ../src/support.c:156
 #, c-format
 msgid "%d slide loaded %s"
 msgid_plural "%d slides loaded %s"
 msgstr0 "%d diapositive importée %s"
 msgstr1 "%d diapositives importées %s"
 
-#: ../src/support.c:156
+#: ../src/support.c:160
 msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 msgstr ""
 " - Utilisez la touche CTRL pour sélectionner/désélectionner ou Maj pour une "
 "sélection multiple"
 
-#: ../src/support.c:322
+#: ../src/support.c:327
 msgid "Please choose the slideshow project filename"
 msgstr "Choisissez le nom de fichier de votre projet"
 
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures and also switches mode into
-#. * preview if needed.
-#: ../src/support.c:337 ../src/export.c:1183
-msgid "VOB (DVD video)"
-msgstr "VOB (DVD video)"
-
-#: ../src/support.c:343
-msgid "MP4 (MPEG-4)"
-msgstr "MP4 (MPEG-4)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:349 ../src/export.c:1299
-msgid "OGV (Theora/Vorbis)"
-msgstr "OGV (Theora/Vorbis)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:355 ../src/export.c:1486
-msgid "FLV (Flash video)"
-msgstr "FLV (Flash video)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:361 ../src/export.c:1690
-msgid "3GP (Mobile Phones)"
-msgstr "3GP (Mobile Phones)"
-
-#: ../src/subtitles.c:166
+#: ../src/subtitles.c:243
 msgid "Fade"
 msgstr "Fondu"
 
-#: ../src/subtitles.c:170
+#: ../src/subtitles.c:247
 msgid "Slide from left"
-msgstr "Glisser par la gauche"
+msgstr "Glisser depuis la gauche"
 
-#: ../src/subtitles.c:174
+#: ../src/subtitles.c:251
 msgid "Slide from right"
-msgstr "Glisser par la droite"
+msgstr "Glisser depuis la droite"
 
-#: ../src/subtitles.c:178
+#: ../src/subtitles.c:255
 msgid "Slide from top"
-msgstr "Glisser par le haut"
+msgstr "Glisser depuis le haut"
 
-#: ../src/subtitles.c:182
+#: ../src/subtitles.c:259
 msgid "Slide from bottom"
-msgstr "Glisser par le bas"
+msgstr "Glisser depuis le bas"
 
-#: ../src/subtitles.c:186
+#: ../src/subtitles.c:263
 msgid "Grow"
 msgstr "Grandir"
 
-#: ../src/export.c:150
+#: ../src/subtitles.c:267
+msgid "Slide bottom to top"
+msgstr "Glisser de bas en haut"
+
+#: ../src/subtitles.c:271
+msgid "Slide right to left"
+msgstr "Glisser de droite à gauche"
+
+#: ../src/export.c:144
 msgid "<b>Export Settings</b>"
 msgstr "<b>Paramètres d'exportation</b>"
 
-#: ../src/export.c:164
+#: ../src/export.c:158
 msgid "Filename:"
 msgstr "Nom du fichier:"
 
-#: ../src/export.c:312
+#: ../src/export.c:306
 msgid "Exporting the slideshow"
-msgstr "Présentation en cours d'exportation"
+msgstr "Exportation de la présentation"
 
-#: ../src/export.c:323
+#: ../src/export.c:318
 msgid "Preparing for export ..."
-msgstr "Préparation pour exporter..."
+msgstr "Préparation de l'exportation ..."
 
-#: ../src/export.c:334
+#: ../src/export.c:329
 msgid "Overall progress:"
 msgstr "Progression globale :"
 
-#: ../src/export.c:424 ../src/export.c:807
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr "Temps écoulé :"
+
+#: ../src/export.c:452 ../src/export.c:904
 #, c-format
 msgid "Slide %d export progress:"
-msgstr "Exportation du diapositive %d en progrès :"
+msgstr "Exportation de la diapositive %d en cours :"
 
-#: ../src/export.c:661
+#: ../src/export.c:481
+msgid "Close"
+msgstr "Fermeture"
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+"Temps écoulé :%s\n"
+"\n"
+
+#: ../src/export.c:754
 msgid "Failed to launch the encoder!"
 msgstr "Échec de démarrage de l'encodeur !"
 
-#: ../src/export.c:805
+#: ../src/export.c:902
 #, c-format
 msgid "Final transition export progress:"
-msgstr "Exportation du diapositive en progrès :"
-
-#: ../src/export.c:1195
-msgid "<b>Television Format</b>"
-msgstr "<b>Format télévision</b>"
-
-#: ../src/export.c:1202 ../src/export.c:1326 ../src/export.c:1513
-msgid "Normal 4:3"
-msgstr "Normal 4:3"
-
-#: ../src/export.c:1207 ../src/export.c:1330 ../src/export.c:1517
-msgid "Widescreen 16:9"
-msgstr "Écran large 16:9"
-
-#: ../src/export.c:1315 ../src/export.c:1502
-msgid "<b>Aspect Ratio</b>"
-msgstr "<b>rapport hauteur/largeur</b>"
-
-#: ../src/export.c:1373 ../src/export.c:1557
-msgid "<b>Video Quality:</b>"
-msgstr "<b>Qualité vidéo :</b>"
-
-#: ../src/export.c:1380 ../src/export.c:1564
-msgid "Low"
-msgstr "Basse"
+msgstr "Avancement de l'exportation de la transition finale :"
 
-#: ../src/export.c:1384 ../src/export.c:1568
-msgid "Medium"
-msgstr "Moyenne"
-
-#~ msgid "Rotate the slide clockwise"
-#~ msgstr "Rotation de la diapositive dans le sens horaire"
-
-#~ msgid "Goto first slide"
-#~ msgstr "Aller à la première diapositive"
-
-#~ msgid "Goto last slide"
-#~ msgstr "Aller à la dernière diapositive"
-
-#~ msgid "Please choose the audio files to import"
-#~ msgstr "Choisissez un fichier audio à importer"
-
-#~ msgid "VOB export"
-#~ msgstr "Exporte VOB"
-
-#~ msgid "OGG export"
-#~ msgstr "Exporte OGG"
-
-#~ msgid "FLV export"
-#~ msgstr "Export FLV"
-
-#~ msgid "An error occurred while trying to rotate the slide:"
-#~ msgstr "Une erreur s'est produite lors de la rotation de la diapositive :"
+#~ msgid "Border Bottom"
+#~ msgstr "Bordure du bas"
 
 #, fuzzy
-#~ msgid "Sorry,I could not perform the operation!"
-#~ msgstr "Désolé, Je ne peux pas faire l'opération!"
-
-#~ msgid "Slide Number:"
-#~ msgstr "Transparent numéro:"
-
-#~ msgid "Jump to the entered slide number"
-#~ msgstr "Saute au transparent indiqué"
-
-#~ msgid "Export the DVD slideshow"
-#~ msgstr "Exporte la présentation DVD"
-
 #~ msgid ""
-#~ "The length of the audio track is longer than the video one. Do you want "
-#~ "to continue?"
+#~ "Click to choose the borders color. If the opacity value is set to 0, "
+#~ "Imagination will not render any border."
 #~ msgstr ""
-#~ "La durée de la piste audio est supérieure à celle de la vidéo. Voulez-"
-#~ "vous poursuivre?"
+#~ "Cliquer pour choisir la couleur du contour des caractères. Si l'opacité "
+#~ "est mise à 0, Imagination ne mettra aucun contour."
+
+#~ msgid "Click to expand the area"
+#~ msgstr "Cliquer pour agrandir la zone"
 
-#~ msgid "Export the slideshow as:"
-#~ msgstr "Exporte la présentation comme:"
+#~ msgid "Click to shrink the area"
+#~ msgstr "Cliquer pour réduire la zone"

imagination-3.0.tar.bz2/po/it.po -> imagination-3.4.tar.bz2/po/it.po Changed

@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: imagination 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 20:10+0100\n"
-"PO-Revision-Date: 2011-02-19 15:07+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2011-06-11 20:47+0100\n"
+"Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
 "Language-Team: Italian\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -18,31 +18,31 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
 msgid "A DVD slideshow maker"
 msgstr "Un software per creare sequenze di fotografie per DVD"
 
-#: ../imagination.desktop.in.h:2
+#: ../imagination.desktop.in.h:3
 msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr "Un software per creare presentazioni per DVD che utilizza GTK+2"
 
-#: ../imagination.desktop.in.h:3
-msgid "Imagination"
-msgstr "Imagination"
-
-#: ../src/audio.c:109
+#: ../src/audio.c:108
 #, c-format
 msgid "Playing %s..."
 msgstr "Sto riproducendo %s..."
 
-#: ../src/audio.c:137 ../src/main-window.c:1130
+#: ../src/audio.c:136 ../src/main-window.c:1224
 msgid "Play the selected file"
 msgstr "Riproduce il file selezionato"
 
-#: ../src/audio.c:145
+#: ../src/audio.c:144
 msgid "Stop the playback"
 msgstr "Ferma la riproduzione"
 
-#: ../src/audio.c:272
+#: ../src/audio.c:271
 #, c-format
 msgid ""
 "%s:\n"
@@ -51,7 +51,7 @@
 "%s:\n"
 "Frequenza di campionamento incompatibile\n"
 
-#: ../src/audio.c:277
+#: ../src/audio.c:276
 #, c-format
 msgid ""
 "%s:\n"
@@ -60,7 +60,7 @@
 "%s:\n"
 "Numero di canali incompatibile\n"
 
-#: ../src/audio.c:283
+#: ../src/audio.c:282
 #, c-format
 msgid ""
 "%s:\n"
@@ -69,7 +69,7 @@
 "%s:\n"
 "Frequenza di campionamento e numero di canali non compatibile\n"
 
-#: ../src/audio.c:303
+#: ../src/audio.c:302
 #, c-format
 msgid ""
 "%s\n"
@@ -78,23 +78,23 @@
 "%s\n"
 "<b>Vuoi continuare senza questi file?</b>"
 
-#: ../src/audio.c:307 ../src/audio.c:454
+#: ../src/audio.c:306 ../src/audio.c:453
 msgid "Audio files mismatch:"
 msgstr "File audio incompatibili:"
 
-#: ../src/audio.c:401
+#: ../src/audio.c:400
 msgid "Incompatible sample rate."
 msgstr "Frequenza di campionamento incompatibile"
 
-#: ../src/audio.c:408
+#: ../src/audio.c:407
 msgid "Incompatible number of channels."
 msgstr "Numero di canali incompatibile"
 
-#: ../src/audio.c:415
+#: ../src/audio.c:414
 msgid "Incompatible sample rate and number of channels."
 msgstr "Frequenza di campionamento e numero di canali non compatibile"
 
-#: ../src/audio.c:437
+#: ../src/audio.c:436
 #, c-format
 msgid ""
 "File selection contains %d audio file that is incompatible with other files."
@@ -104,54 +104,57 @@
 msgstr0 "La selezione contiene %d file audio incompatibile con gli altri."
 msgstr1 "La selezione contiene %d file audio incompatibili con gli altri."
 
-#: ../src/audio.c:443
+#: ../src/audio.c:442
 msgid "Please check audio tab for more information."
 msgstr "Prego cliccare sul tab Audio per maggiori informazioni."
 
-#: ../src/main-window.c:222
+#: ../src/main-window.c:218
 msgid "_Slideshow"
 msgstr "_Presentazione"
 
-#: ../src/main-window.c:236
+#: ../src/main-window.c:232
 msgid "Import slideshow"
 msgstr "Importa la presentazione"
 
-#: ../src/main-window.c:260
+#: ../src/main-window.c:256
 msgid "Import p_ictures"
 msgstr "Importa le diapositive"
 
-#: ../src/main-window.c:270
+#: ../src/main-window.c:266
 msgid "Import _music"
 msgstr "I_mporta la musica"
 
-#: ../src/main-window.c:287
-msgid "_Preview"
-msgstr "_Anteprima"
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Anteprima"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "_Importa l'audio"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "_Importa l'audio"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Documentazione"
 
-#: ../src/main-window.c:295
-msgid "Export"
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
 msgstr "Esporta"
 
 #. Slide menu
-#: ../src/main-window.c:310
+#: ../src/main-window.c:330
 msgid "_Slide"
 msgstr "Diapositiva"
 
-#. Preview quality menu
-#: ../src/main-window.c:332
-msgid "Preview quality"
-msgstr "Qualità _Anteprima"
-
-#: ../src/main-window.c:338
-msgid "_Low"
-msgstr "Bassa"
-
-#: ../src/main-window.c:342 ../src/export.c:1389 ../src/export.c:1573
-msgid "High"
-msgstr "Alta"
-
 #. Zoom controls
-#: ../src/main-window.c:346
+#: ../src/main-window.c:349
 msgid "_Zoom"
 msgstr "_Zoom"
 
@@ -159,44 +162,53 @@
 msgid "Add empt_y slide"
 msgstr "Aggiungi diapositiva vuota"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "Aggiungi diapositiva vuota"
+
+#: ../src/main-window.c:392
 msgid "Dele_te"
 msgstr "Cancella"
 
-#: ../src/main-window.c:390
+#: ../src/main-window.c:400
 msgid "Repor_t"
 msgstr "Rappor_to"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:412
 msgid "Rotate co_unter-clockwise"
 msgstr "R_uota in senso antiorario"
 
-#: ../src/main-window.c:413
+#: ../src/main-window.c:423
 msgid "_Rotate clockwise"
 msgstr "_Ruota in senso orario"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:435
 msgid "Un_select all"
 msgstr "Deseleziona tutto"
 
 #. View menu
-#: ../src/main-window.c:434
+#: ../src/main-window.c:441
 msgid "_View"
 msgstr "_Vista"
 
-#: ../src/main-window.c:440
+#: ../src/main-window.c:447
 msgid "Preview mode"
 msgstr "Modo Anteprima"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:453
 msgid "Overview mode"
 msgstr "Modo veduta generale"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:456
 msgid "Preview _frame rate"
 msgstr "Anteprima frame rate"
 
-#: ../src/main-window.c:469
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
@@ -204,273 +216,329 @@
 msgstr1 "%d fotogrammi per secondo"
 
 #. Help menu
-#: ../src/main-window.c:486
+#: ../src/main-window.c:497
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/main-window.c:491
+#: ../src/main-window.c:502
 msgid "Contents"
 msgstr "Documentazione"
 
-#: ../src/main-window.c:512 ../src/new_slideshow.c:65
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
 msgid "Create a new slideshow"
 msgstr "Crea una nuova presentazione"
 
-#: ../src/main-window.c:517
+#: ../src/main-window.c:528
 msgid "Open a slideshow"
 msgstr "Apre una presentazione"
 
-#: ../src/main-window.c:522
+#: ../src/main-window.c:533
 msgid "Save the slideshow"
 msgstr "Salva la presentazione"
 
-#: ../src/main-window.c:535
+#: ../src/main-window.c:546
 msgid "Import pictures"
 msgstr "Importa le immagini"
 
-#: ../src/main-window.c:544
+#: ../src/main-window.c:555
 msgid "Import music"
 msgstr "_Importa l'audio"
 
-#: ../src/main-window.c:549
+#: ../src/main-window.c:560
 msgid "Delete the selected slides"
 msgstr "Cancella le diapositive selezionate"
 
-#: ../src/main-window.c:559
+#: ../src/main-window.c:570
 msgid "Rotate the slide 90 degrees to the left"
 msgstr "Ruota la diapositiva in senso antiorario"
 
-#: ../src/main-window.c:570
+#: ../src/main-window.c:581
 msgid "Rotate the slide 90 degrees to the right"
 msgstr "Ruota la diapositiva in senso orario"
 
-#: ../src/main-window.c:576
+#: ../src/main-window.c:587
 msgid "Zoom In"
 msgstr "Zoom In"
 
-#: ../src/main-window.c:581
+#: ../src/main-window.c:592
 msgid "Zoom Out"
 msgstr "Zoom Out"
 
-#: ../src/main-window.c:586
+#: ../src/main-window.c:597
 msgid "Normal Size"
 msgstr "Dimensioni normali"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:602
 msgid "Fit Zoom in Window"
 msgstr "Adatta lo zoom nella finestra"
 
-#: ../src/main-window.c:599 ../src/callbacks.c:1362
-msgid "Starts the preview"
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
 msgstr "Avvia l'anteprima"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:619
 msgid "Go to the first slide of the slideshow"
 msgstr "Vai alla prima diapositiva della presentazione"
 
-#: ../src/main-window.c:614
+#: ../src/main-window.c:625
 msgid "Go to the previous slide of the slideshow"
 msgstr "Vai alla precedente diapositiva della presentazione"
 
-#: ../src/main-window.c:630 ../src/main-window.c:837
+#: ../src/main-window.c:641 ../src/main-window.c:847
 msgid " of "
 msgstr " di "
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:653
 msgid "Go to the next slide of the slideshow"
 msgstr "Vai alla prossima diapositiva della presentazione"
 
-#: ../src/main-window.c:648
+#: ../src/main-window.c:659
 msgid "Go to the last slide of the slideshow"
 msgstr "Vai all'ultima diapositiva della presentazione"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:708
 msgid "Video"
 msgstr "Video"
 
-#: ../src/main-window.c:717
+#: ../src/main-window.c:726
 msgid "<b>Slide Settings</b>"
 msgstr "<b>Impostazioni diapositiva</b>"
 
 #. Transition types label
-#: ../src/main-window.c:727
+#: ../src/main-window.c:736
 msgid "Transition Type:"
 msgstr "Tipo di transizione"
 
-#: ../src/main-window.c:747
+#: ../src/main-window.c:756
 msgid "Random"
 msgstr "Casuale"
 
-#: ../src/main-window.c:748
+#: ../src/main-window.c:757
 msgid "Imagination randomly decides which transition to apply"
 msgstr "Imagination decide casualmente quale transizione applicare"
 
 #. Transition duration
-#: ../src/main-window.c:754
+#: ../src/main-window.c:763
 msgid "Transition Speed:"
 msgstr "Velocità transizione:"
 
-#: ../src/main-window.c:765
+#: ../src/main-window.c:774
 msgid "Fast"
 msgstr "Veloce"
 
-#: ../src/main-window.c:767
+#: ../src/main-window.c:776
 msgid "Normal"
 msgstr "Normale"
 
-#: ../src/main-window.c:769
+#: ../src/main-window.c:778
 msgid "Slow"
 msgstr "Lenta"
 
 #. Slide duration
-#: ../src/main-window.c:776
+#: ../src/main-window.c:785
 msgid "Slide Duration in sec:"
 msgstr "Durata diapositiva in sec:"
 
 #. Slide Total Duration
-#: ../src/main-window.c:787
+#: ../src/main-window.c:797
 msgid "Slideshow Length:"
 msgstr "Lunghezza presentazione"
 
-#: ../src/main-window.c:804
+#: ../src/main-window.c:814
 msgid "<b>Slide Motion</b>"
 msgstr "<b>Movimento nella diapositiva</b>"
 
-#: ../src/main-window.c:814
+#: ../src/main-window.c:824
 msgid "Stop Point:"
 msgstr "Punto di arresto:"
 
-#: ../src/main-window.c:851
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Punto di arresto:"
+
+#: ../src/main-window.c:869
 msgid "Duration:"
 msgstr "Durata:"
 
-#: ../src/main-window.c:860
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Punto di arresto:"
+
+#: ../src/main-window.c:891
 msgid "Zoom: "
 msgstr "Zoom:"
 
-#: ../src/main-window.c:874
-msgid "Add"
-msgstr "Aggiungi"
-
-#: ../src/main-window.c:878
-msgid "Update"
-msgstr "Aggiorna"
-
-#: ../src/main-window.c:883
-msgid "Remove"
-msgstr "Cancella"
-
-#: ../src/main-window.c:897
+#: ../src/main-window.c:910
 msgid "<b>Slide Text</b>"
 msgstr "<b>Testo nella diapositiva</b>"
 
-#: ../src/main-window.c:926 ../src/main-window.c:1562
-msgid "Click to expand the area"
-msgstr "Clicca per espandere l'area"
-
-#: ../src/main-window.c:943
+#: ../src/main-window.c:944
 msgid "Click to choose the font"
 msgstr "Clicca per scegliere il carattere"
 
-#: ../src/main-window.c:950
+#: ../src/main-window.c:951 ../src/support.c:1176
 msgid "Click to choose the font color"
 msgstr "Clicca per scegliere il colore del carattere"
 
-#: ../src/main-window.c:957
-msgid "Click to choose the font background color"
-msgstr "Clicca per scegliere il colore dello sfondo del carattere"
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Clicca per scegliere il carattere"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Clicca per scegliere il colore del carattere"
 
-#: ../src/main-window.c:961
+#: ../src/main-window.c:1023
 msgid "Animation:"
 msgstr "Animazione:"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:1035
 msgid "Animation Speed:"
 msgstr "Velocità animazione:"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Movimento nella diapositiva</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Posizione sottotitolo:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Posizione sottotitolo:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
 msgid "Placing is relative to:"
 msgstr "Piazzamento è relativo a:"
 
-#: ../src/main-window.c:1003
+#: ../src/main-window.c:1140
 msgid "Exported video"
 msgstr "Video esportato"
 
-#: ../src/main-window.c:1005
+#: ../src/main-window.c:1142
 msgid "Original image"
 msgstr "Immagine originale"
 
-#: ../src/main-window.c:1014
-msgid "Subtitle position:"
-msgstr "Posizione sottotitolo:"
-
 #. Background music frame
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:1149
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/main-window.c:1068
+#: ../src/main-window.c:1162
 msgid "<b>Background Music</b>"
 msgstr "<b>Musica di sottofondo</b>"
 
-#: ../src/main-window.c:1114
+#: ../src/main-window.c:1208
 msgid "Music Duration:"
 msgstr "Durate della musica:"
 
-#: ../src/main-window.c:1138
+#: ../src/main-window.c:1232
 msgid "Delete the selected file"
 msgstr "Cancella il file selezionato"
 
-#: ../src/main-window.c:1145
+#: ../src/main-window.c:1239
 msgid "Move the selected file up"
 msgstr "Sposta sopra il file selezionato"
 
-#: ../src/main-window.c:1152
+#: ../src/main-window.c:1246
 msgid "Move the selected file down"
 msgstr "Sposta sotto il file selezionato"
 
-#: ../src/main-window.c:1159
+#: ../src/main-window.c:1253
 msgid "Clear all files"
 msgstr "Cancella tutti i file"
 
 #. End of Background music frame
 #. Begin of Message tab
-#: ../src/main-window.c:1164
+#: ../src/main-window.c:1258
 msgid "Messages"
 msgstr "Messaggi"
 
-#: ../src/main-window.c:1557
-msgid "Click to shrink the area"
-msgstr "Clicca per restringere l'area"
-
-#: ../src/main-window.c:1589 ../src/callbacks.c:1120
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
 msgid "Sorry, I could not perform the operation!"
 msgstr "Spiacente, non è stato possibile completare l'operazione"
 
-#: ../src/main-window.c:1738
+#: ../src/main-window.c:1825
 #, c-format
 msgid "File '%s' not found"
 msgstr "File '%s' non trovato"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Type"
 msgstr "Tipo"
 
 #. No animation function (id = 0)
-#: ../src/main-window.c:2062 ../src/main-window.c:2064 ../src/support.c:179
-#: ../src/subtitles.c:162
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
 msgid "None"
 msgstr "Nessuna"
 
-#: ../src/main-window.c:2605
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
 msgid "Slides Transitions Report Dialog"
 msgstr "Rapporto delle transizioni delle diapositive"
 
-#: ../src/main-window.c:2685
+#: ../src/main-window.c:2798
 msgid ""
 "\n"
 "<span weight='bold'>Note:</span>\n"
@@ -486,278 +554,382 @@
 "Clicca sulla diapositiva per far sì che Imagination la selezioni "
 "automaticamente."
 
-#: ../src/callbacks.c:124 ../src/callbacks.c:469 ../src/callbacks.c:1421
-#: ../src/callbacks.c:1499
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
 msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
 msgstr ""
 "La presentazione non è stata ancora salvata, sei sicuro di volerla chiudere?"
 
-#: ../src/callbacks.c:210
+#: ../src/callbacks.c:220
 #, c-format
 msgid "Please wait, importing image %d out of %d"
 msgstr "Attendere prego, sto importando la diapositiva %d su %d"
 
-#: ../src/callbacks.c:279
+#: ../src/callbacks.c:289
 msgid "Import audio files, use CTRL key for multiple select"
 msgstr "Importazione audio, usa MAIUSC per la selezione multipla"
 
-#: ../src/callbacks.c:291
+#: ../src/callbacks.c:301
 msgid "All audio files"
 msgstr "Tutti i file audio"
 
-#: ../src/callbacks.c:300 ../src/callbacks.c:375 ../src/callbacks.c:1449
-#: ../src/support.c:370
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/callbacks.c:356
+#: ../src/callbacks.c:365
 msgid "Import images, use SHIFT key for multiple select"
 msgstr "Importazione immagini, usa MAIUSC per la selezione multipla"
 
-#: ../src/callbacks.c:369
+#: ../src/callbacks.c:378
 msgid "All image files"
 msgstr "Tutti i file immagine"
 
-#: ../src/callbacks.c:529
+#: ../src/callbacks.c:578
 #, c-format
 msgid "%d x %d pixels"
 msgid_plural "%d x %d pixels"
 msgstr0 "%d x %d pixel"
 msgstr1 "%d x %d pixel"
 
-#: ../src/callbacks.c:805
+#: ../src/callbacks.c:853
 msgid "translator-credits"
 msgstr "Giuseppe Torelli <colossus73@gmail.com>"
 
-#: ../src/callbacks.c:1372
+#: ../src/callbacks.c:1517
 msgid "Stops the preview"
 msgstr "Ferma l'anteprima"
 
-#: ../src/callbacks.c:1432
+#: ../src/callbacks.c:1580
 msgid "Load an Imagination slideshow project"
 msgstr "Carica una presentazione di Imagination"
 
-#: ../src/callbacks.c:1433
+#: ../src/callbacks.c:1581
 msgid "Save an Imagination slideshow project"
 msgstr "Salva una presentazione di Imagination"
 
-#: ../src/callbacks.c:1443
-msgid "Imagination projects"
-msgstr "Progetti di Imagination"
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Progetti di Imagination (*.img)"
 
-#: ../src/callbacks.c:2195
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "Aggiungi diapositiva vuota"
+
+#: ../src/callbacks.c:2498
 msgid "Create empty slide"
 msgstr "Crea una diapositiva vuota"
 
-#: ../src/callbacks.c:2206
+#: ../src/callbacks.c:2509
 msgid "Empty slide options:"
 msgstr "Opzioni per la diapositiva vuota:"
 
-#: ../src/callbacks.c:2216
-msgid "Use _solid color"
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
 msgstr "U_sa un colore pieno"
 
-#: ../src/callbacks.c:2222
-msgid "Use _linear gradient"
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
 msgstr "Usa un gradiente _lineare"
 
-#: ../src/callbacks.c:2228
-msgid "Use _radial gradient"
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
 msgstr "Usa un gradiente _radiale"
 
-#: ../src/callbacks.c:2258
-msgid "Preview"
-msgstr "Anteprima"
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "Usa un gradiente _radiale"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "Prego scegliere il nome dei file audio da importare"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Tutti i file"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
 
 #. Display propert title depending on the callback that is calling this function.
-#: ../src/new_slideshow.c:65
+#: ../src/new_slideshow.c:66
 msgid "Project properties"
 msgstr "Proprietà della presentazione"
 
-#: ../src/new_slideshow.c:85
+#: ../src/new_slideshow.c:86
 msgid "<b>Slideshow Settings</b>"
 msgstr "<b>Impostazioni Presentazione</b>"
 
-#: ../src/new_slideshow.c:130
-msgid "<b>Video Format</b>"
-msgstr "<b>Formato del video</b>"
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "Formato del video:"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "Dimensioni del video:"
 
-#: ../src/new_slideshow.c:152 ../src/export.c:1337 ../src/export.c:1524
-#: ../src/export.c:1705
-msgid "<b>Video Size</b>"
-msgstr "<b>Dimensioni del video</b>"
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr "Fotogramma per secondo:"
 
-#: ../src/new_slideshow.c:166
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Formato del televisore</b>"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
 msgid "<b>Advanced Settings</b>"
 msgstr "<b>Impostazioni avanzate</b>"
 
-#: ../src/new_slideshow.c:173
+#: ../src/new_slideshow.c:178
 msgid "Rescale images to fit desired aspect ratio"
 msgstr "Ridimensiona le immagini per riempire lo schermo"
 
-#: ../src/new_slideshow.c:179
-msgid "Select background color:"
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
 msgstr "Seleziona il colore di sfondo:"
 
-#: ../src/slideshow_project.c:213
+#: ../src/slideshow_project.c:265
 msgid "This is not an Imagination project file!"
 msgstr "Questa non è un presentazione di Imagination!"
 
-#: ../src/slideshow_project.c:371
+#: ../src/slideshow_project.c:442
 #, c-format
 msgid "Slide %i: can't load image %s\n"
 msgstr "Diapositiva %i: non riesco a caricare l'immagine %s\n"
 
-#: ../src/slideshow_project.c:493
+#: ../src/slideshow_project.c:585
 #, c-format
 msgid "Can't load image %s\n"
 msgstr "Non riesco a caricare l'immagine %s\n"
 
-#: ../src/support.c:130
+#: ../src/support.c:134
 #, c-format
 msgid "Welcome to Imagination - %d transition loaded."
 msgid_plural "Welcome to Imagination - %d transitions loaded."
 msgstr0 "Benvenuto in Imagination - %d transizioni caricate."
 msgstr1 "Benvenuto in Imagination - %d transizioni caricate."
 
-#: ../src/support.c:141
+#: ../src/support.c:145
 #, c-format
 msgid "%d slide selected"
 msgid_plural "%d slides selected"
 msgstr0 "%d diapositiva selezionate"
 msgstr1 "%d diapositive selezionate"
 
-#: ../src/support.c:152
+#: ../src/support.c:156
 #, c-format
 msgid "%d slide loaded %s"
 msgid_plural "%d slides loaded %s"
 msgstr0 "%d diapositiva importata %s"
 msgstr1 "%d diapositive importate %s"
 
-#: ../src/support.c:156
+#: ../src/support.c:160
 msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 msgstr ""
 " - Usa il tasto CTRL per selezionare/deselezionare o MAIUSC per la selezione "
 "multipla"
 
-#: ../src/support.c:322
+#: ../src/support.c:327
 msgid "Please choose the slideshow project filename"
 msgstr "Prego scegliere il nome del file della presentazione"
 
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures and also switches mode into
-#. * preview if needed.
-#: ../src/support.c:337 ../src/export.c:1183
-msgid "VOB (DVD video)"
-msgstr "VOB (DVD video)"
-
-#: ../src/support.c:343
-msgid "MP4 (MPEG-4)"
-msgstr "MP4 (MPEG-4)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:349 ../src/export.c:1299
-msgid "OGV (Theora/Vorbis)"
-msgstr "OGV (Theora/Vorbis)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:355 ../src/export.c:1486
-msgid "FLV (Flash video)"
-msgstr "FLV (Flash Video)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:361 ../src/export.c:1690
-msgid "3GP (Mobile Phones)"
-msgstr "3GP (Mobile Phones)"
-
-#: ../src/subtitles.c:166
+#: ../src/subtitles.c:243
 msgid "Fade"
 msgstr "Dissolvenza"
 
-#: ../src/subtitles.c:170
+#: ../src/subtitles.c:247
 msgid "Slide from left"
 msgstr "Diapositiva da sinistra"
 
-#: ../src/subtitles.c:174
+#: ../src/subtitles.c:251
 msgid "Slide from right"
 msgstr "Diapositiva da destra"
 
-#: ../src/subtitles.c:178
+#: ../src/subtitles.c:255
 msgid "Slide from top"
 msgstr "Diapositiva dall'alto"
 
-#: ../src/subtitles.c:182
+#: ../src/subtitles.c:259
 msgid "Slide from bottom"
 msgstr "Diapositiva dal basso"
 
-#: ../src/subtitles.c:186
+#: ../src/subtitles.c:263
 msgid "Grow"
 msgstr "Ingrandisci"
 
-#: ../src/export.c:150
+#: ../src/subtitles.c:267
+#, fuzzy
+msgid "Slide bottom to top"
+msgstr "Diapositiva dall'alto"
+
+#: ../src/subtitles.c:271
+#, fuzzy
+msgid "Slide right to left"
+msgstr "Diapositiva da sinistra"
+
+#: ../src/export.c:144
 msgid "<b>Export Settings</b>"
 msgstr "<b>Impostazioni Esportazione</b>"
 
-#: ../src/export.c:164
+#: ../src/export.c:158
 msgid "Filename:"
 msgstr "Nome del file:"
 
-#: ../src/export.c:312
+#: ../src/export.c:306
 msgid "Exporting the slideshow"
 msgstr "Esporta la presentazione"
 
-#: ../src/export.c:323
+#: ../src/export.c:318
 msgid "Preparing for export ..."
 msgstr "Preparazione esportazione..."
 
-#: ../src/export.c:334
+#: ../src/export.c:329
 msgid "Overall progress:"
 msgstr "Progresso complessivo:"
 
-#: ../src/export.c:424 ../src/export.c:807
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
 #, c-format
 msgid "Slide %d export progress:"
 msgstr "Progresso esportazione diapositiva %d"
 
-#: ../src/export.c:661
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
 msgid "Failed to launch the encoder!"
 msgstr "Non è stato possibile mandare in esecuzione l'encoder!"
 
-#: ../src/export.c:805
+#: ../src/export.c:902
 #, c-format
 msgid "Final transition export progress:"
 msgstr "Progresso esportazione diapositiva finale:"
 
-#: ../src/export.c:1195
-msgid "<b>Television Format</b>"
-msgstr "<b>Formato del televisore</b>"
+#, fuzzy
+#~ msgid "Border Bottom"
+#~ msgstr "Diapositiva dal basso"
+
+#~ msgid "Click to expand the area"
+#~ msgstr "Clicca per espandere l'area"
+
+#~ msgid "Click to shrink the area"
+#~ msgstr "Clicca per restringere l'area"
+
+#~ msgid "_Preview"
+#~ msgstr "_Anteprima"
+
+#~ msgid "Preview quality"
+#~ msgstr "Qualità _Anteprima"
 
-#: ../src/export.c:1202 ../src/export.c:1326 ../src/export.c:1513
-msgid "Normal 4:3"
-msgstr "Normale 4:3"
+#~ msgid "_Low"
+#~ msgstr "Bassa"
 
-#: ../src/export.c:1207 ../src/export.c:1330 ../src/export.c:1517
-msgid "Widescreen 16:9"
-msgstr "Widescreen 16:9"
+#~ msgid "High"
+#~ msgstr "Alta"
 
-#: ../src/export.c:1315 ../src/export.c:1502
-msgid "<b>Aspect Ratio</b>"
-msgstr "<b>Proporzione</b>"
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
 
-#: ../src/export.c:1373 ../src/export.c:1557
-msgid "<b>Video Quality:</b>"
-msgstr "<b>Qualità del video</b>"
+#~ msgid "Update"
+#~ msgstr "Aggiorna"
 
-#: ../src/export.c:1380 ../src/export.c:1564
-msgid "Low"
-msgstr "Bassa"
+#~ msgid "Remove"
+#~ msgstr "Cancella"
 
-#: ../src/export.c:1384 ../src/export.c:1568
-msgid "Medium"
-msgstr "Media"
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Clicca per scegliere il colore dello sfondo del carattere"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "Proporzione:"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Qualità del video</b>"
+
+#, fuzzy
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (DVD video)"
+
+#~ msgid "MP4 (MPEG-4)"
+#~ msgstr "MP4 (MPEG-4)"
+
+#, fuzzy
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#, fuzzy
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (Flash Video)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (Mobile Phones)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Normale 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Widescreen 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Qualità del video</b>"
+
+#~ msgid "Low"
+#~ msgstr "Bassa"
+
+#~ msgid "Medium"
+#~ msgstr "Media"
+
+#, fuzzy
+#~ msgid "low"
+#~ msgstr "Lenta"
 
 #~ msgid "Rotate the slide clockwise"
 #~ msgstr "Ruota la diapositiva senso antiorario"
@@ -768,9 +940,6 @@
 #~ msgid "Goto last slide"
 #~ msgstr "Seleziona l'ultima diapositiva"
 
-#~ msgid "Please choose the audio files to import"
-#~ msgstr "Prego scegliere il nome dei file audio da importare"
-
 #~ msgid "VOB export"
 #~ msgstr "Esporta come VOB Video"

imagination-3.4.tar.bz2/po/ja.po Added

@@ -0,0 +1,937 @@
+# Japanese translations for imagination package.
+# Copyright (C) 2009 THE imagination'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the imagination package.
+# YannUbuntu & Yukimi <yann_ubuntu-1@yahoo.fr>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: imagination 1.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2009-09-26 20:47+0100\n"
+"Last-Translator: YannUbuntu & Yukimi <yann_ubuntu-1@yahoo.fr>\n"
+"Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
+msgid "A DVD slideshow maker"
+msgstr "DVDスライドショーメーカー"
+
+#: ../imagination.desktop.in.h:3
+msgid "A lightweight DVD slideshow maker using GTK+2"
+msgstr "使いやすいDVDスライドショーソフトウェア。GTK+2を使います。"
+
+#: ../src/audio.c:108
+#, c-format
+msgid "Playing %s..."
+msgstr "プレイする： %s..."
+
+#: ../src/audio.c:136 ../src/main-window.c:1224
+msgid "Play the selected file"
+msgstr "選択されたファイルをプレイする"
+
+#: ../src/audio.c:144
+msgid "Stop the playback"
+msgstr "プレイバックを止める"
+
+#: ../src/audio.c:271
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate\n"
+msgstr ""
+"%s :\n"
+"サンプリング周波数の不一致\n"
+
+#: ../src/audio.c:276
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible number of channels\n"
+msgstr ""
+"%s :\n"
+"チャネル量の不一致\n"
+
+#: ../src/audio.c:282
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate and number of channels\n"
+msgstr ""
+"%s :\n"
+"サンプリング周波数とチャネル量の不一致\n"
+
+#: ../src/audio.c:302
+#, c-format
+msgid ""
+"%s\n"
+"<b>Do you want to continue without these files?</b>"
+msgstr ""
+"%s\n"
+"<b>これらのファイルなしで続行しますか？</b>"
+
+#: ../src/audio.c:306 ../src/audio.c:453
+msgid "Audio files mismatch:"
+msgstr "オーディオファイルの不一致 :"
+
+#: ../src/audio.c:400
+msgid "Incompatible sample rate."
+msgstr "サンプリング周波数の不一致."
+
+#: ../src/audio.c:407
+msgid "Incompatible number of channels."
+msgstr "チャネル量の不一致."
+
+#: ../src/audio.c:414
+msgid "Incompatible sample rate and number of channels."
+msgstr "サンプリング周波数とチャネル量の不一致."
+
+#: ../src/audio.c:436
+#, c-format
+msgid ""
+"File selection contains %d audio file that is incompatible with other files."
+msgid_plural ""
+"File selection contains %d audio files that are incompatible with other "
+"files."
+msgstr0 ""
+"選択されたファイル中には %d のオーディオファイルが他のファイルと一致しません"
+msgstr1 ""
+"選択されたファイル中には %d のオーディオファイルが他のファイルと一致しません"
+
+#: ../src/audio.c:442
+msgid "Please check audio tab for more information."
+msgstr "より詳細が必要であれば、オーディオタブもご覧下さい."
+
+#: ../src/main-window.c:218
+msgid "_Slideshow"
+msgstr "スライドショー(_S)"
+
+#: ../src/main-window.c:232
+#, fuzzy
+msgid "Import slideshow"
+msgstr "スライドショーを作成しています"
+
+#: ../src/main-window.c:256
+msgid "Import p_ictures"
+msgstr "画像を追加(_i)"
+
+#: ../src/main-window.c:266
+msgid "Import _music"
+msgstr "音楽を追加(_m)"
+
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "プレビュー"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "音楽を追加"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "音楽を追加"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "目次"
+
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
+msgstr "ビデオを作成する"
+
+#. Slide menu
+#: ../src/main-window.c:330
+msgid "_Slide"
+msgstr "スライド(_S)"
+
+#. Zoom controls
+#: ../src/main-window.c:349
+msgid "_Zoom"
+msgstr "ズーム(_Z)"
+
+#: ../src/main-window.c:373
+msgid "Add empt_y slide"
+msgstr "空のスライドを追加(_y)"
+
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "空のスライドを追加(_y)"
+
+#: ../src/main-window.c:392
+msgid "Dele_te"
+msgstr "削除(_t)"
+
+#: ../src/main-window.c:400
+msgid "Repor_t"
+msgstr "レポート(_t)"
+
+#: ../src/main-window.c:412
+msgid "Rotate co_unter-clockwise"
+msgstr "反時計回り(_u)"
+
+#: ../src/main-window.c:423
+msgid "_Rotate clockwise"
+msgstr "時計回り(_R)"
+
+#: ../src/main-window.c:435
+msgid "Un_select all"
+msgstr "全ての選択を解除(_s)"
+
+#. View menu
+#: ../src/main-window.c:441
+msgid "_View"
+msgstr "表示(_V)"
+
+#: ../src/main-window.c:447
+msgid "Preview mode"
+msgstr "プレビューモード"
+
+#: ../src/main-window.c:453
+msgid "Overview mode"
+msgstr "一覧モード"
+
+#: ../src/main-window.c:456
+#, fuzzy
+msgid "Preview _frame rate"
+msgstr "プレビューモード"
+
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
+#, c-format
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr0 ""
+msgstr1 ""
+
+#. Help menu
+#: ../src/main-window.c:497
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#: ../src/main-window.c:502
+msgid "Contents"
+msgstr "目次"
+
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
+msgid "Create a new slideshow"
+msgstr "新しいスライドショーを作成する"
+
+#: ../src/main-window.c:528
+msgid "Open a slideshow"
+msgstr "スライドショーを開く"
+
+#: ../src/main-window.c:533
+msgid "Save the slideshow"
+msgstr "スライドショーを保存する"
+
+#: ../src/main-window.c:546
+msgid "Import pictures"
+msgstr "画像を追加"
+
+#: ../src/main-window.c:555
+msgid "Import music"
+msgstr "音楽を追加"
+
+#: ../src/main-window.c:560
+msgid "Delete the selected slides"
+msgstr "選択されたスライドを削除する"
+
+#: ../src/main-window.c:570
+#, fuzzy
+msgid "Rotate the slide 90 degrees to the left"
+msgstr "スライド反時計回り"
+
+#: ../src/main-window.c:581
+msgid "Rotate the slide 90 degrees to the right"
+msgstr ""
+
+#: ../src/main-window.c:587
+msgid "Zoom In"
+msgstr "ズームイン"
+
+#: ../src/main-window.c:592
+msgid "Zoom Out"
+msgstr "ズームアウト"
+
+#: ../src/main-window.c:597
+msgid "Normal Size"
+msgstr "普通サイズ"
+
+#: ../src/main-window.c:602
+msgid "Fit Zoom in Window"
+msgstr ""
+
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
+msgstr "プレビューを開始"
+
+#: ../src/main-window.c:619
+#, fuzzy
+msgid "Go to the first slide of the slideshow"
+msgstr "スライドショーのファイル名:"
+
+#: ../src/main-window.c:625
+#, fuzzy
+msgid "Go to the previous slide of the slideshow"
+msgstr "前のスライドに戻る"
+
+#: ../src/main-window.c:641 ../src/main-window.c:847
+msgid " of "
+msgstr " の "
+
+#: ../src/main-window.c:653
+#, fuzzy
+msgid "Go to the next slide of the slideshow"
+msgstr "次のスライドに進む"
+
+#: ../src/main-window.c:659
+#, fuzzy
+msgid "Go to the last slide of the slideshow"
+msgstr "スライドショーのファイル名:"
+
+#: ../src/main-window.c:708
+msgid "Video"
+msgstr "ビデオ"
+
+#: ../src/main-window.c:726
+msgid "<b>Slide Settings</b>"
+msgstr "<b>スライド設定</b>"
+
+#. Transition types label
+#: ../src/main-window.c:736
+msgid "Transition Type:"
+msgstr "スライド間のトランジションタイプ:"
+
+#: ../src/main-window.c:756
+msgid "Random"
+msgstr "ランダム"
+
+#: ../src/main-window.c:757
+msgid "Imagination randomly decides which transition to apply"
+msgstr "Imaginationはランダムにトランジションを選ぶ"
+
+#. Transition duration
+#: ../src/main-window.c:763
+msgid "Transition Speed:"
+msgstr "トランジションの早さ:"
+
+#: ../src/main-window.c:774
+msgid "Fast"
+msgstr "早"
+
+#: ../src/main-window.c:776
+msgid "Normal"
+msgstr "普通"
+
+#: ../src/main-window.c:778
+msgid "Slow"
+msgstr "ゆっくり"
+
+#. Slide duration
+#: ../src/main-window.c:785
+msgid "Slide Duration in sec:"
+msgstr "スライドの時間 (秒) :"
+
+#. Slide Total Duration
+#: ../src/main-window.c:797
+msgid "Slideshow Length:"
+msgstr "スライドショーの全体時間:"
+
+#: ../src/main-window.c:814
+msgid "<b>Slide Motion</b>"
+msgstr "<b>スライドズームと動作</b>"
+
+#: ../src/main-window.c:824
+msgid "Stop Point:"
+msgstr "停止ポイント:"
+
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "停止ポイント:"
+
+#: ../src/main-window.c:869
+msgid "Duration:"
+msgstr "時間:"
+
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "停止ポイント:"
+
+#: ../src/main-window.c:891
+msgid "Zoom: "
+msgstr "ズーム :"
+
+#: ../src/main-window.c:910
+msgid "<b>Slide Text</b>"
+msgstr "<b>スライドのサブタイトル</b>"
+
+#: ../src/main-window.c:944
+msgid "Click to choose the font"
+msgstr "クリックでフォントを選ぶ"
+
+#: ../src/main-window.c:951 ../src/support.c:1176
+#, fuzzy
+msgid "Click to choose the font color"
+msgstr "クリックでフォントを選ぶ"
+
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "クリックでフォントを選ぶ"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "クリックでフォントを選ぶ"
+
+#: ../src/main-window.c:1023
+msgid "Animation:"
+msgstr "アニメーション:"
+
+#: ../src/main-window.c:1035
+msgid "Animation Speed:"
+msgstr "アニメーションの早さ:"
+
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>スライドズームと動作</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "テキスト位置:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "テキスト位置:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
+msgid "Placing is relative to:"
+msgstr "テキスト位置の関係:"
+
+#: ../src/main-window.c:1140
+msgid "Exported video"
+msgstr "作成ビデオ"
+
+#: ../src/main-window.c:1142
+msgid "Original image"
+msgstr "オリジナル画像"
+
+#. Background music frame
+#: ../src/main-window.c:1149
+msgid "Audio"
+msgstr "オーディオ"
+
+#: ../src/main-window.c:1162
+msgid "<b>Background Music</b>"
+msgstr "<b>複数の音楽が選択可能</b>"
+
+#: ../src/main-window.c:1208
+msgid "Music Duration:"
+msgstr "音楽の長さ:"
+
+#: ../src/main-window.c:1232
+msgid "Delete the selected file"
+msgstr "選択された音楽を削除する"
+
+#: ../src/main-window.c:1239
+msgid "Move the selected file up"
+msgstr "選択された音楽の順番を前にする"
+
+#: ../src/main-window.c:1246
+msgid "Move the selected file down"
+msgstr "選択された音楽を後にする"
+
+#: ../src/main-window.c:1253
+msgid "Clear all files"
+msgstr "全ての音楽を削除する"
+
+#. End of Background music frame
+#. Begin of Message tab
+#: ../src/main-window.c:1258
+msgid "Messages"
+msgstr ""
+
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
+msgid "Sorry, I could not perform the operation!"
+msgstr "申し訳ございません、この操作は不可能です！"
+
+#: ../src/main-window.c:1825
+#, c-format
+msgid "File '%s' not found"
+msgstr ""
+
+#: ../src/main-window.c:1834
+msgid "Resolution"
+msgstr "画質"
+
+#: ../src/main-window.c:1834
+msgid "Type"
+msgstr "タイプ"
+
+#. No animation function (id = 0)
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
+msgid "None"
+msgstr "どれにも当てはまらない"
+
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
+msgid "Slides Transitions Report Dialog"
+msgstr "スライドのトランジションのレポート:"
+
+#: ../src/main-window.c:2798
+msgid ""
+"\n"
+"<span weight='bold'>Note:</span>\n"
+"\n"
+"Slides whose transition is applied only once are not shown here.\n"
+"Click on the slide to have Imagination automatically select it."
+msgstr ""
+"\n"
+"<span weight='bold'>Note:</span>\n"
+"\n"
+"一つトランジションだけあるスライドを表示しない.\n"
+"スライドをクリークして、選択します."
+
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
+msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
+msgstr "まだスライドショーを保存していません。本当に閉じますか？"
+
+#: ../src/callbacks.c:220
+#, fuzzy, c-format
+msgid "Please wait, importing image %d out of %d"
+msgstr "スライド %d (全体: %d )を追加中ですので、もうしばらくお待ち下さい。"
+
+#: ../src/callbacks.c:289
+#, fuzzy
+msgid "Import audio files, use CTRL key for multiple select"
+msgstr "画像を選んで下さい（SHIFTキーで複数のファイルを選択出来ます）"
+
+#: ../src/callbacks.c:301
+msgid "All audio files"
+msgstr "全てのオーディオファイル"
+
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
+msgid "All files"
+msgstr "全てのファイル"
+
+#: ../src/callbacks.c:365
+#, fuzzy
+msgid "Import images, use SHIFT key for multiple select"
+msgstr "画像を選んで下さい（SHIFTキーで複数のファイルを選択出来ます）"
+
+#: ../src/callbacks.c:378
+msgid "All image files"
+msgstr "全ての画像ファイル"
+
+#: ../src/callbacks.c:578
+#, c-format
+msgid "%d x %d pixels"
+msgid_plural "%d x %d pixels"
+msgstr0 "%d x %d ピクセル"
+msgstr1 "%d x %d ピクセル"
+
+#: ../src/callbacks.c:853
+msgid "translator-credits"
+msgstr "翻訳協力者"
+
+#: ../src/callbacks.c:1517
+msgid "Stops the preview"
+msgstr "プレビューを停止する"
+
+#: ../src/callbacks.c:1580
+msgid "Load an Imagination slideshow project"
+msgstr "Imaginationスライドショーを開く"
+
+#: ../src/callbacks.c:1581
+msgid "Save an Imagination slideshow project"
+msgstr "Imaginationスライドショーを保存する"
+
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Imagination"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "空のスライドを追加(_y)"
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Create empty slide"
+msgstr "新しいスライドショーを作成する"
+
+#: ../src/callbacks.c:2509
+msgid "Empty slide options:"
+msgstr "スライドの設定を削除する"
+
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
+msgstr "均一色を使います (_s)"
+
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
+msgstr "線形グラデーションを使います (_l)"
+
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
+msgstr "丸形グラデーションを使います (_r)"
+
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "丸形グラデーションを使います (_r)"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "音楽を選んで下さい（SHIFTキーで複数のファイルを選択出来ます）"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "全てのファイル"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
+
+#. Display propert title depending on the callback that is calling this function.
+#: ../src/new_slideshow.c:66
+msgid "Project properties"
+msgstr "スライドショーの設定"
+
+#: ../src/new_slideshow.c:86
+msgid "<b>Slideshow Settings</b>"
+msgstr "<b>スライドショーの設定</b>"
+
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "<b>ビデオのタイプ</b>"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+#, fuzzy
+msgid "Video Size:"
+msgstr "<b>ビデオのサイズ</b>"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr ""
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "テレビサイズ"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
+msgid "<b>Advanced Settings</b>"
+msgstr "<b>高設定</b>"
+
+#: ../src/new_slideshow.c:178
+msgid "Rescale images to fit desired aspect ratio"
+msgstr "画像サイズの変更"
+
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
+msgstr "背景画像の色を選んで下さい:"
+
+#: ../src/slideshow_project.c:265
+msgid "This is not an Imagination project file!"
+msgstr "これはImaginationスライドショーではありません！"
+
+#: ../src/slideshow_project.c:442
+#, c-format
+msgid "Slide %i: can't load image %s\n"
+msgstr ""
+
+#: ../src/slideshow_project.c:585
+#, c-format
+msgid "Can't load image %s\n"
+msgstr ""
+
+#: ../src/support.c:134
+#, fuzzy, c-format
+msgid "Welcome to Imagination - %d transition loaded."
+msgid_plural "Welcome to Imagination - %d transitions loaded."
+msgstr0 "Imaginationへようこそ -　トランジション追加数: %d 個."
+msgstr1 "Imaginationへようこそ -　トランジション追加数: %d 個."
+
+#: ../src/support.c:145
+#, fuzzy, c-format
+msgid "%d slide selected"
+msgid_plural "%d slides selected"
+msgstr0 "選択されたスライド: %d 枚"
+msgstr1 "選択されたスライド: %d 枚"
+
+#: ../src/support.c:156
+#, fuzzy, c-format
+msgid "%d slide loaded %s"
+msgid_plural "%d slides loaded %s"
+msgstr0 "%d 追加されたスライド %s"
+msgstr1 "%d 追加されたスライド %s"
+
+#: ../src/support.c:160
+msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
+msgstr ""
+" - CTRLキーでファイルを選択・選択解除出来て、SHIFTキーで複数のファイルを選択"
+"出来ます"
+
+#: ../src/support.c:327
+msgid "Please choose the slideshow project filename"
+msgstr "スライドショーの名前を選んで下さい"
+
+#: ../src/subtitles.c:243
+msgid "Fade"
+msgstr ""
+
+#: ../src/subtitles.c:247
+msgid "Slide from left"
+msgstr ""
+
+#: ../src/subtitles.c:251
+msgid "Slide from right"
+msgstr ""
+
+#: ../src/subtitles.c:255
+msgid "Slide from top"
+msgstr ""
+
+#: ../src/subtitles.c:259
+msgid "Slide from bottom"
+msgstr ""
+
+#: ../src/subtitles.c:263
+msgid "Grow"
+msgstr ""
+
+#: ../src/subtitles.c:267
+msgid "Slide bottom to top"
+msgstr ""
+
+#: ../src/subtitles.c:271
+msgid "Slide right to left"
+msgstr ""
+
+#: ../src/export.c:144
+msgid "<b>Export Settings</b>"
+msgstr "<b>セッティングの作成</b>"
+
+#: ../src/export.c:158
+msgid "Filename:"
+msgstr ""
+
+#: ../src/export.c:306
+msgid "Exporting the slideshow"
+msgstr "スライドショーを作成しています"
+
+#: ../src/export.c:318
+msgid "Preparing for export ..."
+msgstr "スライドショーの作成の準備をしています"
+
+#: ../src/export.c:329
+msgid "Overall progress:"
+msgstr "全体の進捗:"
+
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
+#, c-format
+msgid "Slide %d export progress:"
+msgstr " %d スライドを作成しています:"
+
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
+msgid "Failed to launch the encoder!"
+msgstr "エンコーダは始めることが出来ませんでした！"
+
+#: ../src/export.c:902
+#, c-format
+msgid "Final transition export progress:"
+msgstr "最後のスライドを作成しています:"
+
+#~ msgid "Click to expand the area"
+#~ msgstr "クリックで区域を広げる"
+
+#~ msgid "Click to shrink the area"
+#~ msgstr "クリックで区域を縮める"
+
+#~ msgid "_Preview"
+#~ msgstr "プレビュー(_P)"
+
+#~ msgid "Preview quality"
+#~ msgstr "プレビューの画質"
+
+#~ msgid "_Low"
+#~ msgstr "低(_L)"
+
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Update"
+#~ msgstr "保存"
+
+#~ msgid "Remove"
+#~ msgstr "削除"
+
+#, fuzzy
+#~ msgid "Click to choose the font background color"
+#~ msgstr "クリックでフォントを選ぶ"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "<b>スライドズームと動作</b>"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>ビデオ画質:</b>"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "一般的な 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "ワイド・スクリーン 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>ビデオ画質:</b>"
+
+#~ msgid "Low"
+#~ msgstr "低"
+
+#~ msgid "Medium"
+#~ msgstr "中"
+
+#~ msgid "Rotate the slide clockwise"
+#~ msgstr "スライド時計回り"
+
+#~ msgid "Goto first slide"
+#~ msgstr "一番目のスライドに戻る"
+
+#~ msgid "Goto last slide"
+#~ msgstr "最後のスライドに進む"
+
+#~ msgid "VOB export"
+#~ msgstr "VOBで作成する"
+
+#~ msgid "OGG export"
+#~ msgstr "OGGで作成する"
+
+#~ msgid "FLV export"
+#~ msgstr "FLVで作成する"
+
+#~ msgid "An error occurred while trying to rotate the slide:"
+#~ msgstr "スライド回転中にエラー発生:"

imagination-3.4.tar.bz2/po/ku.po Added

@@ -0,0 +1,977 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# , 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2009-12-10 15:02+0200\n"
+"Last-Translator: \n"
+"Language-Team: Kurdî <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.0\n"
+
+#: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
+msgid "A DVD slideshow maker"
+msgstr "Çêkera pêşandana slaytan a DVDyê"
+
+#: ../imagination.desktop.in.h:3
+msgid "A lightweight DVD slideshow maker using GTK+2"
+msgstr "Çêkera pêşandana slaytan a DVDyê a sivik ku GTK+2 bi kar tîne"
+
+#: ../src/audio.c:108
+#, c-format
+msgid "Playing %s..."
+msgstr "Lê dide %s..."
+
+#: ../src/audio.c:136 ../src/main-window.c:1224
+msgid "Play the selected file"
+msgstr "Pela bijartî lê bide"
+
+#: ../src/audio.c:144
+msgid "Stop the playback"
+msgstr "Lêdanê bisekinîne"
+
+#: ../src/audio.c:271
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate\n"
+msgstr ""
+"%s:\n"
+"sample rate lê nayê\n"
+
+#: ../src/audio.c:276
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible number of channels\n"
+msgstr ""
+"%s:\n"
+"hejmara qenalan lê nayê\n"
+
+#: ../src/audio.c:282
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate and number of channels\n"
+msgstr ""
+"%s:\n"
+"sample rate û hejmara qenalan lê nayê\n"
+
+#: ../src/audio.c:302
+#, c-format
+msgid ""
+"%s\n"
+"<b>Do you want to continue without these files?</b>"
+msgstr ""
+"%s\n"
+"<b>Dixwazî bêyî van pelan berdewam bikî?</b>"
+
+#: ../src/audio.c:306 ../src/audio.c:453
+msgid "Audio files mismatch:"
+msgstr "Pelên dengê li hev nayên:"
+
+#: ../src/audio.c:400
+msgid "Incompatible sample rate."
+msgstr "Sample rate lê nayê."
+
+#: ../src/audio.c:407
+msgid "Incompatible number of channels."
+msgstr "Hejmara qenalan lê nayê."
+
+#: ../src/audio.c:414
+msgid "Incompatible sample rate and number of channels."
+msgstr "sample rate û hejmara qenalan lê nayê."
+
+#: ../src/audio.c:436
+#, c-format
+msgid ""
+"File selection contains %d audio file that is incompatible with other files."
+msgid_plural ""
+"File selection contains %d audio files that are incompatible with other "
+"files."
+msgstr0 "Hilbijartin pela dengan %d dihewîne ku bi pelên din re li hev nayê."
+msgstr1 ""
+"Hilbijartin pelên dengan %d dihewîne ku bi pelên din re li hev nayê."
+
+#: ../src/audio.c:442
+msgid "Please check audio tab for more information."
+msgstr "Ji bo zêdetir agahiyê li hilpekîna dengê binêre."
+
+#: ../src/main-window.c:218
+msgid "_Slideshow"
+msgstr "_Pêşandana Slaytê"
+
+#: ../src/main-window.c:232
+#, fuzzy
+msgid "Import slideshow"
+msgstr "Pêşandana slaytan tê derxistin"
+
+#: ../src/main-window.c:256
+msgid "Import p_ictures"
+msgstr "Wêneyan têxe"
+
+#: ../src/main-window.c:266
+msgid "Import _music"
+msgstr "Mûzîk têxê"
+
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Pêşdîtin"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "Mûzîk têxê"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "Mûzîk têxê"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Naverok"
+
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
+msgstr "Derxe"
+
+#. Slide menu
+#: ../src/main-window.c:330
+msgid "_Slide"
+msgstr "_Slayt"
+
+#. Zoom controls
+#: ../src/main-window.c:349
+msgid "_Zoom"
+msgstr "_Nêzkirin"
+
+#: ../src/main-window.c:373
+msgid "Add empt_y slide"
+msgstr "Slayteke vala lê zêdeke"
+
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "Slayteke vala lê zêdeke"
+
+#: ../src/main-window.c:392
+msgid "Dele_te"
+msgstr "Jê bibe"
+
+#: ../src/main-window.c:400
+msgid "Repor_t"
+msgstr "Rapor bike"
+
+#: ../src/main-window.c:412
+msgid "Rotate co_unter-clockwise"
+msgstr "Ber aliyê vajî a saetê ve bizivirîne"
+
+#: ../src/main-window.c:423
+msgid "_Rotate clockwise"
+msgstr "_Ber aliyê saetê ve bizivirîne"
+
+#: ../src/main-window.c:435
+msgid "Un_select all"
+msgstr "Tu yekê hilnebijêre"
+
+#. View menu
+#: ../src/main-window.c:441
+msgid "_View"
+msgstr "_Dîtin"
+
+#: ../src/main-window.c:447
+msgid "Preview mode"
+msgstr "Moda pêşdîtinê"
+
+#: ../src/main-window.c:453
+msgid "Overview mode"
+msgstr "Moda dîtina seranser"
+
+#: ../src/main-window.c:456
+#, fuzzy
+msgid "Preview _frame rate"
+msgstr "Moda pêşdîtinê"
+
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
+#, c-format
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr0 ""
+msgstr1 ""
+
+#. Help menu
+#: ../src/main-window.c:497
+msgid "_Help"
+msgstr "_Alîkarî"
+
+#: ../src/main-window.c:502
+msgid "Contents"
+msgstr "Naverok"
+
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
+msgid "Create a new slideshow"
+msgstr "Pêşandaneke nû ya slaytan"
+
+#: ../src/main-window.c:528
+msgid "Open a slideshow"
+msgstr "Pêşandaneke nû ya slaytan veke"
+
+#: ../src/main-window.c:533
+msgid "Save the slideshow"
+msgstr "Pêşandana slaytan tomarke"
+
+#: ../src/main-window.c:546
+msgid "Import pictures"
+msgstr "Wêneyan têxê"
+
+#: ../src/main-window.c:555
+msgid "Import music"
+msgstr "Mûzîk têxê"
+
+#: ../src/main-window.c:560
+msgid "Delete the selected slides"
+msgstr "Slaytên bijartî jê bibe"
+
+#: ../src/main-window.c:570
+msgid "Rotate the slide 90 degrees to the left"
+msgstr "Slaytê ber aliyê çepê 90 derece bizivirîne"
+
+#: ../src/main-window.c:581
+msgid "Rotate the slide 90 degrees to the right"
+msgstr "Slaytê ber aliyê rastê 90 derece bizivirîne"
+
+#: ../src/main-window.c:587
+msgid "Zoom In"
+msgstr "Nêzkirin"
+
+#: ../src/main-window.c:592
+msgid "Zoom Out"
+msgstr "Dûrkirin"
+
+#: ../src/main-window.c:597
+msgid "Normal Size"
+msgstr "Mezinahiya normal"
+
+#: ../src/main-window.c:602
+msgid "Fit Zoom in Window"
+msgstr ""
+
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
+msgstr "Pêşdîtinê destpêke"
+
+#: ../src/main-window.c:619
+msgid "Go to the first slide of the slideshow"
+msgstr "Here slayta yekemîn a pêşandana slaytan"
+
+#: ../src/main-window.c:625
+msgid "Go to the previous slide of the slideshow"
+msgstr "Here slayta berê a pêşandana slaytan"
+
+#: ../src/main-window.c:641 ../src/main-window.c:847
+msgid " of "
+msgstr "ji"
+
+#: ../src/main-window.c:653
+msgid "Go to the next slide of the slideshow"
+msgstr "Here slayta pêş a pêşandana slaytan"
+
+#: ../src/main-window.c:659
+msgid "Go to the last slide of the slideshow"
+msgstr "Here slayta dawîn pêşandana slaytan"
+
+#: ../src/main-window.c:708
+msgid "Video"
+msgstr "Vîdyo"
+
+#: ../src/main-window.c:726
+msgid "<b>Slide Settings</b>"
+msgstr "<b>Mîhengên Slaytan</b>"
+
+#. Transition types label
+#: ../src/main-window.c:736
+msgid "Transition Type:"
+msgstr "Cureya derbasbûnê:"
+
+#: ../src/main-window.c:756
+msgid "Random"
+msgstr "Çawalêhato"
+
+#: ../src/main-window.c:757
+msgid "Imagination randomly decides which transition to apply"
+msgstr "Imaginations bi awayeke çawalêhato cureya derbasbûnê hildibijêre"
+
+#. Transition duration
+#: ../src/main-window.c:763
+msgid "Transition Speed:"
+msgstr "Leza derbasbûnê:"
+
+#: ../src/main-window.c:774
+msgid "Fast"
+msgstr "Bilez"
+
+#: ../src/main-window.c:776
+msgid "Normal"
+msgstr "Normal"
+
+#: ../src/main-window.c:778
+msgid "Slow"
+msgstr "Hêdîka"
+
+#. Slide duration
+#: ../src/main-window.c:785
+msgid "Slide Duration in sec:"
+msgstr "Slayt çend çirke didome:"
+
+#. Slide Total Duration
+#: ../src/main-window.c:797
+msgid "Slideshow Length:"
+msgstr "Dirêjahiya pêşandana slaytan:"
+
+#: ../src/main-window.c:814
+msgid "<b>Slide Motion</b>"
+msgstr "<b>Tevgera Slaytê</b>"
+
+#: ../src/main-window.c:824
+msgid "Stop Point:"
+msgstr "Noqteya rawestinê:"
+
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Noqteya rawestinê:"
+
+#: ../src/main-window.c:869
+msgid "Duration:"
+msgstr "Dirêjahî:"
+
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Noqteya rawestinê:"
+
+#: ../src/main-window.c:891
+msgid "Zoom: "
+msgstr "Nêzkirin:"
+
+#: ../src/main-window.c:910
+msgid "<b>Slide Text</b>"
+msgstr "<b>Nivîsa Slaytê</b>"
+
+#: ../src/main-window.c:944
+msgid "Click to choose the font"
+msgstr "Bitike ku curenivîsê hilbijêrî"
+
+#: ../src/main-window.c:951 ../src/support.c:1176
+#, fuzzy
+msgid "Click to choose the font color"
+msgstr "Bitike ku curenivîsê hilbijêrî"
+
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Bitike ku curenivîsê hilbijêrî"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Bitike ku curenivîsê hilbijêrî"
+
+#: ../src/main-window.c:1023
+msgid "Animation:"
+msgstr "Anîmasyon:"
+
+#: ../src/main-window.c:1035
+msgid "Animation Speed:"
+msgstr "Leza anîmasyonê:"
+
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Tevgera Slaytê</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Cihê pozîsyonê"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Cihê pozîsyonê"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
+msgid "Placing is relative to:"
+msgstr "Placing is relative to:"
+
+#: ../src/main-window.c:1140
+msgid "Exported video"
+msgstr "Vîdyoyê derxe"
+
+#: ../src/main-window.c:1142
+msgid "Original image"
+msgstr "Wêneya resen"
+
+#. Background music frame
+#: ../src/main-window.c:1149
+msgid "Audio"
+msgstr "Deng"
+
+#: ../src/main-window.c:1162
+msgid "<b>Background Music</b>"
+msgstr "<b>Mûzîka li paş</b>"
+
+#: ../src/main-window.c:1208
+msgid "Music Duration:"
+msgstr "Dirêjahiya mûzîkê:"
+
+#: ../src/main-window.c:1232
+msgid "Delete the selected file"
+msgstr "Pela bijartî jê bibe"
+
+#: ../src/main-window.c:1239
+msgid "Move the selected file up"
+msgstr "Pela bijartî bibe jor"
+
+#: ../src/main-window.c:1246
+msgid "Move the selected file down"
+msgstr "Pela bijartî bibe jêr"
+
+#: ../src/main-window.c:1253
+msgid "Clear all files"
+msgstr "Hemû pelan paqijke"
+
+#. End of Background music frame
+#. Begin of Message tab
+#: ../src/main-window.c:1258
+msgid "Messages"
+msgstr ""
+
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
+msgid "Sorry, I could not perform the operation!"
+msgstr "Xemgîn im, lê nikarim çalakiyê pêk bînim!"
+
+#: ../src/main-window.c:1825
+#, c-format
+msgid "File '%s' not found"
+msgstr ""
+
+#: ../src/main-window.c:1834
+msgid "Resolution"
+msgstr "Rezolûsyon"
+
+#: ../src/main-window.c:1834
+msgid "Type"
+msgstr "Cure"
+
+#. No animation function (id = 0)
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
+msgid "None"
+msgstr "Ne yek jî"
+
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
+msgid "Slides Transitions Report Dialog"
+msgstr "Diyaloga rapora derbasbûnên slaytan"
+
+#: ../src/main-window.c:2798
+msgid ""
+"\n"
+"<span weight='bold'>Note:</span>\n"
+"\n"
+"Slides whose transition is applied only once are not shown here.\n"
+"Click on the slide to have Imagination automatically select it."
+msgstr ""
+"\n"
+"<span bilindahî='bold'>Not:</span>\n"
+"\n"
+"Slaytên ku derbasbûna tenê carekê lê hetiye sepandin li vir tên nîşandan.\n"
+"Ji bo ku Imagination wê jixweber hilbijêre lê bitike."
+
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
+msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
+msgstr "Te hê pêşandata slaytan a xwe tomar nekiriye. Ji dil dixwazî bigirî?"
+
+#: ../src/callbacks.c:220
+#, c-format
+msgid "Please wait, importing image %d out of %d"
+msgstr "Li bendê be, wêbe tên têxistin %d qediya ji %d"
+
+#: ../src/callbacks.c:289
+msgid "Import audio files, use CTRL key for multiple select"
+msgstr "Pelên dengê têxê, ji bo ku pir pel hilbijêrî pêl CTRL bike"
+
+#: ../src/callbacks.c:301
+msgid "All audio files"
+msgstr "Hemû pelên dengê"
+
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
+msgid "All files"
+msgstr "Hemû pel"
+
+#: ../src/callbacks.c:365
+msgid "Import images, use SHIFT key for multiple select"
+msgstr "Wêneyan têxe, ji bo bijartina pir pelan SHIFT bi kar bîne"
+
+#: ../src/callbacks.c:378
+msgid "All image files"
+msgstr "Hemû pelên wêneyan"
+
+#: ../src/callbacks.c:578
+#, c-format
+msgid "%d x %d pixels"
+msgid_plural "%d x %d pixels"
+msgstr0 "%d x %d pixels"
+msgstr1 "%d x %d pixels"
+
+#: ../src/callbacks.c:853
+msgid "translator-credits"
+msgstr "wergêr-alîkar"
+
+#: ../src/callbacks.c:1517
+msgid "Stops the preview"
+msgstr "Pêşdîtinê bisekinîne"
+
+#: ../src/callbacks.c:1580
+msgid "Load an Imagination slideshow project"
+msgstr "Projeyeke pêşandana slaytan a Imaginationê barke"
+
+#: ../src/callbacks.c:1581
+msgid "Save an Imagination slideshow project"
+msgstr "Projeyeke pêşandana slaytan a Imaginationê tomarke"
+
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Imagination"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "Slayteke vala lê zêdeke"
+
+#: ../src/callbacks.c:2498
+msgid "Create empty slide"
+msgstr "Slayteke vala biafirîne"
+
+#: ../src/callbacks.c:2509
+msgid "Empty slide options:"
+msgstr "Vebijêrkên slayta vala:"
+
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
+msgstr "Rengê sade bi kar bîne"
+
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
+msgstr "Gardiyenta lîneer bi kar bîne"
+
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
+msgstr "Gradiyenta radyal bi kar bîne"
+
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "Gradiyenta radyal bi kar bîne"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "Navê pela projeya pêşandana slaytan binivîse"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Hemû pel"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
+
+#. Display propert title depending on the callback that is calling this function.
+#: ../src/new_slideshow.c:66
+msgid "Project properties"
+msgstr "Taybetiyên projeyê"
+
+#: ../src/new_slideshow.c:86
+msgid "<b>Slideshow Settings</b>"
+msgstr "<b>Mîhengên Pêşandana Slaytan</b>"
+
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "<b>Formata Vîdyoyê</b>"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+#, fuzzy
+msgid "Video Size:"
+msgstr "<b>Mezinahiya vîdyoyê</b>"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr ""
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Formata televîzyonê</b>"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
+msgid "<b>Advanced Settings</b>"
+msgstr "<b>Mîhengên Pêşketî</b>"
+
+#: ../src/new_slideshow.c:178
+msgid "Rescale images to fit desired aspect ratio"
+msgstr "Ku li aspect ratio a diyarkirî were, mezinahiya wêneyê biguhere"
+
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
+msgstr "Rengê rûerdê hilbijêre:"
+
+#: ../src/slideshow_project.c:265
+msgid "This is not an Imagination project file!"
+msgstr "Ev pela projeyeke Imaginationê ye!"
+
+#: ../src/slideshow_project.c:442
+#, c-format
+msgid "Slide %i: can't load image %s\n"
+msgstr ""
+
+#: ../src/slideshow_project.c:585
+#, c-format
+msgid "Can't load image %s\n"
+msgstr ""
+
+#: ../src/support.c:134
+#, c-format
+msgid "Welcome to Imagination - %d transition loaded."
+msgid_plural "Welcome to Imagination - %d transitions loaded."
+msgstr0 "Bi xêr hatî Imaginationê - %d derbasbûn hat barkirin."
+msgstr1 "Bi xêr hatî Imaginationê - %d derbasbûn hatin barkirin."
+
+#: ../src/support.c:145
+#, c-format
+msgid "%d slide selected"
+msgid_plural "%d slides selected"
+msgstr0 "%d slayt hat bijartin"
+msgstr1 "%d slayt hatin bijartin"
+
+#: ../src/support.c:156
+#, c-format
+msgid "%d slide loaded %s"
+msgid_plural "%d slides loaded %s"
+msgstr0 "%d slayt hat barkirin %s"
+msgstr1 "%d slayt hatin barkirin %s"
+
+#: ../src/support.c:160
+msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
+msgstr " - Ji bo bijartina ji yekê zêde bişkojka CTRL an jî SHIFT bi kar bîne"
+
+#: ../src/support.c:327
+msgid "Please choose the slideshow project filename"
+msgstr "Navê pela projeya pêşandana slaytan binivîse"
+
+#: ../src/subtitles.c:243
+msgid "Fade"
+msgstr ""
+
+#: ../src/subtitles.c:247
+msgid "Slide from left"
+msgstr ""
+
+#: ../src/subtitles.c:251
+msgid "Slide from right"
+msgstr ""
+
+#: ../src/subtitles.c:255
+msgid "Slide from top"
+msgstr ""
+
+#: ../src/subtitles.c:259
+msgid "Slide from bottom"
+msgstr ""
+
+#: ../src/subtitles.c:263
+msgid "Grow"
+msgstr ""
+
+#: ../src/subtitles.c:267
+msgid "Slide bottom to top"
+msgstr ""
+
+#: ../src/subtitles.c:271
+msgid "Slide right to left"
+msgstr ""
+
+#: ../src/export.c:144
+msgid "<b>Export Settings</b>"
+msgstr "<b>Mîhengên Derxistinê</b>"
+
+#: ../src/export.c:158
+msgid "Filename:"
+msgstr "Navê pelê:"
+
+#: ../src/export.c:306
+msgid "Exporting the slideshow"
+msgstr "Pêşandana slaytan tê derxistin"
+
+#: ../src/export.c:318
+msgid "Preparing for export ..."
+msgstr "Li benda derxistinê ye...."
+
+#: ../src/export.c:329
+msgid "Overall progress:"
+msgstr "Pêşdeçûna seranser:"
+
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
+#, c-format
+msgid "Slide %d export progress:"
+msgstr "Rewşa derxistina slayta %d:"
+
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
+msgid "Failed to launch the encoder!"
+msgstr "Di meşandina encoderê de çewtî!"
+
+#: ../src/export.c:902
+#, c-format
+msgid "Final transition export progress:"
+msgstr "Rewşa derxistina derbasbûna fînal:"
+
+#~ msgid "Click to expand the area"
+#~ msgstr "Bitike ku qadê fireh bikî"
+
+#~ msgid "Click to shrink the area"
+#~ msgstr "Bitike ku qadê teng bikî"
+
+#~ msgid "_Preview"
+#~ msgstr "_Pêşdîtin"
+
+#~ msgid "Preview quality"
+#~ msgstr "Qalîteya Pêşdîtinê"
+
+#~ msgid "_Low"
+#~ msgstr "_Hindik"
+
+#~ msgid "High"
+#~ msgstr "Zehf"
+
+#~ msgid "Add"
+#~ msgstr "Lê zêdeke"
+
+#~ msgid "Update"
+#~ msgstr "Rojaneke"
+
+#~ msgid "Remove"
+#~ msgstr "Rake"
+
+#, fuzzy
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Bitike ku curenivîsê hilbijêrî"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "<b>Tevgera Slaytê</b>"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Qalîteya Vîdyoyê:</b>"
+
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (Vîdyoyên DVD)"
+
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (vîdyoyên flash)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (Telefonên bêrikê)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Normal 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Ekrana fireh 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Qalîteya Vîdyoyê:</b>"
+
+#~ msgid "Low"
+#~ msgstr "Hindik"
+
+#~ msgid "Medium"
+#~ msgstr "Navincî"
+
+#, fuzzy
+#~ msgid "VOB (DVD Video)"
+#~ msgstr "VOB (Vîdyoyên DVD)"
+
+#, fuzzy
+#~ msgid "OGV (Theora Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#, fuzzy
+#~ msgid "FLV (Flash Video)"
+#~ msgstr "FLV (vîdyoyên flash)"
+
+#~ msgid "Goto first slide"
+#~ msgstr "Here slayta yekemîn"
+
+#~ msgid "Goto last slide"
+#~ msgstr "Here slayta yekemîn"
+
+#~ msgid "An error occurred while trying to rotate the slide:"
+#~ msgstr "Di zivirandina slaytê de çewtiyek derket holê :"
+
+#~ msgid "Slide Number:"
+#~ msgstr "Hejmara slaytê:"
+
+#~ msgid "Jump to the entered slide number"
+#~ msgstr "Here slayta ku hejmara wê hatî dayîn"
+
+#~ msgid ""
+#~ "The length of the audio track is longer than the video one. Do you want "
+#~ "to continue?"
+#~ msgstr "Dirêjahiya dengê bijartî ji vîdyoyê dirêjtir e. Dixwazî bidomînî??"
+
+#, fuzzy
+#~ msgid "Rotate the slide clockwise"
+#~ msgstr "_Ber aliyê saetê ve bizivirîne"
+
+#, fuzzy
+#~ msgid "VOB export"
+#~ msgstr "Derxe"
+
+#, fuzzy
+#~ msgid "OGG export"
+#~ msgstr "Derxe"
+
+#, fuzzy
+#~ msgid "FLV export"
+#~ msgstr "Derxe"
+
+#, fuzzy
+#~ msgid "Sorry,I could not perform the operation!"
+#~ msgstr "Xemgîn im, lê nikarim çalakiyê pêk bînim!"
+
+#, fuzzy
+#~ msgid "Export the DVD slideshow"
+#~ msgstr "Pêşandana slaytan tê derxistin"
+
+#, fuzzy
+#~ msgid "Export the slideshow as:"
+#~ msgstr "Pêşandana slaytan tê derxistin"

imagination-3.0.tar.bz2/po/pt_BR.po -> imagination-3.4.tar.bz2/po/pt_BR.po Changed

@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 20:10+0100\n"
-"PO-Revision-Date: 2011-02-25 09:18-0500\n"
-"Last-Translator: Og Maciel <ogmaciel@gnome.org>\n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2011-06-11 20:51+0100\n"
+"Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar2.conectiva.com.br>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -20,31 +20,31 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
 msgid "A DVD slideshow maker"
 msgstr "Um criador de apresentações de slides em DVD"
 
-#: ../imagination.desktop.in.h:2
+#: ../imagination.desktop.in.h:3
 msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr "Um criador leve de apresentações de slides em DVD usando GTK+2"
 
-#: ../imagination.desktop.in.h:3
-msgid "Imagination"
-msgstr "Imagination"
-
-#: ../src/audio.c:109
+#: ../src/audio.c:108
 #, c-format
 msgid "Playing %s..."
 msgstr "Reproduzindo %s..."
 
-#: ../src/audio.c:137 ../src/main-window.c:1130
+#: ../src/audio.c:136 ../src/main-window.c:1224
 msgid "Play the selected file"
 msgstr "Reproduzir o arquivo selecionado"
 
-#: ../src/audio.c:145
+#: ../src/audio.c:144
 msgid "Stop the playback"
 msgstr "Parar a reprodução"
 
-#: ../src/audio.c:272
+#: ../src/audio.c:271
 #, c-format
 msgid ""
 "%s:\n"
@@ -53,7 +53,7 @@
 "%s:\n"
 "taxa incompatível de amostra\n"
 
-#: ../src/audio.c:277
+#: ../src/audio.c:276
 #, c-format
 msgid ""
 "%s:\n"
@@ -62,7 +62,7 @@
 "%s:\n"
 "número incompatível de canais\n"
 
-#: ../src/audio.c:283
+#: ../src/audio.c:282
 #, c-format
 msgid ""
 "%s:\n"
@@ -71,7 +71,7 @@
 "%s:\n"
 "taxa incompatível de amostra e número de canais\n"
 
-#: ../src/audio.c:303
+#: ../src/audio.c:302
 #, c-format
 msgid ""
 "%s\n"
@@ -80,23 +80,23 @@
 "%s\n"
 "<b>Você deseja continuar sem estes arquivos?</b>"
 
-#: ../src/audio.c:307 ../src/audio.c:454
+#: ../src/audio.c:306 ../src/audio.c:453
 msgid "Audio files mismatch:"
 msgstr "Os arquivos não coincidem:"
 
-#: ../src/audio.c:401
+#: ../src/audio.c:400
 msgid "Incompatible sample rate."
 msgstr "Taxa incompatível de amostra."
 
-#: ../src/audio.c:408
+#: ../src/audio.c:407
 msgid "Incompatible number of channels."
 msgstr "Número incompatível de canais."
 
-#: ../src/audio.c:415
+#: ../src/audio.c:414
 msgid "Incompatible sample rate and number of channels."
 msgstr "Taxa incompatível de amostra e número de canais."
 
-#: ../src/audio.c:437
+#: ../src/audio.c:436
 #, c-format
 msgid ""
 "File selection contains %d audio file that is incompatible with other files."
@@ -110,54 +110,57 @@
 "O arquivo selecionado contém %d arquivos de áudio que não são compatíveis "
 "com outros arquivos."
 
-#: ../src/audio.c:443
+#: ../src/audio.c:442
 msgid "Please check audio tab for more information."
 msgstr "Por favor cheque a aba Áudio para mais informação."
 
-#: ../src/main-window.c:222
+#: ../src/main-window.c:218
 msgid "_Slideshow"
 msgstr "_Apresentação de slides"
 
-#: ../src/main-window.c:236
+#: ../src/main-window.c:232
 msgid "Import slideshow"
 msgstr "Importar apresentação de slides"
 
-#: ../src/main-window.c:260
+#: ../src/main-window.c:256
 msgid "Import p_ictures"
 msgstr "Importar _imagens"
 
-#: ../src/main-window.c:270
+#: ../src/main-window.c:266
 msgid "Import _music"
 msgstr "Importar _música"
 
-#: ../src/main-window.c:287
-msgid "_Preview"
-msgstr "_Visualização"
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Visualização"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "Importar música"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "Importar música"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Conteúdo"
 
-#: ../src/main-window.c:295
-msgid "Export"
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
 msgstr "Exportar"
 
 #. Slide menu
-#: ../src/main-window.c:310
+#: ../src/main-window.c:330
 msgid "_Slide"
 msgstr "_Slide"
 
-#. Preview quality menu
-#: ../src/main-window.c:332
-msgid "Preview quality"
-msgstr "Qualidade da visualização"
-
-#: ../src/main-window.c:338
-msgid "_Low"
-msgstr "_Baixa"
-
-#: ../src/main-window.c:342 ../src/export.c:1389 ../src/export.c:1573
-msgid "High"
-msgstr "Alta"
-
 #. Zoom controls
-#: ../src/main-window.c:346
+#: ../src/main-window.c:349
 msgid "_Zoom"
 msgstr "_Zoom"
 
@@ -165,44 +168,53 @@
 msgid "Add empt_y slide"
 msgstr "Adicionar um slide _vazio"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "Adicionar um slide _vazio"
+
+#: ../src/main-window.c:392
 msgid "Dele_te"
 msgstr "Exclui_r"
 
-#: ../src/main-window.c:390
+#: ../src/main-window.c:400
 msgid "Repor_t"
 msgstr "R_elatório"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:412
 msgid "Rotate co_unter-clockwise"
 msgstr "Rotacionar no sentido a_nti-horário"
 
-#: ../src/main-window.c:413
+#: ../src/main-window.c:423
 msgid "_Rotate clockwise"
 msgstr "Rotacionar no sentido _horário"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:435
 msgid "Un_select all"
 msgstr "De_sselecionar tudo"
 
 #. View menu
-#: ../src/main-window.c:434
+#: ../src/main-window.c:441
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/main-window.c:440
+#: ../src/main-window.c:447
 msgid "Preview mode"
 msgstr "Modo de visualização"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:453
 msgid "Overview mode"
 msgstr "Modo de visão geral"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:456
 msgid "Preview _frame rate"
 msgstr "Cadência da _visualização"
 
-#: ../src/main-window.c:469
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
@@ -210,273 +222,329 @@
 msgstr1 "%d quadros por segundo"
 
 #. Help menu
-#: ../src/main-window.c:486
+#: ../src/main-window.c:497
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/main-window.c:491
+#: ../src/main-window.c:502
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: ../src/main-window.c:512 ../src/new_slideshow.c:65
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
 msgid "Create a new slideshow"
 msgstr "Criar uma nova apresentação de slides"
 
-#: ../src/main-window.c:517
+#: ../src/main-window.c:528
 msgid "Open a slideshow"
 msgstr "Abrir uma apresentação de slides"
 
-#: ../src/main-window.c:522
+#: ../src/main-window.c:533
 msgid "Save the slideshow"
 msgstr "Salvar a apresentação de slides"
 
-#: ../src/main-window.c:535
+#: ../src/main-window.c:546
 msgid "Import pictures"
 msgstr "Importar imagens"
 
-#: ../src/main-window.c:544
+#: ../src/main-window.c:555
 msgid "Import music"
 msgstr "Importar música"
 
-#: ../src/main-window.c:549
+#: ../src/main-window.c:560
 msgid "Delete the selected slides"
 msgstr "Excluir os slides selecionados"
 
-#: ../src/main-window.c:559
+#: ../src/main-window.c:570
 msgid "Rotate the slide 90 degrees to the left"
 msgstr "Rotacionar o slide no sentido anti-horário"
 
-#: ../src/main-window.c:570
+#: ../src/main-window.c:581
 msgid "Rotate the slide 90 degrees to the right"
 msgstr "Rotacionar o slide no sentido horário"
 
-#: ../src/main-window.c:576
+#: ../src/main-window.c:587
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: ../src/main-window.c:581
+#: ../src/main-window.c:592
 msgid "Zoom Out"
 msgstr "Reduzir"
 
-#: ../src/main-window.c:586
+#: ../src/main-window.c:597
 msgid "Normal Size"
 msgstr "Tamanho normal"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:602
 msgid "Fit Zoom in Window"
 msgstr "Ajustar o zoom na janela"
 
-#: ../src/main-window.c:599 ../src/callbacks.c:1362
-msgid "Starts the preview"
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
 msgstr "Iniciar a visualização"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:619
 msgid "Go to the first slide of the slideshow"
 msgstr "Ir para o primeiro slide"
 
-#: ../src/main-window.c:614
+#: ../src/main-window.c:625
 msgid "Go to the previous slide of the slideshow"
 msgstr "Ir para o slide anterior"
 
-#: ../src/main-window.c:630 ../src/main-window.c:837
+#: ../src/main-window.c:641 ../src/main-window.c:847
 msgid " of "
 msgstr " de "
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:653
 msgid "Go to the next slide of the slideshow"
 msgstr "Ir para o próximo slide"
 
-#: ../src/main-window.c:648
+#: ../src/main-window.c:659
 msgid "Go to the last slide of the slideshow"
 msgstr "Ir para o último slide"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:708
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/main-window.c:717
+#: ../src/main-window.c:726
 msgid "<b>Slide Settings</b>"
 msgstr "<b>Configurações do slide</b>"
 
 #. Transition types label
-#: ../src/main-window.c:727
+#: ../src/main-window.c:736
 msgid "Transition Type:"
 msgstr "Tipo de transição:"
 
-#: ../src/main-window.c:747
+#: ../src/main-window.c:756
 msgid "Random"
 msgstr "Aleatória"
 
-#: ../src/main-window.c:748
+#: ../src/main-window.c:757
 msgid "Imagination randomly decides which transition to apply"
 msgstr "O Imagination aleatoriamente decide qual transição aplicar"
 
 #. Transition duration
-#: ../src/main-window.c:754
+#: ../src/main-window.c:763
 msgid "Transition Speed:"
 msgstr "Velocidade da transição:"
 
-#: ../src/main-window.c:765
+#: ../src/main-window.c:774
 msgid "Fast"
 msgstr "Rápida"
 
-#: ../src/main-window.c:767
+#: ../src/main-window.c:776
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/main-window.c:769
+#: ../src/main-window.c:778
 msgid "Slow"
 msgstr "Lenta"
 
 #. Slide duration
-#: ../src/main-window.c:776
+#: ../src/main-window.c:785
 msgid "Slide Duration in sec:"
 msgstr "Duração do slide em seg.:"
 
 #. Slide Total Duration
-#: ../src/main-window.c:787
+#: ../src/main-window.c:797
 msgid "Slideshow Length:"
 msgstr "Duração da apresentação de slides:"
 
-#: ../src/main-window.c:804
+#: ../src/main-window.c:814
 msgid "<b>Slide Motion</b>"
 msgstr "<b>Movimento do slide</b>"
 
-#: ../src/main-window.c:814
+#: ../src/main-window.c:824
 msgid "Stop Point:"
 msgstr "Ponto de parada:"
 
-#: ../src/main-window.c:851
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Ponto de parada:"
+
+#: ../src/main-window.c:869
 msgid "Duration:"
 msgstr "Duração:"
 
-#: ../src/main-window.c:860
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Ponto de parada:"
+
+#: ../src/main-window.c:891
 msgid "Zoom: "
 msgstr "Zoom: "
 
-#: ../src/main-window.c:874
-msgid "Add"
-msgstr "Adicionar"
-
-#: ../src/main-window.c:878
-msgid "Update"
-msgstr "Atualizar"
-
-#: ../src/main-window.c:883
-msgid "Remove"
-msgstr "Remover"
-
-#: ../src/main-window.c:897
+#: ../src/main-window.c:910
 msgid "<b>Slide Text</b>"
 msgstr "<b>Texto do slide</b>"
 
-#: ../src/main-window.c:926 ../src/main-window.c:1562
-msgid "Click to expand the area"
-msgstr "Clique para expandir a área"
-
-#: ../src/main-window.c:943
+#: ../src/main-window.c:944
 msgid "Click to choose the font"
 msgstr "Clique para escolher a fonte"
 
-#: ../src/main-window.c:950
+#: ../src/main-window.c:951 ../src/support.c:1176
 msgid "Click to choose the font color"
 msgstr "Clique para escolher a cor da fonte"
 
-#: ../src/main-window.c:957
-msgid "Click to choose the font background color"
-msgstr "Clique para escolher a cor de fundo da fonte"
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Clique para escolher a fonte"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Clique para escolher a cor da fonte"
 
-#: ../src/main-window.c:961
+#: ../src/main-window.c:1023
 msgid "Animation:"
 msgstr "Animação:"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:1035
 msgid "Animation Speed:"
 msgstr "Velocidade da animação:"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Movimento do slide</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Posicionamento do texto"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Posicionamento do texto"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
 msgid "Placing is relative to:"
 msgstr "Posicionamento relativo a:"
 
-#: ../src/main-window.c:1003
+#: ../src/main-window.c:1140
 msgid "Exported video"
 msgstr "Vídeo exportado"
 
-#: ../src/main-window.c:1005
+#: ../src/main-window.c:1142
 msgid "Original image"
 msgstr "Imagem original"
 
-#: ../src/main-window.c:1014
-msgid "Subtitle position:"
-msgstr "Posicionamento do texto"
-
 #. Background music frame
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:1149
 msgid "Audio"
 msgstr "Áudio"
 
-#: ../src/main-window.c:1068
+#: ../src/main-window.c:1162
 msgid "<b>Background Music</b>"
 msgstr "<b>Música de fundo</b>"
 
-#: ../src/main-window.c:1114
+#: ../src/main-window.c:1208
 msgid "Music Duration:"
 msgstr "Duração da música"
 
-#: ../src/main-window.c:1138
+#: ../src/main-window.c:1232
 msgid "Delete the selected file"
 msgstr "Excluir o arquivo selecionado"
 
-#: ../src/main-window.c:1145
+#: ../src/main-window.c:1239
 msgid "Move the selected file up"
 msgstr "Mover o arquivo selecionado para cima"
 
-#: ../src/main-window.c:1152
+#: ../src/main-window.c:1246
 msgid "Move the selected file down"
 msgstr "Mover o arquivo selecionado para baixo"
 
-#: ../src/main-window.c:1159
+#: ../src/main-window.c:1253
 msgid "Clear all files"
 msgstr "Remover todos os arquivos"
 
 #. End of Background music frame
 #. Begin of Message tab
-#: ../src/main-window.c:1164
+#: ../src/main-window.c:1258
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../src/main-window.c:1557
-msgid "Click to shrink the area"
-msgstr "Clique para reduzir a área"
-
-#: ../src/main-window.c:1589 ../src/callbacks.c:1120
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
 msgid "Sorry, I could not perform the operation!"
 msgstr "Desculpe,  mas não foi possível efetuar a operação!"
 
-#: ../src/main-window.c:1738
+#: ../src/main-window.c:1825
 #, c-format
 msgid "File '%s' not found"
 msgstr "Arquivo \"%s\" não encontrado"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Resolution"
 msgstr "Resolução"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Type"
 msgstr "Tipo"
 
 #. No animation function (id = 0)
-#: ../src/main-window.c:2062 ../src/main-window.c:2064 ../src/support.c:179
-#: ../src/subtitles.c:162
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/main-window.c:2605
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
 msgid "Slides Transitions Report Dialog"
 msgstr "Diálogo de relatório de transições de slides"
 
-#: ../src/main-window.c:2685
+#: ../src/main-window.c:2798
 msgid ""
 "\n"
 "<span weight='bold'>Note:</span>\n"
@@ -490,296 +558,394 @@
 "Slides com transições aplicadas somente uma vez não são mostrados aqui.\n"
 "Clique no slide para tê-lo automaticamente selecionado pelo Imagination."
 
-#: ../src/callbacks.c:124 ../src/callbacks.c:469 ../src/callbacks.c:1421
-#: ../src/callbacks.c:1499
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
 msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
 msgstr ""
 "Você ainda não salvou sua apresentação de slides. Tem certeza de que deseja "
 "fechá-la?"
 
-#: ../src/callbacks.c:210
+#: ../src/callbacks.c:220
 #, c-format
 msgid "Please wait, importing image %d out of %d"
 msgstr "Por favor aguarde, importando imagem %d de %d"
 
-#: ../src/callbacks.c:279
+#: ../src/callbacks.c:289
 msgid "Import audio files, use CTRL key for multiple select"
 msgstr "Importar arquivos de áudio, use a tecla CTRL para seleção múltipla"
 
-#: ../src/callbacks.c:291
+#: ../src/callbacks.c:301
 msgid "All audio files"
 msgstr "Todos os arquivos de áudio"
 
-#: ../src/callbacks.c:300 ../src/callbacks.c:375 ../src/callbacks.c:1449
-#: ../src/support.c:370
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/callbacks.c:356
+#: ../src/callbacks.c:365
 msgid "Import images, use SHIFT key for multiple select"
 msgstr "Importar imagens, use a tecla CTRL para seleção múltipla"
 
-#: ../src/callbacks.c:369
+#: ../src/callbacks.c:378
 msgid "All image files"
 msgstr "Todos os arquivos de imagens"
 
-#: ../src/callbacks.c:529
+#: ../src/callbacks.c:578
 #, c-format
 msgid "%d x %d pixels"
 msgid_plural "%d x %d pixels"
 msgstr0 "%d x %d pixel"
 msgstr1 "%d x %d pixels"
 
-#: ../src/callbacks.c:805
+#: ../src/callbacks.c:853
 msgid "translator-credits"
 msgstr ""
 "banto palmarino <bantopalmarino@nkosi.org>\n"
 "Og Maciel <ogmaciel@gnome.org>\n"
 "Sérgio Cipolla <secipolla@gmail.com>"
 
-#: ../src/callbacks.c:1372
+#: ../src/callbacks.c:1517
 msgid "Stops the preview"
 msgstr "Parar a visualização"
 
-#: ../src/callbacks.c:1432
+#: ../src/callbacks.c:1580
 msgid "Load an Imagination slideshow project"
 msgstr "Carregar um projeto de apresentação de slides do Imagination"
 
-#: ../src/callbacks.c:1433
+#: ../src/callbacks.c:1581
 msgid "Save an Imagination slideshow project"
 msgstr "Salvar um projeto de apresentação de slides do Imagination"
 
-#: ../src/callbacks.c:1443
-msgid "Imagination projects"
-msgstr "Projetos Imagination"
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Projetos Imagination (*.img)"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
 
-#: ../src/callbacks.c:2195
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "Adicionar um slide _vazio"
+
+#: ../src/callbacks.c:2498
 msgid "Create empty slide"
 msgstr "Criar um slide vazio"
 
-#: ../src/callbacks.c:2206
+#: ../src/callbacks.c:2509
 msgid "Empty slide options:"
 msgstr "Opções do slide vazio:"
 
-#: ../src/callbacks.c:2216
-msgid "Use _solid color"
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
 msgstr "Usar cor _sólida"
 
-#: ../src/callbacks.c:2222
-msgid "Use _linear gradient"
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
 msgstr "Usar gradiente _linear"
 
-#: ../src/callbacks.c:2228
-msgid "Use _radial gradient"
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
 msgstr "Usar gradiente _radial"
 
-#: ../src/callbacks.c:2258
-msgid "Preview"
-msgstr "Visualização"
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "Usar gradiente _radial"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "Por favor escolha os arquivos de áudio para importar"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Todos os arquivos"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
 
 #. Display propert title depending on the callback that is calling this function.
-#: ../src/new_slideshow.c:65
+#: ../src/new_slideshow.c:66
 msgid "Project properties"
 msgstr "Propriedades do projeto"
 
-#: ../src/new_slideshow.c:85
+#: ../src/new_slideshow.c:86
 msgid "<b>Slideshow Settings</b>"
 msgstr "<b>Configurações da apresentação de slides</b>"
 
-#: ../src/new_slideshow.c:130
-msgid "<b>Video Format</b>"
-msgstr "<b>Formato do vídeo</b>"
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "Formato do vídeo:"
 
-#: ../src/new_slideshow.c:152 ../src/export.c:1337 ../src/export.c:1524
-#: ../src/export.c:1705
-msgid "<b>Video Size</b>"
-msgstr "<b>Tamanho do vídeo</b>"
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "Tamanho do vídeo:"
 
-#: ../src/new_slideshow.c:166
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr "Quadro por segundo:"
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Formato de televisão</b>"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
 msgid "<b>Advanced Settings</b>"
 msgstr "<b>Configurações avançadas</b>"
 
-#: ../src/new_slideshow.c:173
+#: ../src/new_slideshow.c:178
 msgid "Rescale images to fit desired aspect ratio"
 msgstr "Redimensionar imagens para caber na relação de aspecto desejada"
 
-#: ../src/new_slideshow.c:179
-msgid "Select background color:"
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
 msgstr "Selecionar cor de fundo:"
 
-#: ../src/slideshow_project.c:213
+#: ../src/slideshow_project.c:265
 msgid "This is not an Imagination project file!"
 msgstr "Este não é um arquivo de projeto do Imagination!"
 
-#: ../src/slideshow_project.c:371
+#: ../src/slideshow_project.c:442
 #, c-format
 msgid "Slide %i: can't load image %s\n"
 msgstr "Slide %i: não foi possível carregar a imagem %s\n"
 
-#: ../src/slideshow_project.c:493
+#: ../src/slideshow_project.c:585
 #, c-format
 msgid "Can't load image %s\n"
 msgstr "Não foi possível carregar a imagem %s\n"
 
-#: ../src/support.c:130
+#: ../src/support.c:134
 #, c-format
 msgid "Welcome to Imagination - %d transition loaded."
 msgid_plural "Welcome to Imagination - %d transitions loaded."
 msgstr0 "Seja bem-vindo ao Imagination - %d transição carregada."
 msgstr1 "Seja bem-vindo ao Imagination - %d transições carregadas."
 
-#: ../src/support.c:141
+#: ../src/support.c:145
 #, c-format
 msgid "%d slide selected"
 msgid_plural "%d slides selected"
 msgstr0 "%d slide selecionado"
 msgstr1 "%d slides selecionados"
 
-#: ../src/support.c:152
+#: ../src/support.c:156
 #, c-format
 msgid "%d slide loaded %s"
 msgid_plural "%d slides loaded %s"
 msgstr0 "%d slide carregado %s"
 msgstr1 "%d slides carregados %s"
 
-#: ../src/support.c:156
+#: ../src/support.c:160
 msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 msgstr ""
 " - Use a tecla CTRL para selecionar/desselecionar ou SHIFT para seleção "
 "múltipla"
 
-#: ../src/support.c:322
+#: ../src/support.c:327
 msgid "Please choose the slideshow project filename"
 msgstr ""
 "Por favor escolha o nome do arquivo do projeto de apresentação de slides"
 
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures and also switches mode into
-#. * preview if needed.
-#: ../src/support.c:337 ../src/export.c:1183
-msgid "VOB (DVD video)"
-msgstr "VOB (vídeo DVD)"
-
-#: ../src/support.c:343
-msgid "MP4 (MPEG-4)"
-msgstr "MP4 (MPEG-4)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:349 ../src/export.c:1299
-msgid "OGV (Theora/Vorbis)"
-msgstr "OGV (Theora/Vorbis)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:355 ../src/export.c:1486
-msgid "FLV (Flash video)"
-msgstr "FLV (vídeo Flash)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:361 ../src/export.c:1690
-msgid "3GP (Mobile Phones)"
-msgstr "3GP (celulares)"
-
-#: ../src/subtitles.c:166
+#: ../src/subtitles.c:243
 msgid "Fade"
 msgstr "Aparecer"
 
-#: ../src/subtitles.c:170
+#: ../src/subtitles.c:247
 msgid "Slide from left"
 msgstr "Entrar da esquerda"
 
-#: ../src/subtitles.c:174
+#: ../src/subtitles.c:251
 msgid "Slide from right"
 msgstr "Entrar da direita"
 
-#: ../src/subtitles.c:178
+#: ../src/subtitles.c:255
 msgid "Slide from top"
 msgstr "Entrar do alto"
 
-#: ../src/subtitles.c:182
+#: ../src/subtitles.c:259
 msgid "Slide from bottom"
 msgstr "Entrar de baixo"
 
-#: ../src/subtitles.c:186
+#: ../src/subtitles.c:263
 msgid "Grow"
 msgstr "Crescer"
 
-#: ../src/export.c:150
+#: ../src/subtitles.c:267
+#, fuzzy
+msgid "Slide bottom to top"
+msgstr "Entrar do alto"
+
+#: ../src/subtitles.c:271
+#, fuzzy
+msgid "Slide right to left"
+msgstr "Entrar da esquerda"
+
+#: ../src/export.c:144
 msgid "<b>Export Settings</b>"
 msgstr "<b>Configurações da exportação</b>"
 
-#: ../src/export.c:164
+#: ../src/export.c:158
 msgid "Filename:"
 msgstr "Nome do arquivo"
 
-#: ../src/export.c:312
+#: ../src/export.c:306
 msgid "Exporting the slideshow"
 msgstr "Exportando a apresentação de slides"
 
-#: ../src/export.c:323
+#: ../src/export.c:318
 msgid "Preparing for export ..."
 msgstr "Preparando para exportar ..."
 
-#: ../src/export.c:334
+#: ../src/export.c:329
 msgid "Overall progress:"
 msgstr "Progresso geral:"
 
-#: ../src/export.c:424 ../src/export.c:807
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
 #, c-format
 msgid "Slide %d export progress:"
 msgstr "Progresso da exportação do slide %d:"
 
-#: ../src/export.c:661
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
 msgid "Failed to launch the encoder!"
 msgstr "Falha ao lançar o codificador!"
 
-#: ../src/export.c:805
+#: ../src/export.c:902
 #, c-format
 msgid "Final transition export progress:"
 msgstr "Progresso da exportação da transição final:"
 
-#: ../src/export.c:1195
-msgid "<b>Television Format</b>"
-msgstr "<b>Formato de televisão</b>"
+#, fuzzy
+#~ msgid "Border Bottom"
+#~ msgstr "Entrar de baixo"
 
-#: ../src/export.c:1202 ../src/export.c:1326 ../src/export.c:1513
-msgid "Normal 4:3"
-msgstr "Normal 4:3"
+#~ msgid "Click to expand the area"
+#~ msgstr "Clique para expandir a área"
 
-#: ../src/export.c:1207 ../src/export.c:1330 ../src/export.c:1517
-msgid "Widescreen 16:9"
-msgstr "Tela ampla 16:9"
+#~ msgid "Click to shrink the area"
+#~ msgstr "Clique para reduzir a área"
 
-#: ../src/export.c:1315 ../src/export.c:1502
-msgid "<b>Aspect Ratio</b>"
-msgstr "<b>Proporção de tela</b>"
+#~ msgid "_Preview"
+#~ msgstr "_Visualização"
 
-#: ../src/export.c:1373 ../src/export.c:1557
-msgid "<b>Video Quality:</b>"
-msgstr "<b>Qualidade do vídeo:</b>"
+#~ msgid "Preview quality"
+#~ msgstr "Qualidade da visualização"
 
-#: ../src/export.c:1380 ../src/export.c:1564
-msgid "Low"
-msgstr "Baixa"
+#~ msgid "_Low"
+#~ msgstr "_Baixa"
 
-#: ../src/export.c:1384 ../src/export.c:1568
-msgid "Medium"
-msgstr "Média"
+#~ msgid "High"
+#~ msgstr "Alta"
+
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Update"
+#~ msgstr "Atualizar"
+
+#~ msgid "Remove"
+#~ msgstr "Remover"
+
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Clique para escolher a cor de fundo da fonte"
 
 #, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "Proporção de tela:"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Qualidade do vídeo:</b>"
+
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (vídeo DVD)"
+
+#~ msgid "MP4 (MPEG-4)"
+#~ msgstr "MP4 (MPEG-4)"
+
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (vídeo Flash)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (celulares)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Normal 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Tela ampla 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Qualidade do vídeo:</b>"
+
+#~ msgid "Low"
+#~ msgstr "Baixa"
+
+#~ msgid "Medium"
+#~ msgstr "Média"
+
 #~ msgid "VOB (DVD Video)"
 #~ msgstr "VOB (vídeo DVD)"
 
-#, fuzzy
 #~ msgid "OGV (Theora Vorbis)"
 #~ msgstr "OGV (Theora/Vorbis)"
 
-#, fuzzy
 #~ msgid "FLV (Flash Video)"
 #~ msgstr "FLV (vídeo Flash)"
 
+#, fuzzy
+#~ msgid "low"
+#~ msgstr "Lenta"
+
 #~ msgid "Rotate the slide clockwise"
 #~ msgstr "Rotacionar o slide no sentido horário"
 
@@ -789,9 +955,6 @@
 #~ msgid "Goto last slide"
 #~ msgstr "Ir para o último slide"
 
-#~ msgid "Please choose the audio files to import"
-#~ msgstr "Por favor escolha os arquivos de áudio para importar"
-
 #~ msgid "VOB export"
 #~ msgstr "Exportar VOB"

imagination-3.4.tar.bz2/po/ru.po Added

@@ -0,0 +1,949 @@
+# Russian translations for imagination package.
+# Copyright (C) 2009 THE imagination'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the imagination package.
+#
+# Dmitry A. Levin <levin.dmi@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: imagination 1.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2009-10-09 22:10+0300\n"
+"Last-Translator: JekaDer <yourname@mail.ru>\n"
+"Language-Team: Russian <levin.dmi@gmail.com>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 0.3\n"
+
+#: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
+msgid "A DVD slideshow maker"
+msgstr "Программа для создания DVD слайд-шоу"
+
+#: ../imagination.desktop.in.h:3
+msgid "A lightweight DVD slideshow maker using GTK+2"
+msgstr "Небольшая программа для создания DVD слайд-шоу, использующая GTK+2"
+
+#: ../src/audio.c:108
+#, c-format
+msgid "Playing %s..."
+msgstr "Проиграть %s..."
+
+#: ../src/audio.c:136 ../src/main-window.c:1224
+msgid "Play the selected file"
+msgstr "Проиграть выбранный файл"
+
+#: ../src/audio.c:144
+msgid "Stop the playback"
+msgstr "Остановить"
+
+#: ../src/audio.c:271
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate\n"
+msgstr ""
+"%s:\n"
+"несовместимая частота дискретизации\n"
+
+#: ../src/audio.c:276
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible number of channels\n"
+msgstr ""
+"%s:\n"
+"несовместимое число каналлов\n"
+
+#: ../src/audio.c:282
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate and number of channels\n"
+msgstr ""
+"%s:\n"
+"несовместимая частота дискретизации и число каналлов\n"
+
+#: ../src/audio.c:302
+#, c-format
+msgid ""
+"%s\n"
+"<b>Do you want to continue without these files?</b>"
+msgstr ""
+"%s\n"
+"<b>Продолжать без этих файлов?</b>"
+
+#: ../src/audio.c:306 ../src/audio.c:453
+msgid "Audio files mismatch:"
+msgstr "Аудио файлы не совпадают:"
+
+#: ../src/audio.c:400
+msgid "Incompatible sample rate."
+msgstr "несовместимая частота дискретизации."
+
+#: ../src/audio.c:407
+msgid "Incompatible number of channels."
+msgstr "несовместимое число каналлов."
+
+#: ../src/audio.c:414
+msgid "Incompatible sample rate and number of channels."
+msgstr "несовместимая частота дискретизации и число каналлов."
+
+#: ../src/audio.c:436
+#, c-format
+msgid ""
+"File selection contains %d audio file that is incompatible with other files."
+msgid_plural ""
+"File selection contains %d audio files that are incompatible with other "
+"files."
+msgstr0 "Среди выбранных объектов есть файл, несовместимый с остальными."
+msgstr1 "Среди выбранных объектов есть файлы, несовместимые с остальными."
+msgstr2 "Среди выбранных объектов есть файлы, несовместимые с остальными."
+
+#: ../src/audio.c:442
+msgid "Please check audio tab for more information."
+msgstr "Дополнительная информация - во вкладке информация."
+
+#: ../src/main-window.c:218
+msgid "_Slideshow"
+msgstr "_Слайд-шоу"
+
+#: ../src/main-window.c:232
+#, fuzzy
+msgid "Import slideshow"
+msgstr "Экспорт слайд-шоу"
+
+#: ../src/main-window.c:256
+msgid "Import p_ictures"
+msgstr "Импортировать _изображения"
+
+#: ../src/main-window.c:266
+msgid "Import _music"
+msgstr "Импортировать _музыкальный файл"
+
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Предварительный просмотр"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "Импортировать музыкальный файл"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "Импортировать музыкальный файл"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Содержимое"
+
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
+msgstr "_Экспорт"
+
+#. Slide menu
+#: ../src/main-window.c:330
+msgid "_Slide"
+msgstr "Сл_айд"
+
+#. Zoom controls
+#: ../src/main-window.c:349
+msgid "_Zoom"
+msgstr "_Масштаб"
+
+#: ../src/main-window.c:373
+msgid "Add empt_y slide"
+msgstr "Добавить пуст_ой слайд"
+
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "Добавить пуст_ой слайд"
+
+#: ../src/main-window.c:392
+msgid "Dele_te"
+msgstr "_Удалить"
+
+#: ../src/main-window.c:400
+msgid "Repor_t"
+msgstr "Отчё_т"
+
+#: ../src/main-window.c:412
+msgid "Rotate co_unter-clockwise"
+msgstr "Повернуть п_ротив часовой стрелки"
+
+#: ../src/main-window.c:423
+msgid "_Rotate clockwise"
+msgstr "Повернуть _по часовой стрелке"
+
+#: ../src/main-window.c:435
+msgid "Un_select all"
+msgstr "_Снять выделение"
+
+#. View menu
+#: ../src/main-window.c:441
+msgid "_View"
+msgstr "_Просмотр"
+
+#: ../src/main-window.c:447
+msgid "Preview mode"
+msgstr "Предварительный просмотр"
+
+#: ../src/main-window.c:453
+msgid "Overview mode"
+msgstr "Режим обзора"
+
+#: ../src/main-window.c:456
+#, fuzzy
+msgid "Preview _frame rate"
+msgstr "Предварительный просмотр"
+
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
+#, c-format
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#. Help menu
+#: ../src/main-window.c:497
+msgid "_Help"
+msgstr "_Помощь"
+
+#: ../src/main-window.c:502
+msgid "Contents"
+msgstr "Содержимое"
+
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
+msgid "Create a new slideshow"
+msgstr "Создать новое слайд-шоу"
+
+#: ../src/main-window.c:528
+msgid "Open a slideshow"
+msgstr "Открыть слайд-шоу"
+
+#: ../src/main-window.c:533
+msgid "Save the slideshow"
+msgstr "Сохранить слайд-шоу"
+
+#: ../src/main-window.c:546
+msgid "Import pictures"
+msgstr "Импортировать изображения"
+
+#: ../src/main-window.c:555
+msgid "Import music"
+msgstr "Импортировать музыкальный файл"
+
+#: ../src/main-window.c:560
+msgid "Delete the selected slides"
+msgstr "Удалить выбранные слайды"
+
+#: ../src/main-window.c:570
+#, fuzzy
+msgid "Rotate the slide 90 degrees to the left"
+msgstr "Повернуть слайд против часовой стрелки"
+
+#: ../src/main-window.c:581
+msgid "Rotate the slide 90 degrees to the right"
+msgstr ""
+
+#: ../src/main-window.c:587
+msgid "Zoom In"
+msgstr "Приблизить"
+
+#: ../src/main-window.c:592
+msgid "Zoom Out"
+msgstr "Удалить"
+
+#: ../src/main-window.c:597
+msgid "Normal Size"
+msgstr "Нормальный размер"
+
+#: ../src/main-window.c:602
+msgid "Fit Zoom in Window"
+msgstr ""
+
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
+msgstr "Запустить предварительный просмотр"
+
+#: ../src/main-window.c:619
+#, fuzzy
+msgid "Go to the first slide of the slideshow"
+msgstr "Имя файла слайд-шоу:"
+
+#: ../src/main-window.c:625
+#, fuzzy
+msgid "Go to the previous slide of the slideshow"
+msgstr "Перейти к предыдущему выбранному слайду"
+
+#: ../src/main-window.c:641 ../src/main-window.c:847
+msgid " of "
+msgstr " из "
+
+#: ../src/main-window.c:653
+#, fuzzy
+msgid "Go to the next slide of the slideshow"
+msgstr "Перейти к следующему выбранному слайду"
+
+#: ../src/main-window.c:659
+#, fuzzy
+msgid "Go to the last slide of the slideshow"
+msgstr "Имя файла слайд-шоу:"
+
+#: ../src/main-window.c:708
+msgid "Video"
+msgstr "Видео"
+
+#: ../src/main-window.c:726
+msgid "<b>Slide Settings</b>"
+msgstr "<b>Параметры слайда</b>"
+
+#. Transition types label
+#: ../src/main-window.c:736
+msgid "Transition Type:"
+msgstr "Тип перехода:"
+
+#: ../src/main-window.c:756
+msgid "Random"
+msgstr "Произвольный"
+
+#: ../src/main-window.c:757
+msgid "Imagination randomly decides which transition to apply"
+msgstr "Imagination применит произвольный переход"
+
+#. Transition duration
+#: ../src/main-window.c:763
+msgid "Transition Speed:"
+msgstr "Скорость перехода:"
+
+#: ../src/main-window.c:774
+msgid "Fast"
+msgstr "Быстро"
+
+#: ../src/main-window.c:776
+msgid "Normal"
+msgstr "Нормально"
+
+#: ../src/main-window.c:778
+msgid "Slow"
+msgstr "Медленно"
+
+#. Slide duration
+#: ../src/main-window.c:785
+msgid "Slide Duration in sec:"
+msgstr "Длительность показа слайда в секундах:"
+
+#. Slide Total Duration
+#: ../src/main-window.c:797
+msgid "Slideshow Length:"
+msgstr "Продолжительность Слайд-шоу:"
+
+#: ../src/main-window.c:814
+msgid "<b>Slide Motion</b>"
+msgstr "<b>Параметры анимации</b>"
+
+#: ../src/main-window.c:824
+msgid "Stop Point:"
+msgstr "Точка остановки:"
+
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Точка остановки:"
+
+#: ../src/main-window.c:869
+msgid "Duration:"
+msgstr "Длительность:"
+
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Точка остановки:"
+
+#: ../src/main-window.c:891
+msgid "Zoom: "
+msgstr "Масштаб: "
+
+#: ../src/main-window.c:910
+msgid "<b>Slide Text</b>"
+msgstr "<b>Текст слайда</b>"
+
+#: ../src/main-window.c:944
+msgid "Click to choose the font"
+msgstr "Нажмите, чтобы выбрать шрифт"
+
+#: ../src/main-window.c:951 ../src/support.c:1176
+#, fuzzy
+msgid "Click to choose the font color"
+msgstr "Нажмите, чтобы выбрать шрифт"
+
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Нажмите, чтобы выбрать шрифт"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Нажмите, чтобы выбрать шрифт"
+
+#: ../src/main-window.c:1023
+msgid "Animation:"
+msgstr "Анимация:"
+
+#: ../src/main-window.c:1035
+msgid "Animation Speed:"
+msgstr "Скорость анимации:"
+
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Параметры анимации</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Положение субтитров:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Положение субтитров:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
+msgid "Placing is relative to:"
+msgstr "Расположить относительно:"
+
+#: ../src/main-window.c:1140
+msgid "Exported video"
+msgstr "Экспортированное видео"
+
+#: ../src/main-window.c:1142
+msgid "Original image"
+msgstr "Исходное изображение"
+
+#. Background music frame
+#: ../src/main-window.c:1149
+msgid "Audio"
+msgstr "Аудио"
+
+#: ../src/main-window.c:1162
+msgid "<b>Background Music</b>"
+msgstr "<b>Фоновая музыка</b>"
+
+#: ../src/main-window.c:1208
+msgid "Music Duration:"
+msgstr "Длительность звучания:"
+
+#: ../src/main-window.c:1232
+msgid "Delete the selected file"
+msgstr "Удалить выбранный файл"
+
+#: ../src/main-window.c:1239
+msgid "Move the selected file up"
+msgstr "Переместить выбранный файл выше"
+
+#: ../src/main-window.c:1246
+msgid "Move the selected file down"
+msgstr "Переместить выбранный файл ниже"
+
+#: ../src/main-window.c:1253
+msgid "Clear all files"
+msgstr "Очистить список файлов"
+
+#. End of Background music frame
+#. Begin of Message tab
+#: ../src/main-window.c:1258
+msgid "Messages"
+msgstr ""
+
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
+msgid "Sorry, I could not perform the operation!"
+msgstr "Не удалось выполнить данное действие!"
+
+#: ../src/main-window.c:1825
+#, c-format
+msgid "File '%s' not found"
+msgstr ""
+
+#: ../src/main-window.c:1834
+msgid "Resolution"
+msgstr "Разрешение"
+
+#: ../src/main-window.c:1834
+msgid "Type"
+msgstr "Тип"
+
+#. No animation function (id = 0)
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
+msgid "None"
+msgstr "Ничего"
+
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
+msgid "Slides Transitions Report Dialog"
+msgstr "Диалог отчётов о переходах между слайдами"
+
+#: ../src/main-window.c:2798
+msgid ""
+"\n"
+"<span weight='bold'>Note:</span>\n"
+"\n"
+"Slides whose transition is applied only once are not shown here.\n"
+"Click on the slide to have Imagination automatically select it."
+msgstr ""
+"\n"
+"<span weight='bold'>Примечание:</span>\n"
+"\n"
+"Слайды, для которых переходы применены только один раз, здесь не показаны.\n"
+"Нажмите на слайд, чтобы Imagination автоматически выбрал его."
+
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
+msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
+msgstr "Вы не сохранили свое слайд-шоу. Уверены, что хотите завершить работу?"
+
+#: ../src/callbacks.c:220
+#, fuzzy, c-format
+msgid "Please wait, importing image %d out of %d"
+msgstr "Пожалуйста, подождите. Идет вывод слайда %d в %d"
+
+#: ../src/callbacks.c:289
+#, fuzzy
+msgid "Import audio files, use CTRL key for multiple select"
+msgstr "Импорт слайдов, используйте SHIFT для выбора нескольких файлов"
+
+#: ../src/callbacks.c:301
+msgid "All audio files"
+msgstr "Все аудио файлы"
+
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
+msgid "All files"
+msgstr "Все файлы"
+
+#: ../src/callbacks.c:365
+#, fuzzy
+msgid "Import images, use SHIFT key for multiple select"
+msgstr "Импорт слайдов, используйте SHIFT для выбора нескольких файлов"
+
+#: ../src/callbacks.c:378
+msgid "All image files"
+msgstr "Все графические файлы"
+
+#: ../src/callbacks.c:578
+#, c-format
+msgid "%d x %d pixels"
+msgid_plural "%d x %d pixels"
+msgstr0 "%d x %d pixels"
+msgstr1 "%d x %d pixels"
+msgstr2 "%d x %d pixels"
+
+#: ../src/callbacks.c:853
+msgid "translator-credits"
+msgstr "Переводчики"
+
+#: ../src/callbacks.c:1517
+msgid "Stops the preview"
+msgstr "Остановить просмотр"
+
+#: ../src/callbacks.c:1580
+msgid "Load an Imagination slideshow project"
+msgstr "Загрузить проект"
+
+#: ../src/callbacks.c:1581
+msgid "Save an Imagination slideshow project"
+msgstr "Сохранить проект"
+
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Imagination"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "Добавить пуст_ой слайд"
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Create empty slide"
+msgstr "Создать новый слайд"
+
+#: ../src/callbacks.c:2509
+msgid "Empty slide options:"
+msgstr "Параметры пустого слайда:"
+
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
+msgstr "Использовать _сплошную заливку"
+
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
+msgstr "Использовать _линейный градиент"
+
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
+msgstr "Использовать _радиальный градиент"
+
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "Использовать _радиальный градиент"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "Пожалуйста, выберите аудио файлы для импорта"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Все файлы"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
+
+#. Display propert title depending on the callback that is calling this function.
+#: ../src/new_slideshow.c:66
+msgid "Project properties"
+msgstr "Свойства проекта"
+
+#: ../src/new_slideshow.c:86
+msgid "<b>Slideshow Settings</b>"
+msgstr "<b>Параметры Слайд-шоу</b>"
+
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "<b>Видео формат</b>"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+#, fuzzy
+msgid "Video Size:"
+msgstr "<b>Размер видео</b>"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr ""
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Телевизионный формат</b>"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
+msgid "<b>Advanced Settings</b>"
+msgstr "<b>Дополнительные параметры</b>"
+
+#: ../src/new_slideshow.c:178
+msgid "Rescale images to fit desired aspect ratio"
+msgstr "Изменять размер изображений с учетом выбранных пропорций"
+
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
+msgstr "Выберите цвет фона:"
+
+#: ../src/slideshow_project.c:265
+msgid "This is not an Imagination project file!"
+msgstr "Этот файл не является проектом Imagination!"
+
+#: ../src/slideshow_project.c:442
+#, c-format
+msgid "Slide %i: can't load image %s\n"
+msgstr ""
+
+#: ../src/slideshow_project.c:585
+#, c-format
+msgid "Can't load image %s\n"
+msgstr ""
+
+#: ../src/support.c:134
+#, fuzzy, c-format
+msgid "Welcome to Imagination - %d transition loaded."
+msgid_plural "Welcome to Imagination - %d transitions loaded."
+msgstr0 "Добро пожаловать в Imagination. Загружено переходов - %d."
+msgstr1 "Добро пожаловать в Imagination. Загружено переходов - %d."
+msgstr2 "Добро пожаловать в Imagination. Загружено переходов - %d."
+
+#: ../src/support.c:145
+#, fuzzy, c-format
+msgid "%d slide selected"
+msgid_plural "%d slides selected"
+msgstr0 "Выбрано слайдов - %d"
+msgstr1 "Выбрано слайдов - %d"
+msgstr2 "Выбрано слайдов - %d"
+
+#: ../src/support.c:156
+#, fuzzy, c-format
+msgid "%d slide loaded %s"
+msgid_plural "%d slides loaded %s"
+msgstr0 "%d слайдов загружено %s"
+msgstr1 "Выбрано слайдов - %d"
+msgstr2 "Выбрано слайдов - %d"
+
+#: ../src/support.c:160
+msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
+msgstr ""
+" - Используйте клавишу CTRL для установки/снятия отметки или SHIFT для "
+"выбора нескольких позиций"
+
+#: ../src/support.c:327
+msgid "Please choose the slideshow project filename"
+msgstr "Пожалуйста, укажите имя файла проекта"
+
+#: ../src/subtitles.c:243
+msgid "Fade"
+msgstr ""
+
+#: ../src/subtitles.c:247
+msgid "Slide from left"
+msgstr ""
+
+#: ../src/subtitles.c:251
+msgid "Slide from right"
+msgstr ""
+
+#: ../src/subtitles.c:255
+msgid "Slide from top"
+msgstr ""
+
+#: ../src/subtitles.c:259
+msgid "Slide from bottom"
+msgstr ""
+
+#: ../src/subtitles.c:263
+msgid "Grow"
+msgstr ""
+
+#: ../src/subtitles.c:267
+msgid "Slide bottom to top"
+msgstr ""
+
+#: ../src/subtitles.c:271
+msgid "Slide right to left"
+msgstr ""
+
+#: ../src/export.c:144
+msgid "<b>Export Settings</b>"
+msgstr "<b>Параметры экспорта</b>"
+
+#: ../src/export.c:158
+msgid "Filename:"
+msgstr ""
+
+#: ../src/export.c:306
+msgid "Exporting the slideshow"
+msgstr "Экспорт слайд-шоу"
+
+#: ../src/export.c:318
+msgid "Preparing for export ..."
+msgstr "Подготовка к экспорту ..."
+
+#: ../src/export.c:329
+msgid "Overall progress:"
+msgstr "Состояние:"
+
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
+#, c-format
+msgid "Slide %d export progress:"
+msgstr "Состояние экспорта слайда %d:"
+
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
+msgid "Failed to launch the encoder!"
+msgstr "Ошибка запуска кодека!"
+
+#: ../src/export.c:902
+#, c-format
+msgid "Final transition export progress:"
+msgstr "Состояние экспорта переходов:"
+
+#~ msgid "Click to expand the area"
+#~ msgstr "Нажмите, чтобы расширить область"
+
+#~ msgid "Click to shrink the area"
+#~ msgstr "Нажмите, чтобы уменьшить область"
+
+#~ msgid "_Preview"
+#~ msgstr "_Предварительный просмотр"
+
+#~ msgid "Preview quality"
+#~ msgstr "Качество предварительного просмотра"
+
+#~ msgid "_Low"
+#~ msgstr "_Низкое"
+
+#~ msgid "High"
+#~ msgstr "Высокое"
+
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Update"
+#~ msgstr "Обновить"
+
+#~ msgid "Remove"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Нажмите, чтобы выбрать шрифт"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "<b>Параметры анимации</b>"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Качество видео:</b>"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Нормально 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Широкий экран 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Качество видео:</b>"
+
+#~ msgid "Low"
+#~ msgstr "Низкое"
+
+#~ msgid "Medium"
+#~ msgstr "Среднее"
+
+#~ msgid "Rotate the slide clockwise"
+#~ msgstr "Повернуть слайд по часовой стрелке"
+
+#~ msgid "Goto first slide"
+#~ msgstr "Перейти к первому слайду"
+
+#~ msgid "Goto last slide"
+#~ msgstr "Перейти к последнему слайду"
+
+#~ msgid "VOB export"
+#~ msgstr "Экспорт VOB"
+
+#~ msgid "OGG export"
+#~ msgstr "Экспорт OGG"
+
+#~ msgid "FLV export"
+#~ msgstr "Экспорт FLV"
+
+#~ msgid "An error occurred while trying to rotate the slide:"
+#~ msgstr "Ошибка при повороте слайда:"
+
+#~ msgid "Jump to the entered slide number"
+#~ msgstr "Перейти к слайду с указанным номером"
+
+#~ msgid "Slide Number:"
+#~ msgstr "Номер слайда:"

imagination-3.4.tar.bz2/po/sl_SI.po Added

@@ -0,0 +1,945 @@
+# Slovenian translations for imagination package.
+# Copyright (C) 2009 THE imagination'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the imagination package.
+# tadeboro <tadeboro@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: imagination 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2009-02-24 11:55+0100\n"
+"Last-Translator: tadeboro <tadeboro@gmail.com>\n"
+"Language-Team: Slovenian\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
+
+#: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Domišljija"
+
+#: ../imagination.desktop.in.h:2
+msgid "A DVD slideshow maker"
+msgstr "Program za izdelavo DVD diaprojekcij"
+
+#: ../imagination.desktop.in.h:3
+msgid "A lightweight DVD slideshow maker using GTK+2"
+msgstr "Lahki GTK+2 program za izdelavo DVD diaprojekcij"
+
+#: ../src/audio.c:108
+#, c-format
+msgid "Playing %s..."
+msgstr "Predvajam %s ..."
+
+#: ../src/audio.c:136 ../src/main-window.c:1224
+msgid "Play the selected file"
+msgstr "Predvajaj izbrano datoteko"
+
+#: ../src/audio.c:144
+msgid "Stop the playback"
+msgstr "Ustavi predvajanje"
+
+#: ../src/audio.c:271
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate\n"
+msgstr ""
+"%s:\n"
+"nezdružljiva frekvenca vzorčenja\n"
+
+#: ../src/audio.c:276
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible number of channels\n"
+msgstr ""
+"%s\n"
+"nezdružljivo število kanalov\n"
+
+#: ../src/audio.c:282
+#, c-format
+msgid ""
+"%s:\n"
+"incompatible sample rate and number of channels\n"
+msgstr ""
+"%s\n"
+"nezdružljiva frekvenca vzorčenja in število kanalov\n"
+
+#: ../src/audio.c:302
+#, c-format
+msgid ""
+"%s\n"
+"<b>Do you want to continue without these files?</b>"
+msgstr ""
+"%s\n"
+"<b>Želite nadaljevati brez navedenih datotek?</b>"
+
+#: ../src/audio.c:306 ../src/audio.c:453
+msgid "Audio files mismatch:"
+msgstr "Nezdružljivost glasbenih datotek:"
+
+#: ../src/audio.c:400
+msgid "Incompatible sample rate."
+msgstr "Nezdružljiva frekvenca vzorčenja."
+
+#: ../src/audio.c:407
+msgid "Incompatible number of channels."
+msgstr "Nezdružljivo število kanalov."
+
+#: ../src/audio.c:414
+msgid "Incompatible sample rate and number of channels."
+msgstr "Nezdružljiva frekvenca vzorčenja in število kanalov."
+
+#: ../src/audio.c:436
+#, c-format
+msgid ""
+"File selection contains %d audio file that is incompatible with other files."
+msgid_plural ""
+"File selection contains %d audio files that are incompatible with other "
+"files."
+msgstr0 "Med izbranimi datotekami je %d nezdružljiva z ostalimi."
+msgstr1 "Med izbranimi datotekami sta %d nezdružljivi z ostalimi."
+msgstr2 "Med izbranimi datotekami so %d nezdružljive z ostalimi."
+msgstr3 "Med izbranimi datotekami jih je %d nezdružljivih z ostalimi."
+
+#: ../src/audio.c:442
+msgid "Please check audio tab for more information."
+msgstr "Preverite audio zavihek za več informacij."
+
+#: ../src/main-window.c:218
+msgid "_Slideshow"
+msgstr "_Diaprojekcija"
+
+#: ../src/main-window.c:232
+#, fuzzy
+msgid "Import slideshow"
+msgstr "Izvažam diaprojekcijo"
+
+#: ../src/main-window.c:256
+msgid "Import p_ictures"
+msgstr "Uvozi _fotografije"
+
+#: ../src/main-window.c:266
+msgid "Import _music"
+msgstr "_Uvozi glasbo"
+
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Predogled"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "Uvozi glasbo"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "Uvozi glasbo"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Vsebina"
+
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
+msgstr "Izvoz"
+
+#. Slide menu
+#: ../src/main-window.c:330
+msgid "_Slide"
+msgstr "Di_apozitiv"
+
+#. Zoom controls
+#: ../src/main-window.c:349
+msgid "_Zoom"
+msgstr "Po_večava"
+
+#: ../src/main-window.c:373
+msgid "Add empt_y slide"
+msgstr "Dodaj prazen diapozitiv"
+
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "Dodaj prazen diapozitiv"
+
+#: ../src/main-window.c:392
+msgid "Dele_te"
+msgstr "_Zbriši"
+
+#: ../src/main-window.c:400
+msgid "Repor_t"
+msgstr "Po_ročilo"
+
+#: ../src/main-window.c:412
+msgid "Rotate co_unter-clockwise"
+msgstr "Zavrti proti smeri _urinega kazalca"
+
+#: ../src/main-window.c:423
+msgid "_Rotate clockwise"
+msgstr "Zav_rti v smeri urinega kazalca"
+
+#: ../src/main-window.c:435
+msgid "Un_select all"
+msgstr "Počis_ti izbor"
+
+#. View menu
+#: ../src/main-window.c:441
+msgid "_View"
+msgstr "_Pogled"
+
+#: ../src/main-window.c:447
+msgid "Preview mode"
+msgstr "Predogled"
+
+#: ../src/main-window.c:453
+msgid "Overview mode"
+msgstr "Pregled"
+
+#: ../src/main-window.c:456
+#, fuzzy
+msgid "Preview _frame rate"
+msgstr "Predogled"
+
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
+#, c-format
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#. Help menu
+#: ../src/main-window.c:497
+msgid "_Help"
+msgstr "_Pomoč"
+
+#: ../src/main-window.c:502
+msgid "Contents"
+msgstr "Vsebina"
+
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
+msgid "Create a new slideshow"
+msgstr "Ustvari novo diaprojekcijo"
+
+#: ../src/main-window.c:528
+msgid "Open a slideshow"
+msgstr "Odpri diaprojekcijo"
+
+#: ../src/main-window.c:533
+msgid "Save the slideshow"
+msgstr "Shrani diaprojekcijo"
+
+#: ../src/main-window.c:546
+msgid "Import pictures"
+msgstr "Uvozi fotografije"
+
+#: ../src/main-window.c:555
+msgid "Import music"
+msgstr "Uvozi glasbo"
+
+#: ../src/main-window.c:560
+msgid "Delete the selected slides"
+msgstr "Zbriši izbrane diapozitive"
+
+#: ../src/main-window.c:570
+#, fuzzy
+msgid "Rotate the slide 90 degrees to the left"
+msgstr "Zavrti proti smeri urinega kazalca"
+
+#: ../src/main-window.c:581
+msgid "Rotate the slide 90 degrees to the right"
+msgstr ""
+
+#: ../src/main-window.c:587
+msgid "Zoom In"
+msgstr "Povečaj"
+
+#: ../src/main-window.c:592
+msgid "Zoom Out"
+msgstr "Pomanjšaj"
+
+#: ../src/main-window.c:597
+msgid "Normal Size"
+msgstr "Normalna velikost"
+
+#: ../src/main-window.c:602
+msgid "Fit Zoom in Window"
+msgstr ""
+
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
+msgstr "Požene predogled"
+
+#: ../src/main-window.c:619
+#, fuzzy
+msgid "Go to the first slide of the slideshow"
+msgstr "Ime datoteke z diaprojekcijo:"
+
+#: ../src/main-window.c:625
+#, fuzzy
+msgid "Go to the previous slide of the slideshow"
+msgstr "Pojdi na prejšnji diapozitiv"
+
+#: ../src/main-window.c:641 ../src/main-window.c:847
+msgid " of "
+msgstr " od "
+
+#: ../src/main-window.c:653
+#, fuzzy
+msgid "Go to the next slide of the slideshow"
+msgstr "Pojdi na naslednji diapozitiv"
+
+#: ../src/main-window.c:659
+#, fuzzy
+msgid "Go to the last slide of the slideshow"
+msgstr "Ime datoteke z diaprojekcijo:"
+
+#: ../src/main-window.c:708
+msgid "Video"
+msgstr "Video"
+
+#: ../src/main-window.c:726
+msgid "<b>Slide Settings</b>"
+msgstr "<b>Nastavitve diapozitiva</b>"
+
+#. Transition types label
+#: ../src/main-window.c:736
+msgid "Transition Type:"
+msgstr "Vrsta prehoda:"
+
+#: ../src/main-window.c:756
+msgid "Random"
+msgstr "Naključno"
+
+#: ../src/main-window.c:757
+msgid "Imagination randomly decides which transition to apply"
+msgstr "Domišljija naključno izbere prehod"
+
+#. Transition duration
+#: ../src/main-window.c:763
+msgid "Transition Speed:"
+msgstr "Histrost prehoda:"
+
+#: ../src/main-window.c:774
+msgid "Fast"
+msgstr "Hitro"
+
+#: ../src/main-window.c:776
+msgid "Normal"
+msgstr "Normalno"
+
+#: ../src/main-window.c:778
+msgid "Slow"
+msgstr "Počasi"
+
+#. Slide duration
+#: ../src/main-window.c:785
+msgid "Slide Duration in sec:"
+msgstr "Trajanje diapozitiva v sek:"
+
+#. Slide Total Duration
+#: ../src/main-window.c:797
+msgid "Slideshow Length:"
+msgstr "Trajanje diaprojekcije:"
+
+#: ../src/main-window.c:814
+msgid "<b>Slide Motion</b>"
+msgstr "<b>Gibanje diapozitiva</b>"
+
+#: ../src/main-window.c:824
+msgid "Stop Point:"
+msgstr "Postajališče:"
+
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Postajališče:"
+
+#: ../src/main-window.c:869
+msgid "Duration:"
+msgstr "Trajanje:"
+
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Postajališče:"
+
+#: ../src/main-window.c:891
+msgid "Zoom: "
+msgstr "Povečava:"
+
+#: ../src/main-window.c:910
+msgid "<b>Slide Text</b>"
+msgstr "<b>Besedilo diapozitiva</b>"
+
+#: ../src/main-window.c:944
+msgid "Click to choose the font"
+msgstr "Izberi pisavo"
+
+#: ../src/main-window.c:951 ../src/support.c:1176
+#, fuzzy
+msgid "Click to choose the font color"
+msgstr "Izberi pisavo"
+
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Izberi pisavo"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Izberi pisavo"
+
+#: ../src/main-window.c:1023
+msgid "Animation:"
+msgstr "Animacija:"
+
+#: ../src/main-window.c:1035
+msgid "Animation Speed:"
+msgstr "Histrost animacije:"
+
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Gibanje diapozitiva</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Položaj besedila:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Položaj besedila:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
+msgid "Placing is relative to:"
+msgstr "Položaj relativno na:"
+
+#: ../src/main-window.c:1140
+msgid "Exported video"
+msgstr "Izvoženi video"
+
+#: ../src/main-window.c:1142
+msgid "Original image"
+msgstr "Izvorna slika"
+
+#. Background music frame
+#: ../src/main-window.c:1149
+msgid "Audio"
+msgstr "Glasba"
+
+#: ../src/main-window.c:1162
+msgid "<b>Background Music</b>"
+msgstr "<b>Glasbena podlaga</b>"
+
+#: ../src/main-window.c:1208
+msgid "Music Duration:"
+msgstr "Trajanje glasbene podlage:"
+
+#: ../src/main-window.c:1232
+msgid "Delete the selected file"
+msgstr "Zbriši izbrane datoteke"
+
+#: ../src/main-window.c:1239
+msgid "Move the selected file up"
+msgstr "Premakni izbrano datoteko navzgor"
+
+#: ../src/main-window.c:1246
+msgid "Move the selected file down"
+msgstr "Premakni izbrano datoteko navzdol"
+
+#: ../src/main-window.c:1253
+msgid "Clear all files"
+msgstr "Počisti datoteke"
+
+#. End of Background music frame
+#. Begin of Message tab
+#: ../src/main-window.c:1258
+msgid "Messages"
+msgstr ""
+
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
+msgid "Sorry, I could not perform the operation!"
+msgstr "Na žalost operacije ne morem izvesti!"
+
+#: ../src/main-window.c:1825
+#, c-format
+msgid "File '%s' not found"
+msgstr ""
+
+#: ../src/main-window.c:1834
+msgid "Resolution"
+msgstr "Ločljivost"
+
+#: ../src/main-window.c:1834
+msgid "Type"
+msgstr "Tip"
+
+#. No animation function (id = 0)
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
+msgid "None"
+msgstr "Brez"
+
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
+msgid "Slides Transitions Report Dialog"
+msgstr "Poročilo o uporabljenih prehodih"
+
+#: ../src/main-window.c:2798
+msgid ""
+"\n"
+"<span weight='bold'>Note:</span>\n"
+"\n"
+"Slides whose transition is applied only once are not shown here.\n"
+"Click on the slide to have Imagination automatically select it."
+msgstr ""
+"\n"
+"<span weight='bold'>Note:</span>\n"
+"Prehodi, ki so uporabljeni le enkrat, niso prikazani.\n"
+"Kliknite diapozitiv, če ga želite prikazati v urejevalniku."
+
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
+msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
+msgstr "Projekt ni bil shranjen. Ste prepričani da ga želite zapreti?"
+
+#: ../src/callbacks.c:220
+#, fuzzy, c-format
+msgid "Please wait, importing image %d out of %d"
+msgstr "Uvažam diapozitiv %d od %d, prosimo počakajte"
+
+#: ../src/callbacks.c:289
+#, fuzzy
+msgid "Import audio files, use CTRL key for multiple select"
+msgstr "Uvoz diapozitivov, uporabite SHIFT za izbor večih slik"
+
+#: ../src/callbacks.c:301
+msgid "All audio files"
+msgstr "Vse glasbene datoteke"
+
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
+msgid "All files"
+msgstr "Vse datoteke"
+
+#: ../src/callbacks.c:365
+#, fuzzy
+msgid "Import images, use SHIFT key for multiple select"
+msgstr "Uvoz diapozitivov, uporabite SHIFT za izbor večih slik"
+
+#: ../src/callbacks.c:378
+msgid "All image files"
+msgstr "Vse slikovne datoteke"
+
+#: ../src/callbacks.c:578
+#, c-format
+msgid "%d x %d pixels"
+msgid_plural "%d x %d pixels"
+msgstr0 "%d x %d pika"
+msgstr1 "%d x %d piki"
+msgstr2 "%d x %d pike"
+msgstr3 "%d x %d pik"
+
+#: ../src/callbacks.c:853
+msgid "translator-credits"
+msgstr "Tadej Borovšak <tadeboro@gmail.com>"
+
+#: ../src/callbacks.c:1517
+msgid "Stops the preview"
+msgstr "Ustavi predogled"
+
+#: ../src/callbacks.c:1580
+msgid "Load an Imagination slideshow project"
+msgstr "Odpri Domišljijin projekt"
+
+#: ../src/callbacks.c:1581
+msgid "Save an Imagination slideshow project"
+msgstr "Shrani Domišljijin projekt"
+
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Domišljija"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "Dodaj prazen diapozitiv"
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Create empty slide"
+msgstr "Ustvari nov diapozitiv"
+
+#: ../src/callbacks.c:2509
+msgid "Empty slide options:"
+msgstr "Možnosti praznega diapozitiva:"
+
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
+msgstr "Uporabi či_sto barvo"
+
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
+msgstr "Uporabi _linearni gradient"
+
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
+msgstr "Uporabi _radialni gradient"
+
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "Uporabi _radialni gradient"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "Prosimo izberite glasbene datoteke za uvoz"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Vse datoteke"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
+
+#. Display propert title depending on the callback that is calling this function.
+#: ../src/new_slideshow.c:66
+msgid "Project properties"
+msgstr "Lastnosti projekta"
+
+#: ../src/new_slideshow.c:86
+msgid "<b>Slideshow Settings</b>"
+msgstr "<b>Nastavitve diaprojekcije</b>"
+
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "<b>Video oblika</b>"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+#, fuzzy
+msgid "Video Size:"
+msgstr "<b>Velikost videa:</b>"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr ""
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Televizijska oblika</b>"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
+msgid "<b>Advanced Settings</b>"
+msgstr "<b>Napredne nastavitve</b>"
+
+#: ../src/new_slideshow.c:178
+msgid "Rescale images to fit desired aspect ratio"
+msgstr "Preoblikuj slike da ustrezajo obliki izvoza"
+
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
+msgstr "Izberite barvo ozadja:"
+
+#: ../src/slideshow_project.c:265
+msgid "This is not an Imagination project file!"
+msgstr "Izbrana datoteka ni Domišljijin projekt!"
+
+#: ../src/slideshow_project.c:442
+#, c-format
+msgid "Slide %i: can't load image %s\n"
+msgstr ""
+
+#: ../src/slideshow_project.c:585
+#, c-format
+msgid "Can't load image %s\n"
+msgstr ""
+
+#: ../src/support.c:134
+#, fuzzy, c-format
+msgid "Welcome to Imagination - %d transition loaded."
+msgid_plural "Welcome to Imagination - %d transitions loaded."
+msgstr0 "Dobrodošli v Domišljiji - %d prehodov naloženih."
+msgstr1 "Dobrodošli v Domišljiji - %d prehodov naloženih."
+msgstr2 "Dobrodošli v Domišljiji - %d prehodov naloženih."
+msgstr3 "Dobrodošli v Domišljiji - %d prehodov naloženih."
+
+#: ../src/support.c:145
+#, fuzzy, c-format
+msgid "%d slide selected"
+msgid_plural "%d slides selected"
+msgstr0 "%d diapozitivov izbranih"
+msgstr1 "%d diapozitivov izbranih"
+msgstr2 "%d diapozitivov izbranih"
+msgstr3 "%d diapozitivov izbranih"
+
+#: ../src/support.c:156
+#, fuzzy, c-format
+msgid "%d slide loaded %s"
+msgid_plural "%d slides loaded %s"
+msgstr0 "%d diapozitiv uvožen %s"
+msgstr1 "%d diapozitiva uvožena %s"
+msgstr2 "%d diapozitivi uvoženi %s"
+msgstr3 "%d diapozitivov uvoženih %s"
+
+#: ../src/support.c:160
+msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
+msgstr " - Uporabite CTRL za posamično izbiranje ali SHIFT za izbiro večih"
+
+#: ../src/support.c:327
+msgid "Please choose the slideshow project filename"
+msgstr "Prosimo izberite ime projekta"
+
+#: ../src/subtitles.c:243
+msgid "Fade"
+msgstr ""
+
+#: ../src/subtitles.c:247
+msgid "Slide from left"
+msgstr ""
+
+#: ../src/subtitles.c:251
+msgid "Slide from right"
+msgstr ""
+
+#: ../src/subtitles.c:255
+msgid "Slide from top"
+msgstr ""
+
+#: ../src/subtitles.c:259
+msgid "Slide from bottom"
+msgstr ""
+
+#: ../src/subtitles.c:263
+msgid "Grow"
+msgstr ""
+
+#: ../src/subtitles.c:267
+msgid "Slide bottom to top"
+msgstr ""
+
+#: ../src/subtitles.c:271
+msgid "Slide right to left"
+msgstr ""
+
+#: ../src/export.c:144
+msgid "<b>Export Settings</b>"
+msgstr "<b>Nastavitve izvoza</b>"
+
+#: ../src/export.c:158
+msgid "Filename:"
+msgstr ""
+
+#: ../src/export.c:306
+msgid "Exporting the slideshow"
+msgstr "Izvažam diaprojekcijo"
+
+#: ../src/export.c:318
+msgid "Preparing for export ..."
+msgstr "Pripravljam za izvoz ..."
+
+#: ../src/export.c:329
+msgid "Overall progress:"
+msgstr "Skupni napredek:"
+
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
+#, c-format
+msgid "Slide %d export progress:"
+msgstr "Napredek izvoza diapozitiva %d:"
+
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
+msgid "Failed to launch the encoder!"
+msgstr "Ne morem zagnati šifrirnika!"
+
+#: ../src/export.c:902
+#, c-format
+msgid "Final transition export progress:"
+msgstr "Napredek izvoza zadnjega prehoda:"
+
+#~ msgid "Click to expand the area"
+#~ msgstr "Razširi besedilno polje"
+
+#~ msgid "Click to shrink the area"
+#~ msgstr "Skrčni besedilno polje"
+
+#~ msgid "_Preview"
+#~ msgstr "_Predogled"
+
+#~ msgid "Preview quality"
+#~ msgstr "Kakovost predogleda"
+
+#~ msgid "_Low"
+#~ msgstr "_Nizka"
+
+#~ msgid "High"
+#~ msgstr "Visoka"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Update"
+#~ msgstr "Posodobi"
+
+#~ msgid "Remove"
+#~ msgstr "Odstrani"
+
+#, fuzzy
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Izberi pisavo"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "<b>Gibanje diapozitiva</b>"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Kvaliteta videa:</b>"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Normalno 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Širokozaslonsko 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Kvaliteta videa:</b>"
+
+#~ msgid "Low"
+#~ msgstr "Nizka"
+
+#~ msgid "Medium"
+#~ msgstr "Srednja"
+
+#~ msgid "Rotate the slide clockwise"
+#~ msgstr "Zavrti diapozitiv v smeri urinega kazalca"
+
+#~ msgid "Goto first slide"
+#~ msgstr "Pojdi na prvi diapozitiv"
+
+#~ msgid "Goto last slide"
+#~ msgstr "Pojdi na zadnji diapozitiv"
+
+#~ msgid "VOB export"
+#~ msgstr "VOB izvoz"
+
+#~ msgid "OGG export"
+#~ msgstr "OGG izvoz"
+
+#~ msgid "FLV export"
+#~ msgstr "FLV izvoz"
+
+#~ msgid "An error occurred while trying to rotate the slide:"
+#~ msgstr "Napaka med vrtenjem diapozitiva:"

imagination-3.0.tar.bz2/po/sv.po -> imagination-3.4.tar.bz2/po/sv.po Changed

@@ -7,42 +7,42 @@
 msgstr ""
 "Project-Id-Version: imagination\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 20:10+0100\n"
-"PO-Revision-Date: 2011-02-18 19:02+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2011-06-11 20:51+0100\n"
+"Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination"
+
+#: ../imagination.desktop.in.h:2
 msgid "A DVD slideshow maker"
 msgstr "En DVD-bildspelsskapare"
 
-#: ../imagination.desktop.in.h:2
+#: ../imagination.desktop.in.h:3
 msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr "En resurssnål DVD-bildspelsskapare som använder GTK+2"
 
-#: ../imagination.desktop.in.h:3
-msgid "Imagination"
-msgstr "Imagination"
-
-#: ../src/audio.c:109
+#: ../src/audio.c:108
 #, c-format
 msgid "Playing %s..."
 msgstr "Spelar upp %s..."
 
-#: ../src/audio.c:137 ../src/main-window.c:1130
+#: ../src/audio.c:136 ../src/main-window.c:1224
 msgid "Play the selected file"
 msgstr "Spela upp markerad fil"
 
-#: ../src/audio.c:145
+#: ../src/audio.c:144
 msgid "Stop the playback"
 msgstr "Stoppa uppspelningen"
 
-#: ../src/audio.c:272
+#: ../src/audio.c:271
 #, c-format
 msgid ""
 "%s:\n"
@@ -51,7 +51,7 @@
 "%s:\n"
 "inkompatibel samplingsfrekvens\n"
 
-#: ../src/audio.c:277
+#: ../src/audio.c:276
 #, c-format
 msgid ""
 "%s:\n"
@@ -60,7 +60,7 @@
 "%s:\n"
 "inkompatibelt antal kanaler\n"
 
-#: ../src/audio.c:283
+#: ../src/audio.c:282
 #, c-format
 msgid ""
 "%s:\n"
@@ -69,7 +69,7 @@
 "%s:\n"
 "inkompatibel samplingsfrekvens och antal kanaler\n"
 
-#: ../src/audio.c:303
+#: ../src/audio.c:302
 #, c-format
 msgid ""
 "%s\n"
@@ -78,23 +78,23 @@
 "%s\n"
 "<b>Vill du fortsätta utan dessa filer?</b>"
 
-#: ../src/audio.c:307 ../src/audio.c:454
+#: ../src/audio.c:306 ../src/audio.c:453
 msgid "Audio files mismatch:"
 msgstr "Ljudfilerna är inte korrekta:"
 
-#: ../src/audio.c:401
+#: ../src/audio.c:400
 msgid "Incompatible sample rate."
 msgstr "Inkompatibel samplingsfrekvens."
 
-#: ../src/audio.c:408
+#: ../src/audio.c:407
 msgid "Incompatible number of channels."
 msgstr "Inkompatibelt antal kanaler."
 
-#: ../src/audio.c:415
+#: ../src/audio.c:414
 msgid "Incompatible sample rate and number of channels."
 msgstr "Inkompatibel samplingsfrekvens och antal kanaler."
 
-#: ../src/audio.c:437
+#: ../src/audio.c:436
 #, c-format
 msgid ""
 "File selection contains %d audio file that is incompatible with other files."
@@ -106,54 +106,57 @@
 msgstr1 ""
 "Filvalet innehåller %d ljudfiler som är inkompatibla med de andra filerna."
 
-#: ../src/audio.c:443
+#: ../src/audio.c:442
 msgid "Please check audio tab for more information."
 msgstr "Kontrollera ljudfliken för mer information."
 
-#: ../src/main-window.c:222
+#: ../src/main-window.c:218
 msgid "_Slideshow"
 msgstr "_Bildspel"
 
-#: ../src/main-window.c:236
+#: ../src/main-window.c:232
 msgid "Import slideshow"
 msgstr "Importera bildspel"
 
-#: ../src/main-window.c:260
+#: ../src/main-window.c:256
 msgid "Import p_ictures"
 msgstr "Importera bil_der"
 
-#: ../src/main-window.c:270
+#: ../src/main-window.c:266
 msgid "Import _music"
 msgstr "Importera _musik"
 
-#: ../src/main-window.c:287
-msgid "_Preview"
-msgstr "_Förhandsgranska"
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "Förhandsgranska"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "Importera musik"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "Importera musik"
+
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "Innehåll"
 
-#: ../src/main-window.c:295
-msgid "Export"
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
 msgstr "Exportera"
 
 #. Slide menu
-#: ../src/main-window.c:310
+#: ../src/main-window.c:330
 msgid "_Slide"
 msgstr "_Bild"
 
-#. Preview quality menu
-#: ../src/main-window.c:332
-msgid "Preview quality"
-msgstr "Kvalitet för förhandsgranskning"
-
-#: ../src/main-window.c:338
-msgid "_Low"
-msgstr "_Låg"
-
-#: ../src/main-window.c:342 ../src/export.c:1389 ../src/export.c:1573
-msgid "High"
-msgstr "Hög"
-
 #. Zoom controls
-#: ../src/main-window.c:346
+#: ../src/main-window.c:349
 msgid "_Zoom"
 msgstr "_Zooma"
 
@@ -161,44 +164,53 @@
 msgid "Add empt_y slide"
 msgstr "Lägg till t_om bild"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "Lägg till t_om bild"
+
+#: ../src/main-window.c:392
 msgid "Dele_te"
 msgstr "Ta _bort"
 
-#: ../src/main-window.c:390
+#: ../src/main-window.c:400
 msgid "Repor_t"
 msgstr "Rappor_tera"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:412
 msgid "Rotate co_unter-clockwise"
 msgstr "Rotera m_otsols"
 
-#: ../src/main-window.c:413
+#: ../src/main-window.c:423
 msgid "_Rotate clockwise"
 msgstr "_Rotera medsols"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:435
 msgid "Un_select all"
 msgstr "_Avmarkera alla"
 
 #. View menu
-#: ../src/main-window.c:434
+#: ../src/main-window.c:441
 msgid "_View"
 msgstr "_Visa"
 
-#: ../src/main-window.c:440
+#: ../src/main-window.c:447
 msgid "Preview mode"
 msgstr "Förhandsgranskningsläge"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:453
 msgid "Overview mode"
 msgstr "Översiktsläge"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:456
 msgid "Preview _frame rate"
 msgstr "Bildfrekvens för för_handsvisning"
 
-#: ../src/main-window.c:469
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
@@ -206,273 +218,329 @@
 msgstr1 "%d bilder per sekund"
 
 #. Help menu
-#: ../src/main-window.c:486
+#: ../src/main-window.c:497
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/main-window.c:491
+#: ../src/main-window.c:502
 msgid "Contents"
 msgstr "Innehåll"
 
-#: ../src/main-window.c:512 ../src/new_slideshow.c:65
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
 msgid "Create a new slideshow"
 msgstr "Skapa ett nytt bildspel"
 
-#: ../src/main-window.c:517
+#: ../src/main-window.c:528
 msgid "Open a slideshow"
 msgstr "Öppna ett bildspel"
 
-#: ../src/main-window.c:522
+#: ../src/main-window.c:533
 msgid "Save the slideshow"
 msgstr "Spara bildspelet"
 
-#: ../src/main-window.c:535
+#: ../src/main-window.c:546
 msgid "Import pictures"
 msgstr "Importera bilder"
 
-#: ../src/main-window.c:544
+#: ../src/main-window.c:555
 msgid "Import music"
 msgstr "Importera musik"
 
-#: ../src/main-window.c:549
+#: ../src/main-window.c:560
 msgid "Delete the selected slides"
 msgstr "Ta bort markerade bilder"
 
-#: ../src/main-window.c:559
+#: ../src/main-window.c:570
 msgid "Rotate the slide 90 degrees to the left"
 msgstr "Rotera bilden 90 grader åt vänster"
 
-#: ../src/main-window.c:570
+#: ../src/main-window.c:581
 msgid "Rotate the slide 90 degrees to the right"
 msgstr "Rotera bilden 90 grader åt höger"
 
-#: ../src/main-window.c:576
+#: ../src/main-window.c:587
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#: ../src/main-window.c:581
+#: ../src/main-window.c:592
 msgid "Zoom Out"
 msgstr "Zooma ut"
 
-#: ../src/main-window.c:586
+#: ../src/main-window.c:597
 msgid "Normal Size"
 msgstr "Normal storlek"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:602
 msgid "Fit Zoom in Window"
 msgstr "Anpassa zoom till fönstret"
 
-#: ../src/main-window.c:599 ../src/callbacks.c:1362
-msgid "Starts the preview"
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
 msgstr "Startar förhandsgranskningen"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:619
 msgid "Go to the first slide of the slideshow"
 msgstr "Gå till första bilden i bildspelet"
 
-#: ../src/main-window.c:614
+#: ../src/main-window.c:625
 msgid "Go to the previous slide of the slideshow"
 msgstr "Gå till föregående bild i bildspelet"
 
-#: ../src/main-window.c:630 ../src/main-window.c:837
+#: ../src/main-window.c:641 ../src/main-window.c:847
 msgid " of "
 msgstr " av "
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:653
 msgid "Go to the next slide of the slideshow"
 msgstr "Gå till nästa bild i bildspelet"
 
-#: ../src/main-window.c:648
+#: ../src/main-window.c:659
 msgid "Go to the last slide of the slideshow"
 msgstr "Gå till sista bilden i bildspelet"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:708
 msgid "Video"
 msgstr "Video"
 
-#: ../src/main-window.c:717
+#: ../src/main-window.c:726
 msgid "<b>Slide Settings</b>"
 msgstr "<b>Bildinställningar</b>"
 
 #. Transition types label
-#: ../src/main-window.c:727
+#: ../src/main-window.c:736
 msgid "Transition Type:"
 msgstr "Övergångstyp:"
 
-#: ../src/main-window.c:747
+#: ../src/main-window.c:756
 msgid "Random"
 msgstr "Slumpmässigt"
 
-#: ../src/main-window.c:748
+#: ../src/main-window.c:757
 msgid "Imagination randomly decides which transition to apply"
 msgstr "Imagination bestämmer slumpmässigt vilken övergång att tillämpa"
 
 #. Transition duration
-#: ../src/main-window.c:754
+#: ../src/main-window.c:763
 msgid "Transition Speed:"
 msgstr "Övergångshastighet:"
 
-#: ../src/main-window.c:765
+#: ../src/main-window.c:774
 msgid "Fast"
 msgstr "Snabb"
 
-#: ../src/main-window.c:767
+#: ../src/main-window.c:776
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/main-window.c:769
+#: ../src/main-window.c:778
 msgid "Slow"
 msgstr "Långsam"
 
 #. Slide duration
-#: ../src/main-window.c:776
+#: ../src/main-window.c:785
 msgid "Slide Duration in sec:"
 msgstr "Bildlängd i sekunder:"
 
 #. Slide Total Duration
-#: ../src/main-window.c:787
+#: ../src/main-window.c:797
 msgid "Slideshow Length:"
 msgstr "Bildvisningslängd:"
 
-#: ../src/main-window.c:804
+#: ../src/main-window.c:814
 msgid "<b>Slide Motion</b>"
 msgstr "<b>Bildrörelse</b>"
 
-#: ../src/main-window.c:814
+#: ../src/main-window.c:824
 msgid "Stop Point:"
 msgstr "Stoppunkt:"
 
-#: ../src/main-window.c:851
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "Stoppunkt:"
+
+#: ../src/main-window.c:869
 msgid "Duration:"
 msgstr "Längd:"
 
-#: ../src/main-window.c:860
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "Stoppunkt:"
+
+#: ../src/main-window.c:891
 msgid "Zoom: "
 msgstr "Zoom: "
 
-#: ../src/main-window.c:874
-msgid "Add"
-msgstr "Lägg till"
-
-#: ../src/main-window.c:878
-msgid "Update"
-msgstr "Uppdatera"
-
-#: ../src/main-window.c:883
-msgid "Remove"
-msgstr "Ta bort"
-
-#: ../src/main-window.c:897
+#: ../src/main-window.c:910
 msgid "<b>Slide Text</b>"
 msgstr "<b>Bildtext</b>"
 
-#: ../src/main-window.c:926 ../src/main-window.c:1562
-msgid "Click to expand the area"
-msgstr "Klicka för att expandera utrymmet"
-
-#: ../src/main-window.c:943
+#: ../src/main-window.c:944
 msgid "Click to choose the font"
 msgstr "Klicka för att välja typsnitt"
 
-#: ../src/main-window.c:950
+#: ../src/main-window.c:951 ../src/support.c:1176
 msgid "Click to choose the font color"
 msgstr "Klicka för att välja typsnittsfärg"
 
-#: ../src/main-window.c:957
-msgid "Click to choose the font background color"
-msgstr "Klicka för att välja bakgrundsfärg för typsnitt"
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "Klicka för att välja typsnitt"
+
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
 
-#: ../src/main-window.c:961
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "Klicka för att välja typsnittsfärg"
+
+#: ../src/main-window.c:1023
 msgid "Animation:"
 msgstr "Animation:"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:1035
 msgid "Animation Speed:"
 msgstr "Animationshastighet:"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>Bildrörelse</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "Undertextposition:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "Undertextposition:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
 msgid "Placing is relative to:"
 msgstr "Placering är relativ till:"
 
-#: ../src/main-window.c:1003
+#: ../src/main-window.c:1140
 msgid "Exported video"
 msgstr "Exporterade video"
 
-#: ../src/main-window.c:1005
+#: ../src/main-window.c:1142
 msgid "Original image"
 msgstr "Ursprungsbild"
 
-#: ../src/main-window.c:1014
-msgid "Subtitle position:"
-msgstr "Undertextposition:"
-
 #. Background music frame
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:1149
 msgid "Audio"
 msgstr "Ljud"
 
-#: ../src/main-window.c:1068
+#: ../src/main-window.c:1162
 msgid "<b>Background Music</b>"
 msgstr "<b>Bakgrundsmusik</b>"
 
-#: ../src/main-window.c:1114
+#: ../src/main-window.c:1208
 msgid "Music Duration:"
 msgstr "Musiklängd:"
 
-#: ../src/main-window.c:1138
+#: ../src/main-window.c:1232
 msgid "Delete the selected file"
 msgstr "Ta bort markerad fil"
 
-#: ../src/main-window.c:1145
+#: ../src/main-window.c:1239
 msgid "Move the selected file up"
 msgstr "Flytta markerad fil uppåt"
 
-#: ../src/main-window.c:1152
+#: ../src/main-window.c:1246
 msgid "Move the selected file down"
 msgstr "Flytta markerad fil nedåt"
 
-#: ../src/main-window.c:1159
+#: ../src/main-window.c:1253
 msgid "Clear all files"
 msgstr "Töm alla filer"
 
 #. End of Background music frame
 #. Begin of Message tab
-#: ../src/main-window.c:1164
+#: ../src/main-window.c:1258
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: ../src/main-window.c:1557
-msgid "Click to shrink the area"
-msgstr "Klicka för att minska utrymmet"
-
-#: ../src/main-window.c:1589 ../src/callbacks.c:1120
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
 msgid "Sorry, I could not perform the operation!"
 msgstr "Tyvärr, jag kunde inte genomföra åtgärden!"
 
-#: ../src/main-window.c:1738
+#: ../src/main-window.c:1825
 #, c-format
 msgid "File '%s' not found"
 msgstr "Filen \"%s\" hittades inte"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Type"
 msgstr "Typ"
 
 #. No animation function (id = 0)
-#: ../src/main-window.c:2062 ../src/main-window.c:2064 ../src/support.c:179
-#: ../src/subtitles.c:162
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/main-window.c:2605
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
 msgid "Slides Transitions Report Dialog"
 msgstr "Rapportdialog för bildövergångar"
 
-#: ../src/main-window.c:2685
+#: ../src/main-window.c:2798
 msgid ""
 "\n"
 "<span weight='bold'>Note:</span>\n"
@@ -486,46 +554,46 @@
 "Bilder vars övergångar endast tillämpas en gång kommer inte att visas här.\n"
 "Klicka på bilden för att få Imagination att automatiskt välja den."
 
-#: ../src/callbacks.c:124 ../src/callbacks.c:469 ../src/callbacks.c:1421
-#: ../src/callbacks.c:1499
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
 msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
 msgstr ""
 "Du har inte sparat ditt bildspel än. Är du säker på att du vill stänga det?"
 
-#: ../src/callbacks.c:210
+#: ../src/callbacks.c:220
 #, c-format
 msgid "Please wait, importing image %d out of %d"
 msgstr "Importerar bild %d av %d, vänta."
 
-#: ../src/callbacks.c:279
+#: ../src/callbacks.c:289
 msgid "Import audio files, use CTRL key for multiple select"
 msgstr "Importera ljudfiler, använd Control-tangenten för flera markeringar"
 
-#: ../src/callbacks.c:291
+#: ../src/callbacks.c:301
 msgid "All audio files"
 msgstr "Alla ljudfiler"
 
-#: ../src/callbacks.c:300 ../src/callbacks.c:375 ../src/callbacks.c:1449
-#: ../src/support.c:370
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/callbacks.c:356
+#: ../src/callbacks.c:365
 msgid "Import images, use SHIFT key for multiple select"
 msgstr "Importera bilder, använd SKIFT-tangenten för flera markeringar"
 
-#: ../src/callbacks.c:369
+#: ../src/callbacks.c:378
 msgid "All image files"
 msgstr "Alla bildfiler"
 
-#: ../src/callbacks.c:529
+#: ../src/callbacks.c:578
 #, c-format
 msgid "%d x %d pixels"
 msgid_plural "%d x %d pixels"
 msgstr0 "%d x %d bildpunkter"
 msgstr1 "%d x %d bildpunkter"
 
-#: ../src/callbacks.c:805
+#: ../src/callbacks.c:853
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -533,235 +601,339 @@
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/callbacks.c:1372
+#: ../src/callbacks.c:1517
 msgid "Stops the preview"
 msgstr "Stoppar förhandsgranskningen"
 
-#: ../src/callbacks.c:1432
+#: ../src/callbacks.c:1580
 msgid "Load an Imagination slideshow project"
 msgstr "Läs in ett Imagination-bildspelsprojekt"
 
-#: ../src/callbacks.c:1433
+#: ../src/callbacks.c:1581
 msgid "Save an Imagination slideshow project"
 msgstr "Spara ett Imagination-bildspelsprojekt"
 
-#: ../src/callbacks.c:1443
-msgid "Imagination projects"
-msgstr "Imagination-projekt"
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Imagination-projekt (*.img)"
 
-#: ../src/callbacks.c:2195
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
+
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "Lägg till t_om bild"
+
+#: ../src/callbacks.c:2498
 msgid "Create empty slide"
 msgstr "Skapa tom bild"
 
-#: ../src/callbacks.c:2206
+#: ../src/callbacks.c:2509
 msgid "Empty slide options:"
 msgstr "Alternativ för tom bild:"
 
-#: ../src/callbacks.c:2216
-msgid "Use _solid color"
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
 msgstr "Använd _enfärgad"
 
-#: ../src/callbacks.c:2222
-msgid "Use _linear gradient"
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
 msgstr "Använd _linjär gradient"
 
-#: ../src/callbacks.c:2228
-msgid "Use _radial gradient"
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
 msgstr "Använd _radiell gradient"
 
-#: ../src/callbacks.c:2258
-msgid "Preview"
-msgstr "Förhandsgranska"
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "Använd _radiell gradient"
+
+#: ../src/callbacks.c:3253
+#, fuzzy
+msgid "Please choose a PNG file"
+msgstr "Välj ljudfilerna att importera"
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "Alla filer"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
 
 #. Display propert title depending on the callback that is calling this function.
-#: ../src/new_slideshow.c:65
+#: ../src/new_slideshow.c:66
 msgid "Project properties"
 msgstr "Projektegenskaper"
 
-#: ../src/new_slideshow.c:85
+#: ../src/new_slideshow.c:86
 msgid "<b>Slideshow Settings</b>"
 msgstr "<b>Bildspelsinställningar</b>"
 
-#: ../src/new_slideshow.c:130
-msgid "<b>Video Format</b>"
-msgstr "<b>Videoformat</b>"
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "Videoformat:"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "Videostorlek:"
 
-#: ../src/new_slideshow.c:152 ../src/export.c:1337 ../src/export.c:1524
-#: ../src/export.c:1705
-msgid "<b>Video Size</b>"
-msgstr "<b>Videostorlek</b>"
+#. FPS
+#: ../src/new_slideshow.c:132
+msgid "Frames per Second (FPS):"
+msgstr "Bild per sekund:"
 
-#: ../src/new_slideshow.c:166
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>Tv-format</b>"
+
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
+
+#: ../src/new_slideshow.c:171
 msgid "<b>Advanced Settings</b>"
 msgstr "<b>Avancerade inställningar</b>"
 
-#: ../src/new_slideshow.c:173
+#: ../src/new_slideshow.c:178
 msgid "Rescale images to fit desired aspect ratio"
 msgstr "Skala om bilderna för att passa önskat bildformat"
 
-#: ../src/new_slideshow.c:179
-msgid "Select background color:"
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
 msgstr "Välj bakgrundsfärg:"
 
-#: ../src/slideshow_project.c:213
+#: ../src/slideshow_project.c:265
 msgid "This is not an Imagination project file!"
 msgstr "Detta är inte en projektfil för Imagination!"
 
-#: ../src/slideshow_project.c:371
+#: ../src/slideshow_project.c:442
 #, c-format
 msgid "Slide %i: can't load image %s\n"
 msgstr "Bild %i: kan inte läsa in bilden %s\n"
 
-#: ../src/slideshow_project.c:493
+#: ../src/slideshow_project.c:585
 #, c-format
 msgid "Can't load image %s\n"
 msgstr "Kan inte läsa in bilden %s\n"
 
-#: ../src/support.c:130
+#: ../src/support.c:134
 #, c-format
 msgid "Welcome to Imagination - %d transition loaded."
 msgid_plural "Welcome to Imagination - %d transitions loaded."
 msgstr0 "Välkommen till Imagination - %d övergång inlästa."
 msgstr1 "Välkommen till Imagination - %d övergångar inlästa."
 
-#: ../src/support.c:141
+#: ../src/support.c:145
 #, c-format
 msgid "%d slide selected"
 msgid_plural "%d slides selected"
 msgstr0 "%d bild markerad"
 msgstr1 "%d bilder markerade"
 
-#: ../src/support.c:152
+#: ../src/support.c:156
 #, c-format
 msgid "%d slide loaded %s"
 msgid_plural "%d slides loaded %s"
 msgstr0 "%d bild inläst %s"
 msgstr1 "%d bilder inlästa %s"
 
-#: ../src/support.c:156
+#: ../src/support.c:160
 msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 msgstr ""
 " - Använd CTRL-tangenten för att markera/avmarkera eller SKIFT för flera "
 "markeringar"
 
-#: ../src/support.c:322
+#: ../src/support.c:327
 msgid "Please choose the slideshow project filename"
 msgstr "Välj filnamn för bildspelsprojektet"
 
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures and also switches mode into
-#. * preview if needed.
-#: ../src/support.c:337 ../src/export.c:1183
-msgid "VOB (DVD video)"
-msgstr "VOB (DVD-video)"
-
-#: ../src/support.c:343
-msgid "MP4 (MPEG-4)"
-msgstr "MP4 (MPEG-4)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:349 ../src/export.c:1299
-msgid "OGV (Theora/Vorbis)"
-msgstr "OGV (Theora/Vorbis)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:355 ../src/export.c:1486
-msgid "FLV (Flash video)"
-msgstr "FLV (Flash Video)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:361 ../src/export.c:1690
-msgid "3GP (Mobile Phones)"
-msgstr "3GP (Mobiltelefoner)"
-
-#: ../src/subtitles.c:166
+#: ../src/subtitles.c:243
 msgid "Fade"
 msgstr "Tona"
 
-#: ../src/subtitles.c:170
+#: ../src/subtitles.c:247
 msgid "Slide from left"
 msgstr "Glid från vänster"
 
-#: ../src/subtitles.c:174
+#: ../src/subtitles.c:251
 msgid "Slide from right"
 msgstr "Glid från höger"
 
-#: ../src/subtitles.c:178
+#: ../src/subtitles.c:255
 msgid "Slide from top"
 msgstr "Glid från överkant"
 
-#: ../src/subtitles.c:182
+#: ../src/subtitles.c:259
 msgid "Slide from bottom"
 msgstr "Glid från nederkant"
 
-#: ../src/subtitles.c:186
+#: ../src/subtitles.c:263
 msgid "Grow"
 msgstr "Väx"
 
-#: ../src/export.c:150
+#: ../src/subtitles.c:267
+#, fuzzy
+msgid "Slide bottom to top"
+msgstr "Glid från överkant"
+
+#: ../src/subtitles.c:271
+#, fuzzy
+msgid "Slide right to left"
+msgstr "Glid från vänster"
+
+#: ../src/export.c:144
 msgid "<b>Export Settings</b>"
 msgstr "<b>Exportinställningar</b>"
 
-#: ../src/export.c:164
+#: ../src/export.c:158
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: ../src/export.c:312
+#: ../src/export.c:306
 msgid "Exporting the slideshow"
 msgstr "Exporterar bildspelet"
 
-#: ../src/export.c:323
+#: ../src/export.c:318
 msgid "Preparing for export ..."
 msgstr "Förbereder för export ..."
 
-#: ../src/export.c:334
+#: ../src/export.c:329
 msgid "Overall progress:"
 msgstr "Totalt förlopp:"
 
-#: ../src/export.c:424 ../src/export.c:807
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
 #, c-format
 msgid "Slide %d export progress:"
 msgstr "Förlopp för export av bild %d:"
 
-#: ../src/export.c:661
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
 msgid "Failed to launch the encoder!"
 msgstr "Misslyckades med att starta kodaren!"
 
-#: ../src/export.c:805
+#: ../src/export.c:902
 #, c-format
 msgid "Final transition export progress:"
 msgstr "Förlopp för export av slutgiltig övergång:"
 
-#: ../src/export.c:1195
-msgid "<b>Television Format</b>"
-msgstr "<b>Tv-format</b>"
+#, fuzzy
+#~ msgid "Border Bottom"
+#~ msgstr "Glid från nederkant"
+
+#~ msgid "Click to expand the area"
+#~ msgstr "Klicka för att expandera utrymmet"
+
+#~ msgid "Click to shrink the area"
+#~ msgstr "Klicka för att minska utrymmet"
+
+#~ msgid "_Preview"
+#~ msgstr "_Förhandsgranska"
+
+#~ msgid "Preview quality"
+#~ msgstr "Kvalitet för förhandsgranskning"
 
-#: ../src/export.c:1202 ../src/export.c:1326 ../src/export.c:1513
-msgid "Normal 4:3"
-msgstr "Normal 4:3"
+#~ msgid "_Low"
+#~ msgstr "_Låg"
 
-#: ../src/export.c:1207 ../src/export.c:1330 ../src/export.c:1517
-msgid "Widescreen 16:9"
-msgstr "Bredbild 16:9"
+#~ msgid "High"
+#~ msgstr "Hög"
 
-#: ../src/export.c:1315 ../src/export.c:1502
-msgid "<b>Aspect Ratio</b>"
-msgstr "<b>Bildförhållande</b>"
+#~ msgid "Add"
+#~ msgstr "Lägg till"
 
-#: ../src/export.c:1373 ../src/export.c:1557
-msgid "<b>Video Quality:</b>"
-msgstr "<b>Videokvalitet:</b>"
+#~ msgid "Update"
+#~ msgstr "Uppdatera"
 
-#: ../src/export.c:1380 ../src/export.c:1564
-msgid "Low"
-msgstr "Låg"
+#~ msgid "Remove"
+#~ msgstr "Ta bort"
 
-#: ../src/export.c:1384 ../src/export.c:1568
-msgid "Medium"
-msgstr "Medel"
+#~ msgid "Click to choose the font background color"
+#~ msgstr "Klicka för att välja bakgrundsfärg för typsnitt"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "Bildförhållande:"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>Videokvalitet:</b>"
+
+#, fuzzy
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (DVD-video)"
+
+#~ msgid "MP4 (MPEG-4)"
+#~ msgstr "MP4 (MPEG-4)"
+
+#, fuzzy
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV (Theora/Vorbis)"
+
+#, fuzzy
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (Flash Video)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (Mobiltelefoner)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "Normal 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "Bredbild 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>Videokvalitet:</b>"
+
+#~ msgid "Low"
+#~ msgstr "Låg"
+
+#~ msgid "Medium"
+#~ msgstr "Medel"
+
+#, fuzzy
+#~ msgid "low"
+#~ msgstr "Långsam"
 
 #~ msgid "Rotate the slide clockwise"
 #~ msgstr "Rotera bilden medsols"
@@ -772,9 +944,6 @@
 #~ msgid "Goto last slide"
 #~ msgstr "Gå till sista bilden"
 
-#~ msgid "Please choose the audio files to import"
-#~ msgstr "Välj ljudfilerna att importera"
-
 #~ msgid "VOB export"
 #~ msgstr "VOB-export"

imagination-3.0.tar.bz2/po/zh_CN.po -> imagination-3.4.tar.bz2/po/zh_CN.po Changed

@@ -7,43 +7,43 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 20:10+0100\n"
-"PO-Revision-Date: 2011-02-19 01:00+0800\n"
-"Last-Translator: chiming <tw.chi.ming@gmail.com>\n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2011-06-11 20:49+0100\n"
+"Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0; \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Language: zh_CN\n"
 
 #: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination 想像"
+
+#: ../imagination.desktop.in.h:2
 msgid "A DVD slideshow maker"
 msgstr "一个DVD影片秀制作工具"
 
-#: ../imagination.desktop.in.h:2
+#: ../imagination.desktop.in.h:3
 msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr "一个GTK+2介面下的简易DVD影片秀制作工具"
 
-#: ../imagination.desktop.in.h:3
-msgid "Imagination"
-msgstr "Imagination 想像"
-
-#: ../src/audio.c:109
+#: ../src/audio.c:108
 #, c-format
 msgid "Playing %s..."
 msgstr "播放中 %s..."
 
-#: ../src/audio.c:137 ../src/main-window.c:1130
+#: ../src/audio.c:136 ../src/main-window.c:1224
 msgid "Play the selected file"
 msgstr "播放选择的档案"
 
-#: ../src/audio.c:145
+#: ../src/audio.c:144
 msgid "Stop the playback"
 msgstr "停止播放"
 
-#: ../src/audio.c:272
+#: ../src/audio.c:271
 #, c-format
 msgid ""
 "%s:\n"
@@ -52,7 +52,7 @@
 "%s:\n"
 "声音频率不同\n"
 
-#: ../src/audio.c:277
+#: ../src/audio.c:276
 #, c-format
 msgid ""
 "%s:\n"
@@ -61,7 +61,7 @@
 "%s:\n"
 "声道数不同\n"
 
-#: ../src/audio.c:283
+#: ../src/audio.c:282
 #, c-format
 msgid ""
 "%s:\n"
@@ -70,7 +70,7 @@
 "%s:\n"
 "频率及声道数不一致\n"
 
-#: ../src/audio.c:303
+#: ../src/audio.c:302
 #, c-format
 msgid ""
 "%s\n"
@@ -79,23 +79,23 @@
 "%s\n"
 "<b>没有档案也要继续吗?</b>"
 
-#: ../src/audio.c:307 ../src/audio.c:454
+#: ../src/audio.c:306 ../src/audio.c:453
 msgid "Audio files mismatch:"
 msgstr "音效档没有一致性:"
 
-#: ../src/audio.c:401
+#: ../src/audio.c:400
 msgid "Incompatible sample rate."
 msgstr "声音频率不同."
 
-#: ../src/audio.c:408
+#: ../src/audio.c:407
 msgid "Incompatible number of channels."
 msgstr "声道数不同."
 
-#: ../src/audio.c:415
+#: ../src/audio.c:414
 msgid "Incompatible sample rate and number of channels."
 msgstr "频率及声道数都不一致"
 
-#: ../src/audio.c:437
+#: ../src/audio.c:436
 #, c-format
 msgid ""
 "File selection contains %d audio file that is incompatible with other files."
@@ -104,54 +104,57 @@
 "files."
 msgstr0 "选择的档案中有 %d 个与其他不同格式的音效档"
 
-#: ../src/audio.c:443
+#: ../src/audio.c:442
 msgid "Please check audio tab for more information."
 msgstr "请检查音效分页以检视更多讯息"
 
-#: ../src/main-window.c:222
+#: ../src/main-window.c:218
 msgid "_Slideshow"
 msgstr "影片秀(_S)"
 
-#: ../src/main-window.c:236
+#: ../src/main-window.c:232
 msgid "Import slideshow"
 msgstr "汇出影片秀"
 
-#: ../src/main-window.c:260
+#: ../src/main-window.c:256
 msgid "Import p_ictures"
 msgstr "汇入图片(_i)"
 
-#: ../src/main-window.c:270
+#: ../src/main-window.c:266
 msgid "Import _music"
 msgstr "汇入音乐(_m)"
 
-#: ../src/main-window.c:287
-msgid "_Preview"
-msgstr "预览(_P)"
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "预览"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "汇入音乐"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "汇入音乐"
 
-#: ../src/main-window.c:295
-msgid "Export"
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "内容"
+
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
 msgstr "汇出"
 
 #. Slide menu
-#: ../src/main-window.c:310
+#: ../src/main-window.c:330
 msgid "_Slide"
 msgstr "场景(_S)"
 
-#. Preview quality menu
-#: ../src/main-window.c:332
-msgid "Preview quality"
-msgstr "预览品质"
-
-#: ../src/main-window.c:338
-msgid "_Low"
-msgstr "低(_L)"
-
-#: ../src/main-window.c:342 ../src/export.c:1389 ../src/export.c:1573
-msgid "High"
-msgstr "高"
-
 #. Zoom controls
-#: ../src/main-window.c:346
+#: ../src/main-window.c:349
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
@@ -159,317 +162,382 @@
 msgid "Add empt_y slide"
 msgstr "新增场景(_y)"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "新增场景(_y)"
+
+#: ../src/main-window.c:392
 msgid "Dele_te"
 msgstr "删除(_t)"
 
-#: ../src/main-window.c:390
+#: ../src/main-window.c:400
 msgid "Repor_t"
 msgstr "回报(_t)"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:412
 msgid "Rotate co_unter-clockwise"
 msgstr "顺时针旋转(_u)"
 
-#: ../src/main-window.c:413
+#: ../src/main-window.c:423
 msgid "_Rotate clockwise"
 msgstr "逆时针旋转(_R)"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:435
 msgid "Un_select all"
 msgstr "全部不选(_s)"
 
 #. View menu
-#: ../src/main-window.c:434
+#: ../src/main-window.c:441
 msgid "_View"
 msgstr "检视(_V)"
 
-#: ../src/main-window.c:440
+#: ../src/main-window.c:447
 msgid "Preview mode"
 msgstr "预览模式"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:453
 msgid "Overview mode"
 msgstr "概观模式"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:456
 msgid "Preview _frame rate"
 msgstr "预览模式(_f)"
 
-#: ../src/main-window.c:469
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
 msgstr0 "每秒 %d 画面"
 
 #. Help menu
-#: ../src/main-window.c:486
+#: ../src/main-window.c:497
 msgid "_Help"
 msgstr "说明(_H)"
 
-#: ../src/main-window.c:491
+#: ../src/main-window.c:502
 msgid "Contents"
 msgstr "内容"
 
-#: ../src/main-window.c:512 ../src/new_slideshow.c:65
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
 msgid "Create a new slideshow"
 msgstr "建立一个影片秀"
 
-#: ../src/main-window.c:517
+#: ../src/main-window.c:528
 msgid "Open a slideshow"
 msgstr "开启一个影片秀"
 
-#: ../src/main-window.c:522
+#: ../src/main-window.c:533
 msgid "Save the slideshow"
 msgstr "储存影片秀"
 
-#: ../src/main-window.c:535
+#: ../src/main-window.c:546
 msgid "Import pictures"
 msgstr "汇入图片"
 
-#: ../src/main-window.c:544
+#: ../src/main-window.c:555
 msgid "Import music"
 msgstr "汇入音乐"
 
-#: ../src/main-window.c:549
+#: ../src/main-window.c:560
 msgid "Delete the selected slides"
 msgstr "删除选择的场景"
 
-#: ../src/main-window.c:559
+#: ../src/main-window.c:570
 msgid "Rotate the slide 90 degrees to the left"
 msgstr "顺时针旋转90度"
 
-#: ../src/main-window.c:570
+#: ../src/main-window.c:581
 msgid "Rotate the slide 90 degrees to the right"
 msgstr "逆时针旋转90度"
 
-#: ../src/main-window.c:576
+#: ../src/main-window.c:587
 msgid "Zoom In"
 msgstr "放大"
 
-#: ../src/main-window.c:581
+#: ../src/main-window.c:592
 msgid "Zoom Out"
 msgstr "缩小"
 
-#: ../src/main-window.c:586
+#: ../src/main-window.c:597
 msgid "Normal Size"
 msgstr "正常"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:602
 msgid "Fit Zoom in Window"
 msgstr "缩放至视窗大小"
 
-#: ../src/main-window.c:599 ../src/callbacks.c:1362
-msgid "Starts the preview"
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
 msgstr "开始预览"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:619
 msgid "Go to the first slide of the slideshow"
 msgstr "首张"
 
-#: ../src/main-window.c:614
+#: ../src/main-window.c:625
 msgid "Go to the previous slide of the slideshow"
 msgstr "上张"
 
-#: ../src/main-window.c:630 ../src/main-window.c:837
+#: ../src/main-window.c:641 ../src/main-window.c:847
 msgid " of "
 msgstr "的"
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:653
 msgid "Go to the next slide of the slideshow"
 msgstr "下张"
 
-#: ../src/main-window.c:648
+#: ../src/main-window.c:659
 msgid "Go to the last slide of the slideshow"
 msgstr "末张"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:708
 msgid "Video"
 msgstr "影片"
 
-#: ../src/main-window.c:717
+#: ../src/main-window.c:726
 msgid "<b>Slide Settings</b>"
 msgstr "<b>场景设定</b>"
 
 #. Transition types label
-#: ../src/main-window.c:727
+#: ../src/main-window.c:736
 msgid "Transition Type:"
 msgstr "转场效果类型:"
 
-#: ../src/main-window.c:747
+#: ../src/main-window.c:756
 msgid "Random"
 msgstr "乱数取得"
 
-#: ../src/main-window.c:748
+#: ../src/main-window.c:757
 msgid "Imagination randomly decides which transition to apply"
 msgstr "自动由乱数决定效果"
 
 #. Transition duration
-#: ../src/main-window.c:754
+#: ../src/main-window.c:763
 msgid "Transition Speed:"
 msgstr "转场速度:"
 
-#: ../src/main-window.c:765
+#: ../src/main-window.c:774
 msgid "Fast"
 msgstr "快"
 
-#: ../src/main-window.c:767
+#: ../src/main-window.c:776
 msgid "Normal"
 msgstr "一般"
 
-#: ../src/main-window.c:769
+#: ../src/main-window.c:778
 msgid "Slow"
 msgstr "慢"
 
 #. Slide duration
-#: ../src/main-window.c:776
+#: ../src/main-window.c:785
 msgid "Slide Duration in sec:"
 msgstr "本张持续秒数:"
 
 #. Slide Total Duration
-#: ../src/main-window.c:787
+#: ../src/main-window.c:797
 msgid "Slideshow Length:"
 msgstr "影片秀时间总长:"
 
-#: ../src/main-window.c:804
+#: ../src/main-window.c:814
 msgid "<b>Slide Motion</b>"
 msgstr "<b>场景变化</b>"
 
-#: ../src/main-window.c:814
+#: ../src/main-window.c:824
 msgid "Stop Point:"
 msgstr "停止点:"
 
-#: ../src/main-window.c:851
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "停止点:"
+
+#: ../src/main-window.c:869
 msgid "Duration:"
 msgstr "持续时间:"
 
-#: ../src/main-window.c:860
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "停止点:"
+
+#: ../src/main-window.c:891
 msgid "Zoom: "
 msgstr "缩放: "
 
-#: ../src/main-window.c:874
-msgid "Add"
-msgstr "新增"
-
-#: ../src/main-window.c:878
-msgid "Update"
-msgstr "更新"
-
-#: ../src/main-window.c:883
-msgid "Remove"
-msgstr "移除"
-
-#: ../src/main-window.c:897
+#: ../src/main-window.c:910
 msgid "<b>Slide Text</b>"
 msgstr "<b>字幕设定</b>"
 
-#: ../src/main-window.c:926 ../src/main-window.c:1562
-msgid "Click to expand the area"
-msgstr "展开文字区"
-
-#: ../src/main-window.c:943
+#: ../src/main-window.c:944
 msgid "Click to choose the font"
 msgstr "选择字型"
 
-#: ../src/main-window.c:950
+#: ../src/main-window.c:951 ../src/support.c:1176
 msgid "Click to choose the font color"
 msgstr "选择字型颜色"
 
-#: ../src/main-window.c:957
-msgid "Click to choose the font background color"
-msgstr "选择字型背景色"
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "选择字型"
 
-#: ../src/main-window.c:961
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "选择字型颜色"
+
+#: ../src/main-window.c:1023
 msgid "Animation:"
 msgstr "动作:"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:1035
 msgid "Animation Speed:"
 msgstr "速度:"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>场景变化</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "字幕位置:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "字幕位置:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
 msgid "Placing is relative to:"
 msgstr "相关位置:"
 
-#: ../src/main-window.c:1003
+#: ../src/main-window.c:1140
 msgid "Exported video"
 msgstr "汇出影片"
 
-#: ../src/main-window.c:1005
+#: ../src/main-window.c:1142
 msgid "Original image"
 msgstr "原始图档"
 
-#: ../src/main-window.c:1014
-msgid "Subtitle position:"
-msgstr "字幕位置:"
-
 #. Background music frame
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:1149
 msgid "Audio"
 msgstr "音效"
 
-#: ../src/main-window.c:1068
+#: ../src/main-window.c:1162
 msgid "<b>Background Music</b>"
 msgstr "<b>背景音乐</b>"
 
-#: ../src/main-window.c:1114
+#: ../src/main-window.c:1208
 msgid "Music Duration:"
 msgstr "播放时间长度:"
 
-#: ../src/main-window.c:1138
+#: ../src/main-window.c:1232
 msgid "Delete the selected file"
 msgstr "移除选择档案"
 
-#: ../src/main-window.c:1145
+#: ../src/main-window.c:1239
 msgid "Move the selected file up"
 msgstr "上移选择档案"
 
-#: ../src/main-window.c:1152
+#: ../src/main-window.c:1246
 msgid "Move the selected file down"
 msgstr "下移选择档案"
 
-#: ../src/main-window.c:1159
+#: ../src/main-window.c:1253
 msgid "Clear all files"
 msgstr "清除所有档案"
 
 #. End of Background music frame
 #. Begin of Message tab
-#: ../src/main-window.c:1164
+#: ../src/main-window.c:1258
 msgid "Messages"
 msgstr "讯息"
 
-#: ../src/main-window.c:1557
-msgid "Click to shrink the area"
-msgstr "按下以缩放区域"
-
-#: ../src/main-window.c:1589 ../src/callbacks.c:1120
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
 msgid "Sorry, I could not perform the operation!"
 msgstr "抱歉, 无法执行!"
 
-#: ../src/main-window.c:1738
+#: ../src/main-window.c:1825
 #, c-format
 msgid "File '%s' not found"
 msgstr "档案 '%s' 未发现"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Resolution"
 msgstr "解析度"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Type"
 msgstr "类型"
 
 #. No animation function (id = 0)
-#: ../src/main-window.c:2062 ../src/main-window.c:2064 ../src/support.c:179
-#: ../src/subtitles.c:162
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
 msgid "None"
 msgstr "无"
 
-#: ../src/main-window.c:2605
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
 msgid "Slides Transitions Report Dialog"
 msgstr "转场回报对话方块"
 
-#: ../src/main-window.c:2685
+#: ../src/main-window.c:2798
 msgid ""
 "\n"
 "<span weight='bold'>Note:</span>\n"
@@ -483,269 +551,373 @@
 "场景当转换时不能进行播放.\n"
 "按这场景程式会自动选择它."
 
-#: ../src/callbacks.c:124 ../src/callbacks.c:469 ../src/callbacks.c:1421
-#: ../src/callbacks.c:1499
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
 msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
 msgstr "尚未储存影片秀,您确定要关闭？"
 
-#: ../src/callbacks.c:210
+#: ../src/callbacks.c:220
 #, c-format
 msgid "Please wait, importing image %d out of %d"
 msgstr "请稍侯, 汇入图片 %d 张之 %d"
 
-#: ../src/callbacks.c:279
+#: ../src/callbacks.c:289
 msgid "Import audio files, use CTRL key for multiple select"
 msgstr "音效档汇入,使用CTRL键可以多重选择"
 
-#: ../src/callbacks.c:291
+#: ../src/callbacks.c:301
 msgid "All audio files"
 msgstr "全部音效档"
 
-#: ../src/callbacks.c:300 ../src/callbacks.c:375 ../src/callbacks.c:1449
-#: ../src/support.c:370
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
 msgid "All files"
 msgstr "全部档案"
 
-#: ../src/callbacks.c:356
+#: ../src/callbacks.c:365
 msgid "Import images, use SHIFT key for multiple select"
 msgstr "汇入图片,按着 SHIFT 键可多张选择"
 
-#: ../src/callbacks.c:369
+#: ../src/callbacks.c:378
 msgid "All image files"
 msgstr "全部图档"
 
-#: ../src/callbacks.c:529
+#: ../src/callbacks.c:578
 #, c-format
 msgid "%d x %d pixels"
 msgid_plural "%d x %d pixels"
 msgstr0 "%d x %d 像素"
 
-#: ../src/callbacks.c:805
+#: ../src/callbacks.c:853
 msgid "translator-credits"
 msgstr "中文翻译 村仔 <tw.chi.ming@gmail.com>"
 
-#: ../src/callbacks.c:1372
+#: ../src/callbacks.c:1517
 msgid "Stops the preview"
 msgstr "停止预览"
 
-#: ../src/callbacks.c:1432
+#: ../src/callbacks.c:1580
 msgid "Load an Imagination slideshow project"
 msgstr "载入一个影片秀专案"
 
-#: ../src/callbacks.c:1433
+#: ../src/callbacks.c:1581
 msgid "Save an Imagination slideshow project"
 msgstr "储存一个影片秀专案"
 
-#: ../src/callbacks.c:1443
-msgid "Imagination projects"
-msgstr "Imagination 想像"
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Imagination 想像 (*.img)"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
 
-#: ../src/callbacks.c:2195
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "新增场景(_y)"
+
+#: ../src/callbacks.c:2498
 msgid "Create empty slide"
 msgstr "新增场景"
 
-#: ../src/callbacks.c:2206
+#: ../src/callbacks.c:2509
 msgid "Empty slide options:"
 msgstr "空白场景选项:"
 
-#: ../src/callbacks.c:2216
-msgid "Use _solid color"
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
 msgstr "使用纯色(_s)"
 
-#: ../src/callbacks.c:2222
-msgid "Use _linear gradient"
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
 msgstr "线性渐层(_l)"
 
-#: ../src/callbacks.c:2228
-msgid "Use _radial gradient"
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
 msgstr "放射状渐层(_r)"
 
-#: ../src/callbacks.c:2258
-msgid "Preview"
-msgstr "预览"
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "放射状渐层(_r)"
+
+#: ../src/callbacks.c:3253
+msgid "Please choose a PNG file"
+msgstr ""
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "全部档案"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
 
 #. Display propert title depending on the callback that is calling this function.
-#: ../src/new_slideshow.c:65
+#: ../src/new_slideshow.c:66
 msgid "Project properties"
 msgstr "专案属性"
 
-#: ../src/new_slideshow.c:85
+#: ../src/new_slideshow.c:86
 msgid "<b>Slideshow Settings</b>"
 msgstr "<b>影片秀设定</b>"
 
-#: ../src/new_slideshow.c:130
-msgid "<b>Video Format</b>"
-msgstr "<b>影片格式</b>"
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "影片格式:"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "影片大小:"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+#, fuzzy
+msgid "Frames per Second (FPS):"
+msgstr "每秒 %d 画面"
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>电视格式</b>"
 
-#: ../src/new_slideshow.c:152 ../src/export.c:1337 ../src/export.c:1524
-#: ../src/export.c:1705
-msgid "<b>Video Size</b>"
-msgstr "<b>影片大小:</b>"
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
 
-#: ../src/new_slideshow.c:166
+#: ../src/new_slideshow.c:171
 msgid "<b>Advanced Settings</b>"
 msgstr "<b>进阶设定</b>"
 
-#: ../src/new_slideshow.c:173
+#: ../src/new_slideshow.c:178
 msgid "Rescale images to fit desired aspect ratio"
 msgstr "缩放图档以符合比例"
 
-#: ../src/new_slideshow.c:179
-msgid "Select background color:"
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
 msgstr "选择背景颜色:"
 
-#: ../src/slideshow_project.c:213
+#: ../src/slideshow_project.c:265
 msgid "This is not an Imagination project file!"
 msgstr "这不是一个影片秀专案!"
 
-#: ../src/slideshow_project.c:371
+#: ../src/slideshow_project.c:442
 #, c-format
 msgid "Slide %i: can't load image %s\n"
 msgstr "场景 %i: 无法载入图片 %s\n"
 
-#: ../src/slideshow_project.c:493
+#: ../src/slideshow_project.c:585
 #, c-format
 msgid "Can't load image %s\n"
 msgstr "无法载入图片 %s\n"
 
-#: ../src/support.c:130
+#: ../src/support.c:134
 #, c-format
 msgid "Welcome to Imagination - %d transition loaded."
 msgid_plural "Welcome to Imagination - %d transitions loaded."
 msgstr0 "欢迎使用 Imagination 想像 - %d 种特效已载入."
 
-#: ../src/support.c:141
+#: ../src/support.c:145
 #, c-format
 msgid "%d slide selected"
 msgid_plural "%d slides selected"
 msgstr0 "选择了 %d 个场景"
 
-#: ../src/support.c:152
+#: ../src/support.c:156
 #, c-format
 msgid "%d slide loaded %s"
 msgid_plural "%d slides loaded %s"
 msgstr0 "%d 个场景已汇入 %s"
 
-#: ../src/support.c:156
+#: ../src/support.c:160
 msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 msgstr ""
 " - 您可使用 CTRL 键以单选/取消，或用 SHIFT 键多选，以进行每个场景的设定。"
 
-#: ../src/support.c:322
+#: ../src/support.c:327
 msgid "Please choose the slideshow project filename"
 msgstr "请选择专案档名"
 
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures and also switches mode into
-#. * preview if needed.
-#: ../src/support.c:337 ../src/export.c:1183
-msgid "VOB (DVD video)"
-msgstr "VOB (DVD影音格式)"
-
-#: ../src/support.c:343
-msgid "MP4 (MPEG-4)"
-msgstr "MP4 (影音格式)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:349 ../src/export.c:1299
-msgid "OGV (Theora/Vorbis)"
-msgstr "OGV(开放影音格式)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:355 ../src/export.c:1486
-msgid "FLV (Flash video)"
-msgstr "FLV (串流媒体格式)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:361 ../src/export.c:1690
-msgid "3GP (Mobile Phones)"
-msgstr "3GP (手机影音格式)"
-
-#: ../src/subtitles.c:166
+#: ../src/subtitles.c:243
 msgid "Fade"
 msgstr "渐变色"
 
-#: ../src/subtitles.c:170
+#: ../src/subtitles.c:247
 msgid "Slide from left"
 msgstr "从左边滑入"
 
-#: ../src/subtitles.c:174
+#: ../src/subtitles.c:251
 msgid "Slide from right"
 msgstr "从右边滑入"
 
-#: ../src/subtitles.c:178
+#: ../src/subtitles.c:255
 msgid "Slide from top"
 msgstr "由上而下"
 
-#: ../src/subtitles.c:182
+#: ../src/subtitles.c:259
 msgid "Slide from bottom"
 msgstr "由下而上"
 
-#: ../src/subtitles.c:186
+#: ../src/subtitles.c:263
 msgid "Grow"
 msgstr "变大"
 
-#: ../src/export.c:150
+#: ../src/subtitles.c:267
+#, fuzzy
+msgid "Slide bottom to top"
+msgstr "由上而下"
+
+#: ../src/subtitles.c:271
+#, fuzzy
+msgid "Slide right to left"
+msgstr "从左边滑入"
+
+#: ../src/export.c:144
 msgid "<b>Export Settings</b>"
 msgstr "<b>汇出设定</b>"
 
-#: ../src/export.c:164
+#: ../src/export.c:158
 msgid "Filename:"
 msgstr "专案档名:"
 
-#: ../src/export.c:312
+#: ../src/export.c:306
 msgid "Exporting the slideshow"
 msgstr "汇出影片秀"
 
-#: ../src/export.c:323
+#: ../src/export.c:318
 msgid "Preparing for export ..."
 msgstr "准备汇出 ..."
 
-#: ../src/export.c:334
+#: ../src/export.c:329
 msgid "Overall progress:"
 msgstr "全部汇出进度:"
 
-#: ../src/export.c:424 ../src/export.c:807
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
 #, c-format
 msgid "Slide %d export progress:"
 msgstr "场景 %d 转换进度:"
 
-#: ../src/export.c:661
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
 msgid "Failed to launch the encoder!"
 msgstr "转档失败!"
 
-#: ../src/export.c:805
+#: ../src/export.c:902
 #, c-format
 msgid "Final transition export progress:"
 msgstr "完成转档汇出程序:"
 
-#: ../src/export.c:1195
-msgid "<b>Television Format</b>"
-msgstr "<b>电视格式</b>"
+#, fuzzy
+#~ msgid "Border Bottom"
+#~ msgstr "由下而上"
 
-#: ../src/export.c:1202 ../src/export.c:1326 ../src/export.c:1513
-msgid "Normal 4:3"
-msgstr "一般 4:3"
+#~ msgid "Click to expand the area"
+#~ msgstr "展开文字区"
 
-#: ../src/export.c:1207 ../src/export.c:1330 ../src/export.c:1517
-msgid "Widescreen 16:9"
-msgstr "宽萤幕 16:9"
+#~ msgid "Click to shrink the area"
+#~ msgstr "按下以缩放区域"
 
-#: ../src/export.c:1315 ../src/export.c:1502
-msgid "<b>Aspect Ratio</b>"
-msgstr "<b>场景变化</b>"
+#~ msgid "_Preview"
+#~ msgstr "预览(_P)"
+
+#~ msgid "Preview quality"
+#~ msgstr "预览品质"
+
+#~ msgid "_Low"
+#~ msgstr "低(_L)"
+
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgid "Add"
+#~ msgstr "新增"
+
+#~ msgid "Update"
+#~ msgstr "更新"
+
+#~ msgid "Remove"
+#~ msgstr "移除"
+
+#~ msgid "Click to choose the font background color"
+#~ msgstr "选择字型背景色"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "场景变化:"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>影片品质:</b>"
+
+#, fuzzy
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (DVD影音格式)"
+
+#~ msgid "MP4 (MPEG-4)"
+#~ msgstr "MP4 (影音格式)"
+
+#, fuzzy
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV(开放影音格式)"
+
+#, fuzzy
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (串流媒体格式)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (手机影音格式)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "一般 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "宽萤幕 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>影片品质:</b>"
 
-#: ../src/export.c:1373 ../src/export.c:1557
-msgid "<b>Video Quality:</b>"
-msgstr "<b>影片品质:</b>"
+#~ msgid "Low"
+#~ msgstr "低"
 
-#: ../src/export.c:1380 ../src/export.c:1564
-msgid "Low"
-msgstr "低"
+#~ msgid "Medium"
+#~ msgstr "中"
 
-#: ../src/export.c:1384 ../src/export.c:1568
-msgid "Medium"
-msgstr "中"
+#, fuzzy
+#~ msgid "low"
+#~ msgstr "慢"

imagination-3.0.tar.bz2/po/zh_TW.po -> imagination-3.4.tar.bz2/po/zh_TW.po Changed

@@ -7,43 +7,43 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 20:10+0100\n"
-"PO-Revision-Date: 2011-02-19 01:00+0800\n"
-"Last-Translator: chiming <tw.chi.ming@gmail.com>\n"
+"POT-Creation-Date: 2018-12-11 14:37+0000\n"
+"PO-Revision-Date: 2011-06-11 20:50+0100\n"
+"Last-Translator: Robert Chéramy <robert@cheramy.net>\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0; \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Language: zh_TW\n"
 
 #: ../imagination.desktop.in.h:1
+msgid "Imagination"
+msgstr "Imagination 想像"
+
+#: ../imagination.desktop.in.h:2
 msgid "A DVD slideshow maker"
 msgstr "一個DVD影片秀製作工具"
 
-#: ../imagination.desktop.in.h:2
+#: ../imagination.desktop.in.h:3
 msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr "一個GTK+2介面下的簡易DVD影片秀製作工具"
 
-#: ../imagination.desktop.in.h:3
-msgid "Imagination"
-msgstr "Imagination 想像"
-
-#: ../src/audio.c:109
+#: ../src/audio.c:108
 #, c-format
 msgid "Playing %s..."
 msgstr "播放中 %s..."
 
-#: ../src/audio.c:137 ../src/main-window.c:1130
+#: ../src/audio.c:136 ../src/main-window.c:1224
 msgid "Play the selected file"
 msgstr "播放選擇的檔案"
 
-#: ../src/audio.c:145
+#: ../src/audio.c:144
 msgid "Stop the playback"
 msgstr "停止播放"
 
-#: ../src/audio.c:272
+#: ../src/audio.c:271
 #, c-format
 msgid ""
 "%s:\n"
@@ -52,7 +52,7 @@
 "%s:\n"
 "聲音頻率不同\n"
 
-#: ../src/audio.c:277
+#: ../src/audio.c:276
 #, c-format
 msgid ""
 "%s:\n"
@@ -61,7 +61,7 @@
 "%s:\n"
 "聲道數不同\n"
 
-#: ../src/audio.c:283
+#: ../src/audio.c:282
 #, c-format
 msgid ""
 "%s:\n"
@@ -70,7 +70,7 @@
 "%s:\n"
 "頻率及聲道數不一致\n"
 
-#: ../src/audio.c:303
+#: ../src/audio.c:302
 #, c-format
 msgid ""
 "%s\n"
@@ -79,23 +79,23 @@
 "%s\n"
 "<b>沒有檔案也要繼續嗎?</b>"
 
-#: ../src/audio.c:307 ../src/audio.c:454
+#: ../src/audio.c:306 ../src/audio.c:453
 msgid "Audio files mismatch:"
 msgstr "音效檔沒有一致性:"
 
-#: ../src/audio.c:401
+#: ../src/audio.c:400
 msgid "Incompatible sample rate."
 msgstr "聲音頻率不同."
 
-#: ../src/audio.c:408
+#: ../src/audio.c:407
 msgid "Incompatible number of channels."
 msgstr "聲道數不同."
 
-#: ../src/audio.c:415
+#: ../src/audio.c:414
 msgid "Incompatible sample rate and number of channels."
 msgstr "頻率及聲道數都不一致"
 
-#: ../src/audio.c:437
+#: ../src/audio.c:436
 #, c-format
 msgid ""
 "File selection contains %d audio file that is incompatible with other files."
@@ -104,54 +104,57 @@
 "files."
 msgstr0 "選擇的檔案中有 %d 個與其他不同格式的音效檔"
 
-#: ../src/audio.c:443
+#: ../src/audio.c:442
 msgid "Please check audio tab for more information."
 msgstr "請檢查音效分頁以檢視更多訊息"
 
-#: ../src/main-window.c:222
+#: ../src/main-window.c:218
 msgid "_Slideshow"
 msgstr "影片秀(_S)"
 
-#: ../src/main-window.c:236
+#: ../src/main-window.c:232
 msgid "Import slideshow"
 msgstr "匯出影片秀"
 
-#: ../src/main-window.c:260
+#: ../src/main-window.c:256
 msgid "Import p_ictures"
 msgstr "匯入圖片(_i)"
 
-#: ../src/main-window.c:270
+#: ../src/main-window.c:266
 msgid "Import _music"
 msgstr "匯入音樂(_m)"
 
-#: ../src/main-window.c:287
-msgid "_Preview"
-msgstr "預覽(_P)"
+#: ../src/main-window.c:283
+msgid "Preview"
+msgstr "預覽"
+
+#: ../src/main-window.c:291
+#, fuzzy
+msgid "With music"
+msgstr "匯入音樂"
+
+#: ../src/main-window.c:300
+#, fuzzy
+msgid "Without music"
+msgstr "匯入音樂"
 
-#: ../src/main-window.c:295
-msgid "Export"
+#: ../src/main-window.c:307
+#, fuzzy
+msgid "Continuos"
+msgstr "內容"
+
+#: ../src/main-window.c:314
+#, fuzzy
+msgid "Ex_port"
 msgstr "匯出"
 
 #. Slide menu
-#: ../src/main-window.c:310
+#: ../src/main-window.c:330
 msgid "_Slide"
 msgstr "場景(_S)"
 
-#. Preview quality menu
-#: ../src/main-window.c:332
-msgid "Preview quality"
-msgstr "預覽品質"
-
-#: ../src/main-window.c:338
-msgid "_Low"
-msgstr "低(_L)"
-
-#: ../src/main-window.c:342 ../src/export.c:1389 ../src/export.c:1573
-msgid "High"
-msgstr "高"
-
 #. Zoom controls
-#: ../src/main-window.c:346
+#: ../src/main-window.c:349
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
@@ -159,317 +162,382 @@
 msgid "Add empt_y slide"
 msgstr "新增場景(_y)"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:379
+#, fuzzy
+msgid "Edit _empty slide"
+msgstr "新增場景(_y)"
+
+#: ../src/main-window.c:392
 msgid "Dele_te"
 msgstr "刪除(_t)"
 
-#: ../src/main-window.c:390
+#: ../src/main-window.c:400
 msgid "Repor_t"
 msgstr "回報(_t)"
 
-#: ../src/main-window.c:402
+#: ../src/main-window.c:412
 msgid "Rotate co_unter-clockwise"
 msgstr "順時針旋轉(_u)"
 
-#: ../src/main-window.c:413
+#: ../src/main-window.c:423
 msgid "_Rotate clockwise"
 msgstr "逆時針旋轉(_R)"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:435
 msgid "Un_select all"
 msgstr "全部不選(_s)"
 
 #. View menu
-#: ../src/main-window.c:434
+#: ../src/main-window.c:441
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/main-window.c:440
+#: ../src/main-window.c:447
 msgid "Preview mode"
 msgstr "預覽模式"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:453
 msgid "Overview mode"
 msgstr "概觀模式"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:456
 msgid "Preview _frame rate"
 msgstr "預覽模式(_f)"
 
-#: ../src/main-window.c:469
+#: ../src/main-window.c:459
+msgid "Fullscreen"
+msgstr ""
+
+#: ../src/main-window.c:480
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
 msgstr0 "每秒 %d 畫面"
 
 #. Help menu
-#: ../src/main-window.c:486
+#: ../src/main-window.c:497
 msgid "_Help"
 msgstr "說明(_H)"
 
-#: ../src/main-window.c:491
+#: ../src/main-window.c:502
 msgid "Contents"
 msgstr "內容"
 
-#: ../src/main-window.c:512 ../src/new_slideshow.c:65
+#: ../src/main-window.c:523 ../src/new_slideshow.c:66
 msgid "Create a new slideshow"
 msgstr "建立一個影片秀"
 
-#: ../src/main-window.c:517
+#: ../src/main-window.c:528
 msgid "Open a slideshow"
 msgstr "開啟一個影片秀"
 
-#: ../src/main-window.c:522
+#: ../src/main-window.c:533
 msgid "Save the slideshow"
 msgstr "儲存影片秀"
 
-#: ../src/main-window.c:535
+#: ../src/main-window.c:546
 msgid "Import pictures"
 msgstr "匯入圖片"
 
-#: ../src/main-window.c:544
+#: ../src/main-window.c:555
 msgid "Import music"
 msgstr "匯入音樂"
 
-#: ../src/main-window.c:549
+#: ../src/main-window.c:560
 msgid "Delete the selected slides"
 msgstr "刪除選擇的場景"
 
-#: ../src/main-window.c:559
+#: ../src/main-window.c:570
 msgid "Rotate the slide 90 degrees to the left"
 msgstr "順時針旋轉90度"
 
-#: ../src/main-window.c:570
+#: ../src/main-window.c:581
 msgid "Rotate the slide 90 degrees to the right"
 msgstr "逆時針旋轉90度"
 
-#: ../src/main-window.c:576
+#: ../src/main-window.c:587
 msgid "Zoom In"
 msgstr "放大"
 
-#: ../src/main-window.c:581
+#: ../src/main-window.c:592
 msgid "Zoom Out"
 msgstr "縮小"
 
-#: ../src/main-window.c:586
+#: ../src/main-window.c:597
 msgid "Normal Size"
 msgstr "正常"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:602
 msgid "Fit Zoom in Window"
 msgstr "縮放至視窗大小"
 
-#: ../src/main-window.c:599 ../src/callbacks.c:1362
-msgid "Starts the preview"
+#: ../src/main-window.c:610 ../src/callbacks.c:1510
+#, fuzzy
+msgid "Starts the preview without music"
 msgstr "開始預覽"
 
-#: ../src/main-window.c:608
+#: ../src/main-window.c:619
 msgid "Go to the first slide of the slideshow"
 msgstr "首張"
 
-#: ../src/main-window.c:614
+#: ../src/main-window.c:625
 msgid "Go to the previous slide of the slideshow"
 msgstr "上張"
 
-#: ../src/main-window.c:630 ../src/main-window.c:837
+#: ../src/main-window.c:641 ../src/main-window.c:847
 msgid " of "
 msgstr "的"
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:653
 msgid "Go to the next slide of the slideshow"
 msgstr "下張"
 
-#: ../src/main-window.c:648
+#: ../src/main-window.c:659
 msgid "Go to the last slide of the slideshow"
 msgstr "末張"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:708
 msgid "Video"
 msgstr "影片"
 
-#: ../src/main-window.c:717
+#: ../src/main-window.c:726
 msgid "<b>Slide Settings</b>"
 msgstr "<b>場景設定</b>"
 
 #. Transition types label
-#: ../src/main-window.c:727
+#: ../src/main-window.c:736
 msgid "Transition Type:"
 msgstr "轉場效果類型:"
 
-#: ../src/main-window.c:747
+#: ../src/main-window.c:756
 msgid "Random"
 msgstr "亂數取得"
 
-#: ../src/main-window.c:748
+#: ../src/main-window.c:757
 msgid "Imagination randomly decides which transition to apply"
 msgstr "自動由亂數決定效果"
 
 #. Transition duration
-#: ../src/main-window.c:754
+#: ../src/main-window.c:763
 msgid "Transition Speed:"
 msgstr "轉場速度:"
 
-#: ../src/main-window.c:765
+#: ../src/main-window.c:774
 msgid "Fast"
 msgstr "快"
 
-#: ../src/main-window.c:767
+#: ../src/main-window.c:776
 msgid "Normal"
 msgstr "一般"
 
-#: ../src/main-window.c:769
+#: ../src/main-window.c:778
 msgid "Slow"
 msgstr "慢"
 
 #. Slide duration
-#: ../src/main-window.c:776
+#: ../src/main-window.c:785
 msgid "Slide Duration in sec:"
 msgstr "本張持續秒數:"
 
 #. Slide Total Duration
-#: ../src/main-window.c:787
+#: ../src/main-window.c:797
 msgid "Slideshow Length:"
 msgstr "影片秀時間總長:"
 
-#: ../src/main-window.c:804
+#: ../src/main-window.c:814
 msgid "<b>Slide Motion</b>"
 msgstr "<b>場景變化</b>"
 
-#: ../src/main-window.c:814
+#: ../src/main-window.c:824
 msgid "Stop Point:"
 msgstr "停止點:"
 
-#: ../src/main-window.c:851
+#: ../src/main-window.c:865
+#, fuzzy
+msgid "Add Stop point"
+msgstr "停止點:"
+
+#: ../src/main-window.c:869
 msgid "Duration:"
 msgstr "持續時間:"
 
-#: ../src/main-window.c:860
+#: ../src/main-window.c:886
+#, fuzzy
+msgid "Remove Stop point"
+msgstr "停止點:"
+
+#: ../src/main-window.c:891
 msgid "Zoom: "
 msgstr "縮放: "
 
-#: ../src/main-window.c:874
-msgid "Add"
-msgstr "新增"
-
-#: ../src/main-window.c:878
-msgid "Update"
-msgstr "更新"
-
-#: ../src/main-window.c:883
-msgid "Remove"
-msgstr "移除"
-
-#: ../src/main-window.c:897
+#: ../src/main-window.c:910
 msgid "<b>Slide Text</b>"
 msgstr "<b>字幕設定</b>"
 
-#: ../src/main-window.c:926 ../src/main-window.c:1562
-msgid "Click to expand the area"
-msgstr "展開文字區"
-
-#: ../src/main-window.c:943
+#: ../src/main-window.c:944
 msgid "Click to choose the font"
 msgstr "選擇字型"
 
-#: ../src/main-window.c:950
+#: ../src/main-window.c:951 ../src/support.c:1176
 msgid "Click to choose the font color"
 msgstr "選擇字型顏色"
 
-#: ../src/main-window.c:957
-msgid "Click to choose the font background color"
-msgstr "選擇字型背景色"
+#: ../src/main-window.c:958
+msgid ""
+"Click to choose the font border color. If the opacity value is set to 0, "
+"Imagination will not render any border."
+msgstr ""
+
+#: ../src/main-window.c:966
+msgid ""
+"Click to choose the font background color. If the opacity value is set to 0, "
+"Imagination will not render any background."
+msgstr ""
+
+#: ../src/main-window.c:974
+msgid "Text pattern:"
+msgstr ""
+
+#: ../src/main-window.c:984
+#, fuzzy
+msgid "Click to choose the text pattern"
+msgstr "選擇字型"
 
-#: ../src/main-window.c:961
+#: ../src/main-window.c:991
+msgid "Top Border"
+msgstr ""
+
+#: ../src/main-window.c:995
+msgid "Bottom Border"
+msgstr ""
+
+#: ../src/main-window.c:1002
+msgid "Border Width:"
+msgstr ""
+
+#: ../src/main-window.c:1018
+#, fuzzy
+msgid "Click to choose the slide text borders color"
+msgstr "選擇字型顏色"
+
+#: ../src/main-window.c:1023
 msgid "Animation:"
 msgstr "動作:"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:1035
 msgid "Animation Speed:"
 msgstr "速度:"
 
-#: ../src/main-window.c:989
+#: ../src/main-window.c:1061
+#, fuzzy
+msgid "<b>Slide Text Position</b>"
+msgstr "<b>場景變化</b>"
+
+#: ../src/main-window.c:1071
+#, fuzzy
+msgid "Horizontal Position: "
+msgstr "字幕位置:"
+
+#: ../src/main-window.c:1088
+msgid "Center the text horizontally"
+msgstr ""
+
+#: ../src/main-window.c:1090
+#, fuzzy
+msgid "Vertical Position: "
+msgstr "字幕位置:"
+
+#: ../src/main-window.c:1107
+msgid "Center the text vertically"
+msgstr ""
+
+#: ../src/main-window.c:1109
+msgid "Angle: "
+msgstr ""
+
+#: ../src/main-window.c:1125
+msgid "Reset the angle"
+msgstr ""
+
+#: ../src/main-window.c:1127
 msgid "Placing is relative to:"
 msgstr "相關位置:"
 
-#: ../src/main-window.c:1003
+#: ../src/main-window.c:1140
 msgid "Exported video"
 msgstr "匯出影片"
 
-#: ../src/main-window.c:1005
+#: ../src/main-window.c:1142
 msgid "Original image"
 msgstr "原始圖檔"
 
-#: ../src/main-window.c:1014
-msgid "Subtitle position:"
-msgstr "字幕位置:"
-
 #. Background music frame
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:1149
 msgid "Audio"
 msgstr "音效"
 
-#: ../src/main-window.c:1068
+#: ../src/main-window.c:1162
 msgid "<b>Background Music</b>"
 msgstr "<b>背景音樂</b>"
 
-#: ../src/main-window.c:1114
+#: ../src/main-window.c:1208
 msgid "Music Duration:"
 msgstr "播放時間長度:"
 
-#: ../src/main-window.c:1138
+#: ../src/main-window.c:1232
 msgid "Delete the selected file"
 msgstr "移除選擇檔案"
 
-#: ../src/main-window.c:1145
+#: ../src/main-window.c:1239
 msgid "Move the selected file up"
 msgstr "上移選擇檔案"
 
-#: ../src/main-window.c:1152
+#: ../src/main-window.c:1246
 msgid "Move the selected file down"
 msgstr "下移選擇檔案"
 
-#: ../src/main-window.c:1159
+#: ../src/main-window.c:1253
 msgid "Clear all files"
 msgstr "清除所有檔案"
 
 #. End of Background music frame
 #. Begin of Message tab
-#: ../src/main-window.c:1164
+#: ../src/main-window.c:1258
 msgid "Messages"
 msgstr "訊息"
 
-#: ../src/main-window.c:1557
-msgid "Click to shrink the area"
-msgstr "按下以縮放區域"
-
-#: ../src/main-window.c:1589 ../src/callbacks.c:1120
+#: ../src/main-window.c:1674 ../src/callbacks.c:1244
 msgid "Sorry, I could not perform the operation!"
 msgstr "抱歉, 無法執行!"
 
-#: ../src/main-window.c:1738
+#: ../src/main-window.c:1825
 #, c-format
 msgid "File '%s' not found"
 msgstr "檔案 '%s' 未發現"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Resolution"
 msgstr "解析度"
 
-#: ../src/main-window.c:1747
+#: ../src/main-window.c:1834
 msgid "Type"
 msgstr "類型"
 
 #. No animation function (id = 0)
-#: ../src/main-window.c:2062 ../src/main-window.c:2064 ../src/support.c:179
-#: ../src/subtitles.c:162
+#: ../src/main-window.c:2113 ../src/main-window.c:2115 ../src/support.c:183
+#: ../src/subtitles.c:239
 msgid "None"
 msgstr "無"
 
-#: ../src/main-window.c:2605
+#: ../src/main-window.c:2558
+msgid "Please delete the pattern to choose the color"
+msgstr ""
+
+#: ../src/main-window.c:2718
 msgid "Slides Transitions Report Dialog"
 msgstr "轉場回報對話方塊"
 
-#: ../src/main-window.c:2685
+#: ../src/main-window.c:2798
 msgid ""
 "\n"
 "<span weight='bold'>Note:</span>\n"
@@ -483,269 +551,373 @@
 "場景當轉換時不能進行播放.\n"
 "按這場景程式會自動選擇它."
 
-#: ../src/callbacks.c:124 ../src/callbacks.c:469 ../src/callbacks.c:1421
-#: ../src/callbacks.c:1499
+#: ../src/callbacks.c:134 ../src/callbacks.c:518 ../src/callbacks.c:1570
+#: ../src/callbacks.c:1660
 msgid "You didn't save your slideshow yet. Are you sure you want to close it?"
 msgstr "尚未儲存影片秀,您確定要關閉？"
 
-#: ../src/callbacks.c:210
+#: ../src/callbacks.c:220
 #, c-format
 msgid "Please wait, importing image %d out of %d"
 msgstr "請稍侯, 匯入圖片 %d 張之 %d"
 
-#: ../src/callbacks.c:279
+#: ../src/callbacks.c:289
 msgid "Import audio files, use CTRL key for multiple select"
 msgstr "音效檔匯入,使用CTRL鍵可以多重選擇"
 
-#: ../src/callbacks.c:291
+#: ../src/callbacks.c:301
 msgid "All audio files"
 msgstr "全部音效檔"
 
-#: ../src/callbacks.c:300 ../src/callbacks.c:375 ../src/callbacks.c:1449
-#: ../src/support.c:370
+#: ../src/callbacks.c:310 ../src/callbacks.c:384 ../src/callbacks.c:1597
+#: ../src/support.c:358
 msgid "All files"
 msgstr "全部檔案"
 
-#: ../src/callbacks.c:356
+#: ../src/callbacks.c:365
 msgid "Import images, use SHIFT key for multiple select"
 msgstr "匯入圖片,按著 SHIFT 鍵可多張選擇"
 
-#: ../src/callbacks.c:369
+#: ../src/callbacks.c:378
 msgid "All image files"
 msgstr "全部圖檔"
 
-#: ../src/callbacks.c:529
+#: ../src/callbacks.c:578
 #, c-format
 msgid "%d x %d pixels"
 msgid_plural "%d x %d pixels"
 msgstr0 "%d x %d 像素"
 
-#: ../src/callbacks.c:805
+#: ../src/callbacks.c:853
 msgid "translator-credits"
 msgstr "中文翻譯 村仔 <tw.chi.ming@gmail.com>"
 
-#: ../src/callbacks.c:1372
+#: ../src/callbacks.c:1517
 msgid "Stops the preview"
 msgstr "停止預覽"
 
-#: ../src/callbacks.c:1432
+#: ../src/callbacks.c:1580
 msgid "Load an Imagination slideshow project"
 msgstr "載入一個影片秀專案"
 
-#: ../src/callbacks.c:1433
+#: ../src/callbacks.c:1581
 msgid "Save an Imagination slideshow project"
 msgstr "儲存一個影片秀專案"
 
-#: ../src/callbacks.c:1443
-msgid "Imagination projects"
-msgstr "Imagination 想像"
+#: ../src/callbacks.c:1591
+#, fuzzy
+msgid "Imagination projects (*.img)"
+msgstr "Imagination 想像 (*.img)"
+
+#: ../src/callbacks.c:1607
+msgid "Don't include folder names in the filenames"
+msgstr ""
+
+#: ../src/callbacks.c:1608
+msgid ""
+"If you check this button, be sure to include ALL the project files in the "
+"SAME folder before attempting to open it again."
+msgstr ""
 
-#: ../src/callbacks.c:2195
+#: ../src/callbacks.c:2498
+#, fuzzy
+msgid "Edit empty slide"
+msgstr "新增場景(_y)"
+
+#: ../src/callbacks.c:2498
 msgid "Create empty slide"
 msgstr "新增場景"
 
-#: ../src/callbacks.c:2206
+#: ../src/callbacks.c:2509
 msgid "Empty slide options:"
 msgstr "空白場景選項:"
 
-#: ../src/callbacks.c:2216
-msgid "Use _solid color"
+#: ../src/callbacks.c:2519
+#, fuzzy
+msgid "_Solid color"
 msgstr "使用純色(_s)"
 
-#: ../src/callbacks.c:2222
-msgid "Use _linear gradient"
+#: ../src/callbacks.c:2525
+#, fuzzy
+msgid "_Linear gradient"
 msgstr "線性漸層(_l)"
 
-#: ../src/callbacks.c:2228
-msgid "Use _radial gradient"
+#: ../src/callbacks.c:2531
+#, fuzzy
+msgid "_Radial gradient"
 msgstr "放射狀漸層(_r)"
 
-#: ../src/callbacks.c:2258
-msgid "Preview"
-msgstr "預覽"
+#: ../src/callbacks.c:2537
+#, fuzzy
+msgid "_Fade gradient"
+msgstr "放射狀漸層(_r)"
+
+#: ../src/callbacks.c:3253
+msgid "Please choose a PNG file"
+msgstr ""
+
+#: ../src/callbacks.c:3267
+#, fuzzy
+msgid "PNG files"
+msgstr "全部檔案"
+
+#: ../src/callbacks.c:3274
+msgid "Delete current pattern"
+msgstr ""
 
 #. Display propert title depending on the callback that is calling this function.
-#: ../src/new_slideshow.c:65
+#: ../src/new_slideshow.c:66
 msgid "Project properties"
 msgstr "專案屬性"
 
-#: ../src/new_slideshow.c:85
+#: ../src/new_slideshow.c:86
 msgid "<b>Slideshow Settings</b>"
 msgstr "<b>影片秀設定</b>"
 
-#: ../src/new_slideshow.c:130
-msgid "<b>Video Format</b>"
-msgstr "<b>影片格式</b>"
+#. Video Format
+#: ../src/new_slideshow.c:101
+#, fuzzy
+msgid "Video Format:"
+msgstr "影片格式:"
+
+#. Video Size
+#: ../src/new_slideshow.c:120
+msgid "Video Size:"
+msgstr "影片大小:"
+
+#. FPS
+#: ../src/new_slideshow.c:132
+#, fuzzy
+msgid "Frames per Second (FPS):"
+msgstr "每秒 %d 畫面"
+
+#. Aspect Ratio
+#: ../src/new_slideshow.c:142
+#, fuzzy
+msgid "Television Format:"
+msgstr "<b>電視格式</b>"
 
-#: ../src/new_slideshow.c:152 ../src/export.c:1337 ../src/export.c:1524
-#: ../src/export.c:1705
-msgid "<b>Video Size</b>"
-msgstr "<b>影片大小:</b>"
+#. Bitrate
+#: ../src/new_slideshow.c:152
+msgid "Bitrate:"
+msgstr ""
 
-#: ../src/new_slideshow.c:166
+#: ../src/new_slideshow.c:171
 msgid "<b>Advanced Settings</b>"
 msgstr "<b>進階設定</b>"
 
-#: ../src/new_slideshow.c:173
+#: ../src/new_slideshow.c:178
 msgid "Rescale images to fit desired aspect ratio"
 msgstr "縮放圖檔以符合比例"
 
-#: ../src/new_slideshow.c:179
-msgid "Select background color:"
+#: ../src/new_slideshow.c:184
+msgid "End slideshow with blank slide"
+msgstr ""
+
+#: ../src/new_slideshow.c:187
+#, fuzzy
+msgid "Select blank slide color:"
 msgstr "選擇背景顏色:"
 
-#: ../src/slideshow_project.c:213
+#: ../src/slideshow_project.c:265
 msgid "This is not an Imagination project file!"
 msgstr "這不是一個影片秀專案!"
 
-#: ../src/slideshow_project.c:371
+#: ../src/slideshow_project.c:442
 #, c-format
 msgid "Slide %i: can't load image %s\n"
 msgstr "場景 %i: 無法載入圖片 %s\n"
 
-#: ../src/slideshow_project.c:493
+#: ../src/slideshow_project.c:585
 #, c-format
 msgid "Can't load image %s\n"
 msgstr "無法載入圖片 %s\n"
 
-#: ../src/support.c:130
+#: ../src/support.c:134
 #, c-format
 msgid "Welcome to Imagination - %d transition loaded."
 msgid_plural "Welcome to Imagination - %d transitions loaded."
 msgstr0 "歡迎使用 Imagination 想像 - %d 種特效已載入."
 
-#: ../src/support.c:141
+#: ../src/support.c:145
 #, c-format
 msgid "%d slide selected"
 msgid_plural "%d slides selected"
 msgstr0 "選擇了 %d 個場景"
 
-#: ../src/support.c:152
+#: ../src/support.c:156
 #, c-format
 msgid "%d slide loaded %s"
 msgid_plural "%d slides loaded %s"
 msgstr0 "%d 個場景已匯入 %s"
 
-#: ../src/support.c:156
+#: ../src/support.c:160
 msgid " - Use the CTRL key to select/unselect or SHIFT for multiple select"
 msgstr ""
 " - 您可使用 CTRL 鍵以單選/取消，或用 SHIFT 鍵多選，以進行每個場景的設定。"
 
-#: ../src/support.c:322
+#: ../src/support.c:327
 msgid "Please choose the slideshow project filename"
 msgstr "請選擇專案檔名"
 
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures and also switches mode into
-#. * preview if needed.
-#: ../src/support.c:337 ../src/export.c:1183
-msgid "VOB (DVD video)"
-msgstr "VOB (DVD影音格式)"
-
-#: ../src/support.c:343
-msgid "MP4 (MPEG-4)"
-msgstr "MP4 (影音格式)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:349 ../src/export.c:1299
-msgid "OGV (Theora/Vorbis)"
-msgstr "OGV(開放影音格式)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:355 ../src/export.c:1486
-msgid "FLV (Flash video)"
-msgstr "FLV (串流媒體格式)"
-
-#. This function call should be the first thing exporter does, since this
-#. * function will take some preventive measures.
-#: ../src/support.c:361 ../src/export.c:1690
-msgid "3GP (Mobile Phones)"
-msgstr "3GP (手機影音格式)"
-
-#: ../src/subtitles.c:166
+#: ../src/subtitles.c:243
 msgid "Fade"
 msgstr "漸變色"
 
-#: ../src/subtitles.c:170
+#: ../src/subtitles.c:247
 msgid "Slide from left"
 msgstr "從左邊滑入"
 
-#: ../src/subtitles.c:174
+#: ../src/subtitles.c:251
 msgid "Slide from right"
 msgstr "從右邊滑入"
 
-#: ../src/subtitles.c:178
+#: ../src/subtitles.c:255
 msgid "Slide from top"
 msgstr "由上而下"
 
-#: ../src/subtitles.c:182
+#: ../src/subtitles.c:259
 msgid "Slide from bottom"
 msgstr "由下而上"
 
-#: ../src/subtitles.c:186
+#: ../src/subtitles.c:263
 msgid "Grow"
 msgstr "變大"
 
-#: ../src/export.c:150
+#: ../src/subtitles.c:267
+#, fuzzy
+msgid "Slide bottom to top"
+msgstr "由上而下"
+
+#: ../src/subtitles.c:271
+#, fuzzy
+msgid "Slide right to left"
+msgstr "從左邊滑入"
+
+#: ../src/export.c:144
 msgid "<b>Export Settings</b>"
 msgstr "<b>匯出設定</b>"
 
-#: ../src/export.c:164
+#: ../src/export.c:158
 msgid "Filename:"
 msgstr "專案檔名:"
 
-#: ../src/export.c:312
+#: ../src/export.c:306
 msgid "Exporting the slideshow"
 msgstr "匯出影片秀"
 
-#: ../src/export.c:323
+#: ../src/export.c:318
 msgid "Preparing for export ..."
 msgstr "準備匯出 ..."
 
-#: ../src/export.c:334
+#: ../src/export.c:329
 msgid "Overall progress:"
 msgstr "全部匯出進度:"
 
-#: ../src/export.c:424 ../src/export.c:807
+#: ../src/export.c:341
+msgid "Elapsed time:"
+msgstr ""
+
+#: ../src/export.c:452 ../src/export.c:904
 #, c-format
 msgid "Slide %d export progress:"
 msgstr "場景 %d 轉換進度:"
 
-#: ../src/export.c:661
+#: ../src/export.c:481
+msgid "Close"
+msgstr ""
+
+#: ../src/export.c:485
+#, c-format
+msgid ""
+"Elapsed time: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/export.c:754
 msgid "Failed to launch the encoder!"
 msgstr "轉檔失敗!"
 
-#: ../src/export.c:805
+#: ../src/export.c:902
 #, c-format
 msgid "Final transition export progress:"
 msgstr "完成轉檔匯出程序:"
 
-#: ../src/export.c:1195
-msgid "<b>Television Format</b>"
-msgstr "<b>電視格式</b>"
+#, fuzzy
+#~ msgid "Border Bottom"
+#~ msgstr "由下而上"
 
-#: ../src/export.c:1202 ../src/export.c:1326 ../src/export.c:1513
-msgid "Normal 4:3"
-msgstr "一般 4:3"
+#~ msgid "Click to expand the area"
+#~ msgstr "展開文字區"
 
-#: ../src/export.c:1207 ../src/export.c:1330 ../src/export.c:1517
-msgid "Widescreen 16:9"
-msgstr "寬螢幕 16:9"
+#~ msgid "Click to shrink the area"
+#~ msgstr "按下以縮放區域"
 
-#: ../src/export.c:1315 ../src/export.c:1502
-msgid "<b>Aspect Ratio</b>"
-msgstr "<b>場景變化</b>"
+#~ msgid "_Preview"
+#~ msgstr "預覽(_P)"
+
+#~ msgid "Preview quality"
+#~ msgstr "預覽品質"
+
+#~ msgid "_Low"
+#~ msgstr "低(_L)"
+
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgid "Add"
+#~ msgstr "新增"
+
+#~ msgid "Update"
+#~ msgstr "更新"
+
+#~ msgid "Remove"
+#~ msgstr "移除"
+
+#~ msgid "Click to choose the font background color"
+#~ msgstr "選擇字型背景色"
+
+#, fuzzy
+#~ msgid "Aspect Ratio:"
+#~ msgstr "場景變化:"
+
+#, fuzzy
+#~ msgid "<b>Video Size</b>"
+#~ msgstr "<b>影片品質:</b>"
+
+#, fuzzy
+#~ msgid "VOB (DVD video)"
+#~ msgstr "VOB (DVD影音格式)"
+
+#~ msgid "MP4 (MPEG-4)"
+#~ msgstr "MP4 (影音格式)"
+
+#, fuzzy
+#~ msgid "OGV (Theora/Vorbis)"
+#~ msgstr "OGV(開放影音格式)"
+
+#, fuzzy
+#~ msgid "FLV (Flash video)"
+#~ msgstr "FLV (串流媒體格式)"
+
+#~ msgid "3GP (Mobile Phones)"
+#~ msgstr "3GP (手機影音格式)"
+
+#~ msgid "Normal 4:3"
+#~ msgstr "一般 4:3"
+
+#~ msgid "Widescreen 16:9"
+#~ msgstr "寬螢幕 16:9"
+
+#~ msgid "<b>Video Quality:</b>"
+#~ msgstr "<b>影片品質:</b>"
 
-#: ../src/export.c:1373 ../src/export.c:1557
-msgid "<b>Video Quality:</b>"
-msgstr "<b>影片品質:</b>"
+#~ msgid "Low"
+#~ msgstr "低"
 
-#: ../src/export.c:1380 ../src/export.c:1564
-msgid "Low"
-msgstr "低"
+#~ msgid "Medium"
+#~ msgstr "中"
 
-#: ../src/export.c:1384 ../src/export.c:1568
-msgid "Medium"
-msgstr "中"
+#, fuzzy
+#~ msgid "low"
+#~ msgstr "慢"

imagination-3.0.tar.bz2/src/Makefile.am -> imagination-3.4.tar.bz2/src/Makefile.am Changed

imagination-3.0.tar.bz2/src/Makefile.in -> imagination-3.4.tar.bz2/src/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,18 +90,17 @@
 host_triplet = @host@
 bin_PROGRAMS = imagination$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_imagination_OBJECTS = imagination-sexy-icon-entry.$(OBJEXT) \
-	imagination-imgcellrendereranim.$(OBJEXT) \
+am_imagination_OBJECTS = imagination-imgcellrendereranim.$(OBJEXT) \
 	imagination-imagination.$(OBJEXT) \
 	imagination-support.$(OBJEXT) \
 	imagination-main-window.$(OBJEXT) \
@@ -56,18 +109,31 @@
 	imagination-slideshow_project.$(OBJEXT) \
 	imagination-audio.$(OBJEXT) imagination-export.$(OBJEXT) \
 	imagination-subtitles.$(OBJEXT) \
-	imagination-imgtablebutton.$(OBJEXT) \
 	imagination-imgcellrendererpixbuf.$(OBJEXT) \
-	imagination-img_sox.$(OBJEXT)
+	imagination-img_sox.$(OBJEXT) \
+	imagination-video_formats.$(OBJEXT)
 imagination_OBJECTS = $(am_imagination_OBJECTS)
 am__DEPENDENCIES_1 =
 imagination_DEPENDENCIES = $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 imagination_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(imagination_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -78,26 +144,45 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(imagination_SOURCES)
 DIST_SOURCES = $(imagination_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -119,6 +204,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -142,6 +228,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -150,8 +241,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -197,6 +290,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -225,11 +319,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -237,6 +332,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -254,7 +350,6 @@
 	@SOX_CFLAGS@
 
 imagination_SOURCES = \
-	sexy-icon-entry.c sexy-icon-entry.h \
 	imgcellrendereranim.c imgcellrendereranim.h \
 	imagination.c imagination.h \
 	support.c support.h \
@@ -265,14 +360,14 @@
 	audio.c audio.h \
 	export.c export.h \
 	subtitles.c subtitles.h \
-	imgtablebutton.c imgtablebutton.h \
 	imgcellrendererpixbuf.c imgcellrendererpixbuf.h \
-	img_sox.c img_sox.h
+	img_sox.c img_sox.h \
+	video_formats.c video_formats.h
 
 imagination_CFLAGS = \
 	-DDATADIR=\"$(datadir)\"
 
-imagination_LDADD = @PACKAGE_LIBS@ @SOX_LIBS@ $(INTLLIBS)
+imagination_LDADD = @PACKAGE_LIBS@ @SOX_LIBS@ $(INTLLIBS) -lgmodule-2.0 -lm
 all: all-am
 
 .SUFFIXES:
@@ -289,7 +384,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -309,14 +403,19 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1 } \
@@ -337,7 +436,8 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -350,7 +450,8 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-imagination$(EXEEXT): $(imagination_OBJECTS) $(imagination_DEPENDENCIES) 
+
+imagination$(EXEEXT): $(imagination_OBJECTS) $(imagination_DEPENDENCIES) $(EXTRA_imagination_DEPENDENCIES) 
 	@rm -f imagination$(EXEEXT)
 	$(AM_V_CCLD)$(imagination_LINK) $(imagination_OBJECTS) $(imagination_LDADD) $(LIBS)
 
@@ -367,261 +468,215 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-img_sox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-imgcellrendereranim.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-imgcellrendererpixbuf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-imgtablebutton.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-main-window.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-new_slideshow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-sexy-icon-entry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-slideshow_project.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-subtitles.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-support.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagination-video_formats.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-imagination-sexy-icon-entry.o: sexy-icon-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-sexy-icon-entry.o -MD -MP -MF $(DEPDIR)/imagination-sexy-icon-entry.Tpo -c -o imagination-sexy-icon-entry.o `test -f 'sexy-icon-entry.c' || echo '$(srcdir)/'`sexy-icon-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-sexy-icon-entry.Tpo $(DEPDIR)/imagination-sexy-icon-entry.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sexy-icon-entry.c' object='imagination-sexy-icon-entry.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-sexy-icon-entry.o `test -f 'sexy-icon-entry.c' || echo '$(srcdir)/'`sexy-icon-entry.c
-
-imagination-sexy-icon-entry.obj: sexy-icon-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-sexy-icon-entry.obj -MD -MP -MF $(DEPDIR)/imagination-sexy-icon-entry.Tpo -c -o imagination-sexy-icon-entry.obj `if test -f 'sexy-icon-entry.c'; then $(CYGPATH_W) 'sexy-icon-entry.c'; else $(CYGPATH_W) '$(srcdir)/sexy-icon-entry.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-sexy-icon-entry.Tpo $(DEPDIR)/imagination-sexy-icon-entry.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sexy-icon-entry.c' object='imagination-sexy-icon-entry.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-sexy-icon-entry.obj `if test -f 'sexy-icon-entry.c'; then $(CYGPATH_W) 'sexy-icon-entry.c'; else $(CYGPATH_W) '$(srcdir)/sexy-icon-entry.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 imagination-imgcellrendereranim.o: imgcellrendereranim.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-imgcellrendereranim.o -MD -MP -MF $(DEPDIR)/imagination-imgcellrendereranim.Tpo -c -o imagination-imgcellrendereranim.o `test -f 'imgcellrendereranim.c' || echo '$(srcdir)/'`imgcellrendereranim.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-imgcellrendereranim.Tpo $(DEPDIR)/imagination-imgcellrendereranim.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='imgcellrendereranim.c' object='imagination-imgcellrendereranim.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='imgcellrendereranim.c' object='imagination-imgcellrendereranim.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgcellrendereranim.o `test -f 'imgcellrendereranim.c' || echo '$(srcdir)/'`imgcellrendereranim.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgcellrendereranim.o `test -f 'imgcellrendereranim.c' || echo '$(srcdir)/'`imgcellrendereranim.c
 
 imagination-imgcellrendereranim.obj: imgcellrendereranim.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-imgcellrendereranim.obj -MD -MP -MF $(DEPDIR)/imagination-imgcellrendereranim.Tpo -c -o imagination-imgcellrendereranim.obj `if test -f 'imgcellrendereranim.c'; then $(CYGPATH_W) 'imgcellrendereranim.c'; else $(CYGPATH_W) '$(srcdir)/imgcellrendereranim.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-imgcellrendereranim.Tpo $(DEPDIR)/imagination-imgcellrendereranim.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='imgcellrendereranim.c' object='imagination-imgcellrendereranim.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='imgcellrendereranim.c' object='imagination-imgcellrendereranim.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgcellrendereranim.obj `if test -f 'imgcellrendereranim.c'; then $(CYGPATH_W) 'imgcellrendereranim.c'; else $(CYGPATH_W) '$(srcdir)/imgcellrendereranim.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgcellrendereranim.obj `if test -f 'imgcellrendereranim.c'; then $(CYGPATH_W) 'imgcellrendereranim.c'; else $(CYGPATH_W) '$(srcdir)/imgcellrendereranim.c'; fi`
 
 imagination-imagination.o: imagination.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-imagination.o -MD -MP -MF $(DEPDIR)/imagination-imagination.Tpo -c -o imagination-imagination.o `test -f 'imagination.c' || echo '$(srcdir)/'`imagination.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-imagination.Tpo $(DEPDIR)/imagination-imagination.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='imagination.c' object='imagination-imagination.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='imagination.c' object='imagination-imagination.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imagination.o `test -f 'imagination.c' || echo '$(srcdir)/'`imagination.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imagination.o `test -f 'imagination.c' || echo '$(srcdir)/'`imagination.c
 
 imagination-imagination.obj: imagination.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-imagination.obj -MD -MP -MF $(DEPDIR)/imagination-imagination.Tpo -c -o imagination-imagination.obj `if test -f 'imagination.c'; then $(CYGPATH_W) 'imagination.c'; else $(CYGPATH_W) '$(srcdir)/imagination.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-imagination.Tpo $(DEPDIR)/imagination-imagination.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='imagination.c' object='imagination-imagination.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='imagination.c' object='imagination-imagination.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imagination.obj `if test -f 'imagination.c'; then $(CYGPATH_W) 'imagination.c'; else $(CYGPATH_W) '$(srcdir)/imagination.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imagination.obj `if test -f 'imagination.c'; then $(CYGPATH_W) 'imagination.c'; else $(CYGPATH_W) '$(srcdir)/imagination.c'; fi`
 
 imagination-support.o: support.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-support.o -MD -MP -MF $(DEPDIR)/imagination-support.Tpo -c -o imagination-support.o `test -f 'support.c' || echo '$(srcdir)/'`support.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-support.Tpo $(DEPDIR)/imagination-support.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='imagination-support.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='imagination-support.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-support.o `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-support.o `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 imagination-support.obj: support.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-support.obj -MD -MP -MF $(DEPDIR)/imagination-support.Tpo -c -o imagination-support.obj `if test -f 'support.c'; then $(CYGPATH_W) 'support.c'; else $(CYGPATH_W) '$(srcdir)/support.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-support.Tpo $(DEPDIR)/imagination-support.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='imagination-support.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='imagination-support.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-support.obj `if test -f 'support.c'; then $(CYGPATH_W) 'support.c'; else $(CYGPATH_W) '$(srcdir)/support.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-support.obj `if test -f 'support.c'; then $(CYGPATH_W) 'support.c'; else $(CYGPATH_W) '$(srcdir)/support.c'; fi`
 
 imagination-main-window.o: main-window.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-main-window.o -MD -MP -MF $(DEPDIR)/imagination-main-window.Tpo -c -o imagination-main-window.o `test -f 'main-window.c' || echo '$(srcdir)/'`main-window.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-main-window.Tpo $(DEPDIR)/imagination-main-window.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main-window.c' object='imagination-main-window.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main-window.c' object='imagination-main-window.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-main-window.o `test -f 'main-window.c' || echo '$(srcdir)/'`main-window.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-main-window.o `test -f 'main-window.c' || echo '$(srcdir)/'`main-window.c
 
 imagination-main-window.obj: main-window.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-main-window.obj -MD -MP -MF $(DEPDIR)/imagination-main-window.Tpo -c -o imagination-main-window.obj `if test -f 'main-window.c'; then $(CYGPATH_W) 'main-window.c'; else $(CYGPATH_W) '$(srcdir)/main-window.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-main-window.Tpo $(DEPDIR)/imagination-main-window.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main-window.c' object='imagination-main-window.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main-window.c' object='imagination-main-window.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-main-window.obj `if test -f 'main-window.c'; then $(CYGPATH_W) 'main-window.c'; else $(CYGPATH_W) '$(srcdir)/main-window.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-main-window.obj `if test -f 'main-window.c'; then $(CYGPATH_W) 'main-window.c'; else $(CYGPATH_W) '$(srcdir)/main-window.c'; fi`
 
 imagination-callbacks.o: callbacks.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-callbacks.o -MD -MP -MF $(DEPDIR)/imagination-callbacks.Tpo -c -o imagination-callbacks.o `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-callbacks.Tpo $(DEPDIR)/imagination-callbacks.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='imagination-callbacks.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callbacks.c' object='imagination-callbacks.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-callbacks.o `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-callbacks.o `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
 
 imagination-callbacks.obj: callbacks.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-callbacks.obj -MD -MP -MF $(DEPDIR)/imagination-callbacks.Tpo -c -o imagination-callbacks.obj `if test -f 'callbacks.c'; then $(CYGPATH_W) 'callbacks.c'; else $(CYGPATH_W) '$(srcdir)/callbacks.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-callbacks.Tpo $(DEPDIR)/imagination-callbacks.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='imagination-callbacks.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callbacks.c' object='imagination-callbacks.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-callbacks.obj `if test -f 'callbacks.c'; then $(CYGPATH_W) 'callbacks.c'; else $(CYGPATH_W) '$(srcdir)/callbacks.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-callbacks.obj `if test -f 'callbacks.c'; then $(CYGPATH_W) 'callbacks.c'; else $(CYGPATH_W) '$(srcdir)/callbacks.c'; fi`
 
 imagination-new_slideshow.o: new_slideshow.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-new_slideshow.o -MD -MP -MF $(DEPDIR)/imagination-new_slideshow.Tpo -c -o imagination-new_slideshow.o `test -f 'new_slideshow.c' || echo '$(srcdir)/'`new_slideshow.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-new_slideshow.Tpo $(DEPDIR)/imagination-new_slideshow.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='new_slideshow.c' object='imagination-new_slideshow.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='new_slideshow.c' object='imagination-new_slideshow.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-new_slideshow.o `test -f 'new_slideshow.c' || echo '$(srcdir)/'`new_slideshow.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-new_slideshow.o `test -f 'new_slideshow.c' || echo '$(srcdir)/'`new_slideshow.c
 
 imagination-new_slideshow.obj: new_slideshow.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-new_slideshow.obj -MD -MP -MF $(DEPDIR)/imagination-new_slideshow.Tpo -c -o imagination-new_slideshow.obj `if test -f 'new_slideshow.c'; then $(CYGPATH_W) 'new_slideshow.c'; else $(CYGPATH_W) '$(srcdir)/new_slideshow.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-new_slideshow.Tpo $(DEPDIR)/imagination-new_slideshow.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='new_slideshow.c' object='imagination-new_slideshow.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='new_slideshow.c' object='imagination-new_slideshow.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-new_slideshow.obj `if test -f 'new_slideshow.c'; then $(CYGPATH_W) 'new_slideshow.c'; else $(CYGPATH_W) '$(srcdir)/new_slideshow.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-new_slideshow.obj `if test -f 'new_slideshow.c'; then $(CYGPATH_W) 'new_slideshow.c'; else $(CYGPATH_W) '$(srcdir)/new_slideshow.c'; fi`
 
 imagination-slideshow_project.o: slideshow_project.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-slideshow_project.o -MD -MP -MF $(DEPDIR)/imagination-slideshow_project.Tpo -c -o imagination-slideshow_project.o `test -f 'slideshow_project.c' || echo '$(srcdir)/'`slideshow_project.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-slideshow_project.Tpo $(DEPDIR)/imagination-slideshow_project.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slideshow_project.c' object='imagination-slideshow_project.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='slideshow_project.c' object='imagination-slideshow_project.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-slideshow_project.o `test -f 'slideshow_project.c' || echo '$(srcdir)/'`slideshow_project.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-slideshow_project.o `test -f 'slideshow_project.c' || echo '$(srcdir)/'`slideshow_project.c
 
 imagination-slideshow_project.obj: slideshow_project.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-slideshow_project.obj -MD -MP -MF $(DEPDIR)/imagination-slideshow_project.Tpo -c -o imagination-slideshow_project.obj `if test -f 'slideshow_project.c'; then $(CYGPATH_W) 'slideshow_project.c'; else $(CYGPATH_W) '$(srcdir)/slideshow_project.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-slideshow_project.Tpo $(DEPDIR)/imagination-slideshow_project.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slideshow_project.c' object='imagination-slideshow_project.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='slideshow_project.c' object='imagination-slideshow_project.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-slideshow_project.obj `if test -f 'slideshow_project.c'; then $(CYGPATH_W) 'slideshow_project.c'; else $(CYGPATH_W) '$(srcdir)/slideshow_project.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-slideshow_project.obj `if test -f 'slideshow_project.c'; then $(CYGPATH_W) 'slideshow_project.c'; else $(CYGPATH_W) '$(srcdir)/slideshow_project.c'; fi`
 
 imagination-audio.o: audio.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-audio.o -MD -MP -MF $(DEPDIR)/imagination-audio.Tpo -c -o imagination-audio.o `test -f 'audio.c' || echo '$(srcdir)/'`audio.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-audio.Tpo $(DEPDIR)/imagination-audio.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='audio.c' object='imagination-audio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='audio.c' object='imagination-audio.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-audio.o `test -f 'audio.c' || echo '$(srcdir)/'`audio.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-audio.o `test -f 'audio.c' || echo '$(srcdir)/'`audio.c
 
 imagination-audio.obj: audio.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-audio.obj -MD -MP -MF $(DEPDIR)/imagination-audio.Tpo -c -o imagination-audio.obj `if test -f 'audio.c'; then $(CYGPATH_W) 'audio.c'; else $(CYGPATH_W) '$(srcdir)/audio.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-audio.Tpo $(DEPDIR)/imagination-audio.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='audio.c' object='imagination-audio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='audio.c' object='imagination-audio.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-audio.obj `if test -f 'audio.c'; then $(CYGPATH_W) 'audio.c'; else $(CYGPATH_W) '$(srcdir)/audio.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-audio.obj `if test -f 'audio.c'; then $(CYGPATH_W) 'audio.c'; else $(CYGPATH_W) '$(srcdir)/audio.c'; fi`
 
 imagination-export.o: export.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-export.o -MD -MP -MF $(DEPDIR)/imagination-export.Tpo -c -o imagination-export.o `test -f 'export.c' || echo '$(srcdir)/'`export.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-export.Tpo $(DEPDIR)/imagination-export.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='export.c' object='imagination-export.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='export.c' object='imagination-export.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-export.o `test -f 'export.c' || echo '$(srcdir)/'`export.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-export.o `test -f 'export.c' || echo '$(srcdir)/'`export.c
 
 imagination-export.obj: export.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-export.obj -MD -MP -MF $(DEPDIR)/imagination-export.Tpo -c -o imagination-export.obj `if test -f 'export.c'; then $(CYGPATH_W) 'export.c'; else $(CYGPATH_W) '$(srcdir)/export.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-export.Tpo $(DEPDIR)/imagination-export.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='export.c' object='imagination-export.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='export.c' object='imagination-export.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-export.obj `if test -f 'export.c'; then $(CYGPATH_W) 'export.c'; else $(CYGPATH_W) '$(srcdir)/export.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-export.obj `if test -f 'export.c'; then $(CYGPATH_W) 'export.c'; else $(CYGPATH_W) '$(srcdir)/export.c'; fi`
 
 imagination-subtitles.o: subtitles.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-subtitles.o -MD -MP -MF $(DEPDIR)/imagination-subtitles.Tpo -c -o imagination-subtitles.o `test -f 'subtitles.c' || echo '$(srcdir)/'`subtitles.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-subtitles.Tpo $(DEPDIR)/imagination-subtitles.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='subtitles.c' object='imagination-subtitles.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='subtitles.c' object='imagination-subtitles.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-subtitles.o `test -f 'subtitles.c' || echo '$(srcdir)/'`subtitles.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-subtitles.o `test -f 'subtitles.c' || echo '$(srcdir)/'`subtitles.c
 
 imagination-subtitles.obj: subtitles.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-subtitles.obj -MD -MP -MF $(DEPDIR)/imagination-subtitles.Tpo -c -o imagination-subtitles.obj `if test -f 'subtitles.c'; then $(CYGPATH_W) 'subtitles.c'; else $(CYGPATH_W) '$(srcdir)/subtitles.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-subtitles.Tpo $(DEPDIR)/imagination-subtitles.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='subtitles.c' object='imagination-subtitles.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-subtitles.obj `if test -f 'subtitles.c'; then $(CYGPATH_W) 'subtitles.c'; else $(CYGPATH_W) '$(srcdir)/subtitles.c'; fi`
-
-imagination-imgtablebutton.o: imgtablebutton.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-imgtablebutton.o -MD -MP -MF $(DEPDIR)/imagination-imgtablebutton.Tpo -c -o imagination-imgtablebutton.o `test -f 'imgtablebutton.c' || echo '$(srcdir)/'`imgtablebutton.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-imgtablebutton.Tpo $(DEPDIR)/imagination-imgtablebutton.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='imgtablebutton.c' object='imagination-imgtablebutton.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgtablebutton.o `test -f 'imgtablebutton.c' || echo '$(srcdir)/'`imgtablebutton.c
-
-imagination-imgtablebutton.obj: imgtablebutton.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-imgtablebutton.obj -MD -MP -MF $(DEPDIR)/imagination-imgtablebutton.Tpo -c -o imagination-imgtablebutton.obj `if test -f 'imgtablebutton.c'; then $(CYGPATH_W) 'imgtablebutton.c'; else $(CYGPATH_W) '$(srcdir)/imgtablebutton.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-imgtablebutton.Tpo $(DEPDIR)/imagination-imgtablebutton.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='imgtablebutton.c' object='imagination-imgtablebutton.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='subtitles.c' object='imagination-subtitles.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgtablebutton.obj `if test -f 'imgtablebutton.c'; then $(CYGPATH_W) 'imgtablebutton.c'; else $(CYGPATH_W) '$(srcdir)/imgtablebutton.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-subtitles.obj `if test -f 'subtitles.c'; then $(CYGPATH_W) 'subtitles.c'; else $(CYGPATH_W) '$(srcdir)/subtitles.c'; fi`
 
 imagination-imgcellrendererpixbuf.o: imgcellrendererpixbuf.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-imgcellrendererpixbuf.o -MD -MP -MF $(DEPDIR)/imagination-imgcellrendererpixbuf.Tpo -c -o imagination-imgcellrendererpixbuf.o `test -f 'imgcellrendererpixbuf.c' || echo '$(srcdir)/'`imgcellrendererpixbuf.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-imgcellrendererpixbuf.Tpo $(DEPDIR)/imagination-imgcellrendererpixbuf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='imgcellrendererpixbuf.c' object='imagination-imgcellrendererpixbuf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='imgcellrendererpixbuf.c' object='imagination-imgcellrendererpixbuf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgcellrendererpixbuf.o `test -f 'imgcellrendererpixbuf.c' || echo '$(srcdir)/'`imgcellrendererpixbuf.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgcellrendererpixbuf.o `test -f 'imgcellrendererpixbuf.c' || echo '$(srcdir)/'`imgcellrendererpixbuf.c
 
 imagination-imgcellrendererpixbuf.obj: imgcellrendererpixbuf.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-imgcellrendererpixbuf.obj -MD -MP -MF $(DEPDIR)/imagination-imgcellrendererpixbuf.Tpo -c -o imagination-imgcellrendererpixbuf.obj `if test -f 'imgcellrendererpixbuf.c'; then $(CYGPATH_W) 'imgcellrendererpixbuf.c'; else $(CYGPATH_W) '$(srcdir)/imgcellrendererpixbuf.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-imgcellrendererpixbuf.Tpo $(DEPDIR)/imagination-imgcellrendererpixbuf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='imgcellrendererpixbuf.c' object='imagination-imgcellrendererpixbuf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='imgcellrendererpixbuf.c' object='imagination-imgcellrendererpixbuf.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgcellrendererpixbuf.obj `if test -f 'imgcellrendererpixbuf.c'; then $(CYGPATH_W) 'imgcellrendererpixbuf.c'; else $(CYGPATH_W) '$(srcdir)/imgcellrendererpixbuf.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-imgcellrendererpixbuf.obj `if test -f 'imgcellrendererpixbuf.c'; then $(CYGPATH_W) 'imgcellrendererpixbuf.c'; else $(CYGPATH_W) '$(srcdir)/imgcellrendererpixbuf.c'; fi`
 
 imagination-img_sox.o: img_sox.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-img_sox.o -MD -MP -MF $(DEPDIR)/imagination-img_sox.Tpo -c -o imagination-img_sox.o `test -f 'img_sox.c' || echo '$(srcdir)/'`img_sox.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-img_sox.Tpo $(DEPDIR)/imagination-img_sox.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='img_sox.c' object='imagination-img_sox.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='img_sox.c' object='imagination-img_sox.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-img_sox.o `test -f 'img_sox.c' || echo '$(srcdir)/'`img_sox.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-img_sox.o `test -f 'img_sox.c' || echo '$(srcdir)/'`img_sox.c
 
 imagination-img_sox.obj: img_sox.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-img_sox.obj -MD -MP -MF $(DEPDIR)/imagination-img_sox.Tpo -c -o imagination-img_sox.obj `if test -f 'img_sox.c'; then $(CYGPATH_W) 'img_sox.c'; else $(CYGPATH_W) '$(srcdir)/img_sox.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-img_sox.Tpo $(DEPDIR)/imagination-img_sox.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='img_sox.c' object='imagination-img_sox.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='img_sox.c' object='imagination-img_sox.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-img_sox.obj `if test -f 'img_sox.c'; then $(CYGPATH_W) 'img_sox.c'; else $(CYGPATH_W) '$(srcdir)/img_sox.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-img_sox.obj `if test -f 'img_sox.c'; then $(CYGPATH_W) 'img_sox.c'; else $(CYGPATH_W) '$(srcdir)/img_sox.c'; fi`
+
+imagination-video_formats.o: video_formats.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-video_formats.o -MD -MP -MF $(DEPDIR)/imagination-video_formats.Tpo -c -o imagination-video_formats.o `test -f 'video_formats.c' || echo '$(srcdir)/'`video_formats.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-video_formats.Tpo $(DEPDIR)/imagination-video_formats.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='video_formats.c' object='imagination-video_formats.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-video_formats.o `test -f 'video_formats.c' || echo '$(srcdir)/'`video_formats.c
+
+imagination-video_formats.obj: video_formats.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -MT imagination-video_formats.obj -MD -MP -MF $(DEPDIR)/imagination-video_formats.Tpo -c -o imagination-video_formats.obj `if test -f 'video_formats.c'; then $(CYGPATH_W) 'video_formats.c'; else $(CYGPATH_W) '$(srcdir)/video_formats.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imagination-video_formats.Tpo $(DEPDIR)/imagination-video_formats.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='video_formats.c' object='imagination-video_formats.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagination_CFLAGS) $(CFLAGS) -c -o imagination-video_formats.obj `if test -f 'video_formats.c'; then $(CYGPATH_W) 'video_formats.c'; else $(CYGPATH_W) '$(srcdir)/video_formats.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -629,26 +684,15 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -660,15 +704,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -677,6 +717,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -728,10 +783,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -815,19 +875,21 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/src/audio.c -> imagination-3.4.tar.bz2/src/audio.c Changed

imagination-3.0.tar.bz2/src/audio.h -> imagination-3.4.tar.bz2/src/audio.h Changed

imagination-3.0.tar.bz2/src/callbacks.c -> imagination-3.4.tar.bz2/src/callbacks.c Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (c) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
  *  Copyright (c) 2009 Tadej Borovšak 	<tadeboro@gmail.com>
  *  Copyright (c) 2011 Robert Chéramy   <robert@cheramy.net>
  *
@@ -42,12 +42,20 @@
 	gint    gradient;    /* Gradient type:
 						      0 - solid color
 							  1 - linear
-							  2 - radial */
+							  2 - radial
+							  3 - gradient fading animation */
 
 	/* Widgets */
 	GtkWidget *color2;
 	GtkWidget *preview;
-	GtkWidget *radio3;
+	GtkWidget *radio4;
+	
+	/* Cairo */
+	cairo_t		*cr;
+	gdouble		alpha;
+	
+	/* GSource */
+	gint		source;
 };
 
 static void img_file_chooser_add_preview(img_window_struct *);
@@ -70,6 +78,9 @@
 						  gboolean           reset,
 						  img_window_struct *img );
 
+static gboolean
+img_fade_gradient_decrease_alpha(ImgEmptySlide *slide);
+
 static void
 img_gradient_toggled( GtkToggleButton *button,
 					  ImgEmptySlide   *slide );
@@ -102,17 +113,16 @@
 void img_set_window_title(img_window_struct *img, gchar *text)
 {
 	gchar *title = NULL;
-	static gchar version = VERSION "-" REVISION;
 
 	if (text == NULL)
 	{
-		title = g_strconcat("Imagination ", strcmp(REVISION, "-1") == 0 ? VERSION : version, NULL);
+		title = g_strconcat("Imagination ", strcmp(REVISION, "-1") == 0 ? VERSION : VERSION "-" REVISION, NULL);
 		gtk_window_set_title (GTK_WINDOW (img->imagination_window), title);
 		g_free(title);
 	}
 	else
 	{
-		title = g_strconcat(text, " - Imagination ", strcmp(REVISION, "-1") == 0 ? VERSION : version, NULL);
+		title = g_strconcat(text, " - Imagination ", strcmp(REVISION, "-1") == 0 ? VERSION : VERSION "-" REVISION, NULL);
 		gtk_window_set_title (GTK_WINDOW (img->imagination_window), title);
 		g_free(title);
 	}
@@ -123,7 +133,7 @@
     if (img_struct->project_is_modified)
         if (GTK_RESPONSE_OK != img_ask_user_confirmation(img_struct, _("You didn't save your slideshow yet. Are you sure you want to close it?")))
             return;
-	img_close_slideshow(GTK_WIDGET(item), img_struct);
+
     img_new_slideshow_settings_dialog(img_struct, FALSE);
 }
 
@@ -339,7 +349,6 @@
 	{
 		gtk_list_store_append(img->music_file_liststore, &iter);
 		gtk_list_store_set (img->music_file_liststore, &iter, 0, path, 1, file, 2, time, 3, secs, -1);
-
 		g_free(time);
 	}
 	g_free(path);
@@ -446,6 +455,11 @@
 		g_free(img_struct->project_filename);
 		img_struct->project_filename = NULL;
 	}
+	if (img_struct->first_selected_path)
+	{
+		gtk_tree_path_free(img_struct->first_selected_path);
+		img_struct->first_selected_path = NULL;
+	}
 }
 
 gint img_ask_user_confirmation(img_window_struct *img_struct, gchar *msg)
@@ -460,6 +474,41 @@
 	return response;
 }
 
+gboolean img_key_pressed(GtkWidget *widget, GdkEventKey *event, img_window_struct *img)
+{
+	if ( img->window_is_fullscreen )
+	{
+		if (event->keyval == GDK_KEY_F11 || event->keyval == GDK_KEY_Escape)
+			img_exit_fullscreen(img);
+		else if (event->keyval == GDK_space)
+		{
+			img->music_preview = TRUE;
+			img_start_stop_preview(NULL, img);
+		}
+	}
+
+	return FALSE;
+}
+
+void img_exit_fullscreen(img_window_struct *img)
+{
+	gtk_widget_show(img->thumb_scrolledwindow);
+	gtk_widget_show(img->notebook);
+	gtk_widget_show(img->statusbar);
+	gtk_widget_show(img->menubar);
+	gtk_widget_show(img->toolbar);
+	gtk_alignment_set(GTK_ALIGNMENT(img->viewport_align), 0.5, 0.5, 0, 0);
+
+	gtk_window_unfullscreen(GTK_WINDOW(img->imagination_window));
+	gtk_widget_add_accelerator (img->fullscreen, "activate", img->accel_group, GDK_F11, GDK_MODE_DISABLED, GTK_ACCEL_VISIBLE);
+	img->window_is_fullscreen = FALSE;
+
+	/* Restore the cursor */
+	GdkCursor *cursor	= gdk_cursor_new(GDK_ARROW);
+	GdkWindow *win 		= gtk_widget_get_window(img->imagination_window);
+	gdk_window_set_cursor(win, cursor);
+}
+
 gboolean img_quit_application(GtkWidget *widget, GdkEvent *event, img_window_struct *img_struct)
 {
 	gint response;
@@ -534,51 +583,51 @@
 	gtk_file_chooser_set_preview_widget_active (file_chooser, has_preview);
 }
 
-void img_delete_selected_slides(GtkMenuItem *item,img_window_struct *img_struct)
+void img_delete_selected_slides(GtkMenuItem *item,img_window_struct *img)
 {
 	GList *selected, *bak;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	slide_struct *entry;
 
-	model =	GTK_TREE_MODEL( img_struct->thumbnail_model );
+	model =	GTK_TREE_MODEL( img->thumbnail_model );
 	
-	selected = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img_struct->active_icon));
-	if (selected == NULL)
+	selected = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->active_icon));
+	if (selected == NULL || img->preview_is_running)
 		return;
 	
 	/* Free the slide struct for each slide and remove it from the iconview */
 	bak = selected;
-	g_signal_handlers_block_by_func( (gpointer)img_struct->thumbnail_iconview,
+	g_signal_handlers_block_by_func( (gpointer)img->thumbnail_iconview,
 									 (gpointer)img_iconview_selection_changed,
-									 img_struct );
-	g_signal_handlers_block_by_func( (gpointer)img_struct->over_icon,
+									 img );
+	g_signal_handlers_block_by_func( (gpointer)img->over_icon,
 									 (gpointer)img_iconview_selection_changed,
-									 img_struct );
+									 img );
 	while (selected)
 	{
 		gtk_tree_model_get_iter(model, &iter,selected->data);
 		gtk_tree_model_get(model, &iter,1,&entry,-1);
 		img_free_slide_struct( entry );
-		gtk_list_store_remove(GTK_LIST_STORE(img_struct->thumbnail_model),&iter);
-		img_struct->slides_nr--;
+		gtk_list_store_remove(GTK_LIST_STORE(img->thumbnail_model),&iter);
+		img->slides_nr--;
 		selected = selected->next;
 	}
-	g_signal_handlers_unblock_by_func( (gpointer)img_struct->thumbnail_iconview,
+	g_signal_handlers_unblock_by_func( (gpointer)img->thumbnail_iconview,
 									   (gpointer)img_iconview_selection_changed,
-									   img_struct );
-	g_signal_handlers_unblock_by_func( (gpointer)img_struct->over_icon,
+									   img );
+	g_signal_handlers_unblock_by_func( (gpointer)img->over_icon,
 									   (gpointer)img_iconview_selection_changed,
-									   img_struct );
+									   img );
 	g_list_foreach (bak, (GFunc)gtk_tree_path_free, NULL);
 	g_list_free(bak);
 
-	img_set_statusbar_message(img_struct,0);
-	cairo_surface_destroy( img_struct->current_image );
-	img_struct->current_image = NULL;
-	gtk_widget_queue_draw( img_struct->image_area );
-	img_struct->project_is_modified = TRUE;
-	img_iconview_selection_changed(GTK_ICON_VIEW(img_struct->active_icon),img_struct);
+	img_set_statusbar_message(img,0);
+	cairo_surface_destroy( img->current_image );
+	img->current_image = NULL;
+	gtk_widget_queue_draw( img->image_area );
+	img->project_is_modified = TRUE;
+	img_iconview_selection_changed(GTK_ICON_VIEW(img->active_icon),img);
 }
 
 void
@@ -624,14 +673,18 @@
 		gtk_tree_model_get_iter( model, &iter, selected->data );
 		gtk_tree_model_get( model, &iter, 1, &info_slide, -1 );
 
-		angle = ( info_slide->angle + ( clockwise ? 1 : -1 ) ) % 4;
-		img_rotate_slide( info_slide, angle, GTK_PROGRESS_BAR( img->progress_bar ) );
+		/* Avoid seg-fault when dealing with text/gradient slides */
+		if (info_slide->o_filename != NULL)
+		{
+			angle = ( info_slide->angle + ( clockwise ? 1 : -1 ) ) % 4;
+			img_rotate_slide( info_slide, angle, GTK_PROGRESS_BAR( img->progress_bar ) );
 
-		/* Display the rotated image in thumbnails iconview */
-		img_scale_image( info_slide->r_filename, img->video_ratio, 88, 0,
-						 img->distort_images, img->background_color,
-						 &thumb, NULL );
-		gtk_list_store_set( img->thumbnail_model, &iter, 0, thumb, -1 );
+			/* Display the rotated image in thumbnails iconview */
+			img_scale_image( info_slide->r_filename, img->video_ratio, 88, 0,
+							 img->distort_images, img->background_color,
+							 &thumb, NULL );
+			gtk_list_store_set( img->thumbnail_model, &iter, 0, thumb, -1 );
+		}
 		selected = selected->next;
 	}
 	gtk_widget_hide(img->progress_bar);
@@ -642,19 +695,15 @@
 	if( ! img->current_slide )
 		return;
 
-	cairo_surface_destroy( img->current_image );
-
-	/* Respect quality settings */
-	if( img->low_quality )
-		img_scale_image( img->current_slide->r_filename, img->video_ratio,
-						 0, img->video_size1, img->distort_images,
-						 img->background_color, NULL, &img->current_image );
-	else
+	if (info_slide->o_filename != NULL)
+	{
+		cairo_surface_destroy( img->current_image );
 		img_scale_image( img->current_slide->r_filename, img->video_ratio,
-						 0, 0, img->distort_images,
-						 img->background_color, NULL, &img->current_image );
-
-	gtk_widget_queue_draw( img->image_area );
+							 0, img->video_size1, img->distort_images,
+							 img->background_color, NULL, &img->current_image );
+		
+		gtk_widget_queue_draw( img->image_area );
+	}
 }
 
 /* Rotate clockwise */
@@ -785,9 +834,8 @@
 {
 	static GtkWidget *about = NULL;
 	static gchar version = VERSION "-" REVISION;
-    const char *authors = {"\nDevelopers:\nGiuseppe Torelli <colossus73@gmail.com>\nTadej Borovšak <tadeboro@gmail.com>\nRobert Chéramy <robert@cheramy.net>\n\nImagination logo:\nhttp://linuxgraphicsusers.com\n\nInsert Transitions Family:\nJean-Pierre Redonnet <inphilly@gmail.com>",NULL};
-    //const char *documenters = {NULL};
-
+    const char *authors = {"\nDevelopers:\nGiuseppe Torelli <colossus73@gmail.com>\nTadej Borovšak <tadeboro@gmail.com>\n",NULL};
+    
 	if (about == NULL)
 	{
 		about = gtk_about_dialog_new ();
@@ -798,14 +846,14 @@
 		g_object_set (about,
 			"name", "Imagination",
 			"version", strcmp(REVISION, "-1") == 0 ? VERSION : version,
-			"copyright","Copyright \xC2\xA9 2009 Giuseppe Torelli",
-			"comments","A simple and lightweight DVD slideshow maker",
+			"copyright","Copyright \xC2\xA9 2009-2018 Giuseppe Torelli",
+			"comments","A simple and lightweight slideshow maker",
 			"authors",authors,
 			"documenters",NULL,
 			"translator_credits",_("translator-credits"),
 			"logo_icon_name","imagination",
 			"website","http://imagination.sf.net",
-			"license","Copyright \xC2\xA9 2009 Giuseppe Torelli - Colossus <colossus73@gmail.com>\n\n"
+			"license","Copyright \xC2\xA9 2009-2018 Giuseppe Torelli - Colossus <colossus73@gmail.com>\n\n"
 		    			"This is free software; you can redistribute it and/or\n"
     					"modify it under the terms of the GNU Library General Public License as\n"
     					"published by the Free Software Foundation; either version 2 of the\n"
@@ -832,7 +880,29 @@
 	gtk_show_uri( NULL, link, GDK_CURRENT_TIME, NULL );
 }
 
-void img_start_stop_preview(GtkWidget *button, img_window_struct *img)
+void img_go_fullscreen(GtkMenuItem *item, img_window_struct *img)
+{
+	/* Hide the cursor */
+	GdkCursor *cursor	= gdk_cursor_new(GDK_BLANK_CURSOR);
+	GdkWindow *win 		= gtk_widget_get_window(img->imagination_window);
+	gdk_window_set_cursor(win, cursor);
+
+	gtk_widget_remove_accelerator (img->fullscreen, img->accel_group, GDK_F11, GDK_MODE_DISABLED);
+
+	gtk_widget_hide (img->thumb_scrolledwindow);
+	gtk_widget_hide (img->notebook);
+	gtk_widget_hide (img->statusbar);
+	gtk_widget_hide (img->menubar);
+	gtk_widget_hide (img->toolbar);
+	
+	gtk_alignment_set(GTK_ALIGNMENT(img->viewport_align), 0, 0, 1, 1);
+	gtk_window_fullscreen(GTK_WINDOW(img->imagination_window));
+	img->window_is_fullscreen =TRUE;
+
+	gtk_widget_queue_draw(img->image_area);
+}
+
+void img_start_stop_preview(GtkWidget *item, img_window_struct *img)
 {
 	GtkTreeIter iter, prev;
 	GtkTreePath *path = NULL;
@@ -847,19 +917,64 @@
 	if(img->export_is_running)
 		return;
 
+	/* Save the current selected slide to restore it when the preview is finished */
+	if (img->preview_is_running == FALSE)
+	{
+		gtk_tree_path_free(img->first_selected_path);
+		gtk_icon_view_get_cursor(GTK_ICON_VIEW( img->thumbnail_iconview ), &img->first_selected_path, NULL);
+	}
 	if (img->preview_is_running)
 	{
-		/* Preview is already running */
-
+		img->loop_preview = img->music_preview = img->no_music = FALSE;
+		/* If there is a background music during
+		* the preview we want to stop it dont'we? */
+		if (img->fullscreen_music_preview && img->play_child_pid)
+		{
+			kill (img->play_child_pid, SIGINT);
+			/* Let's stop the next scheduled
+			* audio file to be played too */
+			if (img->audio_source_id > 0)
+			{
+				g_source_remove(img->audio_source_id);
+				img->audio_source_id = 0;
+			}
+			img->play_child_pid = 0;
+		}
 		/* Remove timeout function from main loop */
 		g_source_remove(img->source_id);
 
 		/* Clean resources used by preview and prepare application for
 		 * next preview. */
 		img_clean_after_preview(img);
+
+		/* Unselect the last selected item during the preview */
+		GList *list;
+		list = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->thumbnail_iconview));
+
+		if (list)
+		{
+			gtk_icon_view_unselect_path (GTK_ICON_VIEW(img->thumbnail_iconview), (GtkTreePath*)list->data);
+			g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL);
+			g_list_free (list);
+		}
+
+		/*  Reselect the first selected slide before the preview if any */
+		if (img->first_selected_path)
+		{
+			gtk_icon_view_select_path (GTK_ICON_VIEW(img->thumbnail_iconview), img->first_selected_path);
+			gtk_icon_view_scroll_to_path(GTK_ICON_VIEW(img->thumbnail_iconview), img->first_selected_path, FALSE, 0.0, 0.0);
+		}
 	}
 	else
 	{
+		if (GTK_WIDGET(item) == img->fullscreen_music_preview)
+			img->music_preview = TRUE;
+
+		else if (GTK_WIDGET(item) == img->fullscreen_loop_preview)
+			img->loop_preview = TRUE;
+		else
+			img->no_music = TRUE;
+
 		/* Start the preview */
 		if( img->mode == 1 )
 		{
@@ -896,22 +1011,15 @@
 		gtk_tree_model_get( model, &iter, 1, &entry, -1);
 
 		if( ! entry->o_filename )
-		{
 			img_scale_gradient( entry->gradient, entry->g_start_point,
 								entry->g_stop_point, entry->g_start_color,
 								entry->g_stop_color, img->video_size0,
 								img->video_size1, NULL, &img->image2 );
-		}
-		/* Respect quality settings */
-		else if( img->low_quality )
-			img_scale_image( entry->r_filename, img->video_ratio,
-							 0, img->video_size1, img->distort_images,
-							 img->background_color, NULL, &img->image2 );
 		else
 			img_scale_image( entry->r_filename, img->video_ratio,
-							 0, 0, img->distort_images,
-							 img->background_color, NULL, &img->image2 );
-
+								0, img->video_size1, img->distort_images,
+								img->background_color, NULL, &img->image2 );
+	
 		/* Load first stop point */
 		img->point2 = (ImgStopPoint *)( entry->no_points ?
 										entry->points->data :
@@ -921,12 +1029,15 @@
 		img->cur_point = NULL;
 
 		/* If we started our preview from beginning, create empty pixbuf and
-		 * fill it with background color. Else load image that is before
+		 * fill it with background color otherwise load image that is before
 		 * currently selected slide. */
 		if( path != NULL && gtk_tree_path_prev( path ) )
 		{
 			gtk_tree_model_get_iter( model, &prev, path );
 			gtk_tree_model_get( model, &prev, 1, &entry, -1 );
+			
+			if (img->music_preview)
+				img_preview_with_music(img, 255);
 
 			if( ! entry->o_filename )
 			{
@@ -935,15 +1046,10 @@
 									entry->g_stop_color, img->video_size0,
 									img->video_size1, NULL, &img->image1 );
 			}
-			/* Respect quality settings */
-			else if( img->low_quality )
-				img_scale_image( entry->r_filename, img->video_ratio,
-								 0, img->video_size1, img->distort_images,
-								 img->background_color, NULL, &img->image1 );
 			else
 				img_scale_image( entry->r_filename, img->video_ratio,
-								 0, 0, img->distort_images,
-								 img->background_color, NULL, &img->image1 );
+									0, img->video_size1, img->distort_images,
+									img->background_color, NULL, &img->image1 );
 			
 			/* Load last stop point */
 			img->point1 = (ImgStopPoint *)( entry->no_points ?
@@ -954,6 +1060,9 @@
 		{
 			cairo_t *cr;
 
+			if (img->music_preview)
+				img_preview_with_music(img, 0);
+
 			img->image1 = cairo_image_surface_create( CAIRO_FORMAT_RGB24,
 													  img->video_size0,
 													  img->video_size1 );
@@ -981,10 +1090,25 @@
 		img->image_to = cairo_image_surface_create( CAIRO_FORMAT_RGB24,
 													img->video_size0,
 													img->video_size1 );
+		if (entry->gradient == 3)
+		{
+			cairo_t	*cr;
+			cr = cairo_create(img->image_from);
+			cairo_set_source_rgb(cr,	entry->g_start_color0,
+										entry->g_start_color1,
+										entry->g_start_color2 );
+			cairo_paint( cr );
+			
+			cr = cairo_create(img->image_to);
+			cairo_set_source_rgb(cr,	entry->g_stop_color0,
+										entry->g_stop_color1,
+										entry->g_stop_color2 );
+			cairo_paint( cr );
+		}													
 		img->exported_image = cairo_image_surface_create( CAIRO_FORMAT_RGB24,
 														  img->video_size0,
 														  img->video_size1 );
-
+//img_run_encoder(img);
 		img->source_id = g_timeout_add( 1000 / img->preview_fps,
 										(GSourceFunc)img_transition_timeout,
 										img );
@@ -1192,7 +1316,7 @@
 
 	/* If we're previewing or exporting, only paint frame that is being
 	 * currently produced. */
-	if( img->preview_is_running || img->export_is_running > 2 )
+	if( img->preview_is_running || img->export_is_running > 2)
 	{
 		gdouble factor;
 
@@ -1221,22 +1345,32 @@
 
 		/* Render subtitle if present */
 		if( img->current_slide->subtitle )
-			img_render_subtitle( cr,
+			img_render_subtitle( img,
+								 cr,
 								 img->video_size0,
 								 img->video_size1,
 								 img->image_area_zoom,
-								 img->current_slide->position,
-								 img->current_slide->placing,
+								 img->current_slide->posX,
+								 img->current_slide->posY,
+								 img->current_slide->subtitle_angle,
 								 img->current_point.zoom,
 								 img->current_point.offx,
 								 img->current_point.offy,
 								 img->current_slide->subtitle,
+								 img->current_slide->pattern_filename,
 								 img->current_slide->font_desc,
 								 img->current_slide->font_color,
-                                 img->current_slide->font_bgcolor,
+                                 img->current_slide->font_brdr_color,
+                                 img->current_slide->font_bg_color,
+                                 img->current_slide->border_color,
+                                 img->current_slide->top_border,
+                                 img->current_slide->bottom_border,
+                                 img->current_slide->border_width,
 								 img->current_slide->anim,
+								 FALSE,
+								 FALSE,
 								 1.0 );
-		
+
 		cairo_destroy( cr );
 	}
 
@@ -1295,6 +1429,11 @@
 	}
 
 	/* Render single frame */
+	if (img->work_slide->gradient == 3)
+	{
+		img->gradient_slide = TRUE;
+		memcpy(img->g_stop_color, img->work_slide->g_stop_color,  3 * sizeof(gdouble));
+	}
 	img_render_transition_frame( img );
 
 	/* Schedule our image redraw */
@@ -1313,18 +1452,23 @@
 	 * preview. */
 	if( img->slide_cur_frame == img->slide_nr_frames )
 	{
-		if( img_prepare_pixbufs( img, TRUE ) )
+		if( img_prepare_pixbufs( img) )
 		{
 			img_calc_next_slide_time_offset( img, img->preview_fps );
 			img->source_id = g_timeout_add( 1000 / img->preview_fps,
 										    (GSourceFunc)img_transition_timeout,
 											img );
+		
 		}
 		else
 		{
 			/* Clean resources used in preview and prepare application for
 			 * next preview. */
 			img_clean_after_preview( img );
+
+			/* If user chose continous preview start it again */
+			if (img->loop_preview)
+				img_start_stop_preview(NULL, img);
 		}
 
 		/* Indicate that we must start fresh with new slide */
@@ -1333,6 +1477,12 @@
 		return FALSE;
 	}
 
+	/* This is a dirty hack to prevent Imagination
+	keep painting the source image with the second
+	* color set in the empty slide fade gradient */
+	if (strcmp(gtk_entry_get_text(GTK_ENTRY(img->slide_number_entry)) , "2") == 0)
+		img->gradient_slide = FALSE;
+
 	/* Render frame */
 	img_render_still_frame( img, img->preview_fps );
 
@@ -1353,19 +1503,13 @@
 
 	if( flag )
 	{
-		tmp_image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY,GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (img->preview_menu),tmp_image);
-		
 		tmp_image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY,GTK_ICON_SIZE_LARGE_TOOLBAR);
 		gtk_widget_show(tmp_image);
 		gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(img->preview_button), tmp_image);
-		gtk_widget_set_tooltip_text(img->preview_button,_("Starts the preview"));
+		gtk_widget_set_tooltip_text(img->preview_button,_("Starts the preview without music"));
 	}
 	else
 	{
-		tmp_image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_STOP,GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (img->preview_menu),tmp_image);
-		
 		tmp_image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_STOP,GTK_ICON_SIZE_LARGE_TOOLBAR);
 		gtk_widget_show(tmp_image);
 		gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(img->preview_button), tmp_image);
@@ -1382,12 +1526,16 @@
 		img->auto_switch = FALSE;
 	}
 
+	/* Stop the music if the user chose preview with music */
+	if (img->fullscreen_music_preview && img->play_child_pid)
+		kill (img->play_child_pid, SIGINT);
+
 	/* Swap toolbar and menu icons */
 	img_swap_toolbar_images( img, TRUE );
 
 	/* Indicate that preview is not running */
 	img->preview_is_running = FALSE;
-
+	
 	/* Destroy images that were used */
 	cairo_surface_destroy( img->image1 );
 	cairo_surface_destroy( img->image2 );
@@ -1404,7 +1552,7 @@
 {
 	GtkWidget *fc;
 	GtkFileChooserAction action = 0;
-	gint response;
+	gint	 response;
 	gchar *filename = NULL;
     GtkFileFilter *project_filter, *all_files_filter;
 
@@ -1420,7 +1568,6 @@
         if (img->project_is_modified)
             if (GTK_RESPONSE_OK != img_ask_user_confirmation(img, _("You didn't save your slideshow yet. Are you sure you want to close it?")))
                 return;
-        img_close_slideshow(widget, img);
     }
 
 	/* If user wants to save empty slideshow, simply abort */
@@ -1440,7 +1587,7 @@
 
         /* Filter .img files */
         project_filter = gtk_file_filter_new ();
-        gtk_file_filter_set_name(project_filter, _("Imagination projects"));
+        gtk_file_filter_set_name(project_filter, _("Imagination projects (*.img)"));
         gtk_file_filter_add_pattern(project_filter, "*.img");
         gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fc), project_filter);
 
@@ -1450,13 +1597,22 @@
         gtk_file_filter_add_pattern(all_files_filter, "*");
         gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fc), all_files_filter);
 
-        if (widget == img->save_as_menu || (widget == img->save_menu && img->project_filename == NULL))
-            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (fc), "unknown.img");
-        
-        if (img->project_current_dir)
+        /* if we are saving, propose a default filename */
+        if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
+        {
+			gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (fc), "unknown.img");
+			/* Add the checkbok to save filenames only */
+			GtkWidget *box = gtk_hbox_new (TRUE, 0);
+			GtkWidget *relative_names = gtk_check_button_new_with_mnemonic(_("Don't include folder names in the filenames"));
+			gtk_widget_set_tooltip_text(relative_names, _("If you check this button, be sure to include ALL the project files in the SAME folder before attempting to open it again."));
+			gtk_box_pack_start (GTK_BOX (box), relative_names, FALSE, FALSE, 0);
+			gtk_widget_show(relative_names);
+			g_signal_connect (relative_names, "toggled", G_CALLBACK (img_save_relative_filenames), img);
+			gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(fc), box );
+		}
+		if (img->project_current_dir)
             gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fc),img->project_current_dir);
 
-
 		gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc),TRUE);
 		response = gtk_dialog_run (GTK_DIALOG (fc));
 		if (response == GTK_RESPONSE_ACCEPT)
@@ -1467,9 +1623,9 @@
 				gtk_widget_destroy(fc);
 				return;
 			}
-			if (img->project_current_dir)
+			/*if (img->project_current_dir)
                 g_free(img->project_current_dir);
-            img->project_current_dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(fc));
+            img->project_current_dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(fc));*/
 
 		}
 		else if (response == GTK_RESPONSE_CANCEL || GTK_RESPONSE_DELETE_EVENT)
@@ -1484,9 +1640,13 @@
 		filename = g_strdup( img->project_filename );
 
 	if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
+	{
+		/* Close the current slideshow before opening a new one */
+		img_close_slideshow(widget, img);
 		img_load_slideshow( img, filename );
+	}
 	else
-		img_save_slideshow( img, filename );
+		img_save_slideshow( img, filename, img->relative_filenames );
 
 	g_free( filename );
 }
@@ -1646,6 +1806,15 @@
 	return( TRUE );
 }
 
+gboolean
+img_image_area_button_release(	GtkWidget			*widget,
+								GdkEventButton		*event,
+								img_window_struct 	*img)
+{
+	img_update_stop_point(NULL, img);
+	return (TRUE);
+}
+
 /*
  * img_image_area_motion:
  * @widget: image area
@@ -1655,7 +1824,7 @@
  * This function calculates offsets from stored button press coordinates and
  * queue redraw of the preview area.
  *
- * Return value: TRUE if moune button 1 has been pressed during drag, else
+ * Return value: TRUE if mouse button 1 has been pressed during drag, else
  * FALSE.
  */
 gboolean
@@ -1673,10 +1842,33 @@
 	img->current_point.offy = CLAMP( deltay + img->bak_offy, img->maxoffy, 0 );
 
 	gtk_widget_queue_draw( img->image_area );
-
+	
 	return( TRUE );
 }
 
+void img_text_pos_changed( GtkRange *range, img_window_struct *img)
+{
+	gdouble value;
+
+	if (range == GTK_RANGE(img->sub_posX))
+	{
+		value = gtk_range_get_value( range );
+		img->current_slide->posX = (gint)value;
+	}
+	else if (range == GTK_RANGE(img->sub_posY))
+	{
+		value = gtk_range_get_value( range );
+		img->current_slide->posY = (gint)value;
+	}
+	else
+	{
+		value = gtk_range_get_value( range );
+		img->current_slide->subtitle_angle = (gint)value;
+	}
+
+	gtk_widget_queue_draw(img->image_area);
+}
+
 /* Zoom callback functions */
 void
 img_zoom_in( GtkWidget         *item,
@@ -1790,13 +1982,6 @@
 }
 
 void
-img_quality_toggled( GtkCheckMenuItem  *item,
-					 img_window_struct *img )
-{
-	img->low_quality = gtk_check_menu_item_get_active( item );
-}
-
-void
 img_add_stop_point( GtkButton         *button,
 					img_window_struct *img )
 {
@@ -1829,12 +2014,12 @@
 }
 
 void
-img_update_stop_point( GtkButton         *button,
+img_update_stop_point( GtkSpinButton  *button,
 					   img_window_struct *img )
 {
 	ImgStopPoint *point;
 
-	if( img->current_slide == NULL )
+	if( img->current_slide == NULL || img->current_slide->points == NULL)
 		return;
 
 	/* Get selected point */
@@ -1845,7 +2030,8 @@
 	*point = img->current_point;
 	point->time = gtk_spin_button_get_value_as_int(
 						GTK_SPIN_BUTTON( img->ken_duration ) );
-
+	point->zoom = gtk_range_get_value( GTK_RANGE( img->ken_zoom ) );
+	
 	/* Update display */
 	img_update_stop_display( img, FALSE );
 
@@ -1888,7 +2074,7 @@
 						 gboolean           update_pos )
 {
 	gchar        *string;
-	gint          full;
+	gdouble      full;
 
 	/* Disable/enable slide duration */
 	gtk_widget_set_sensitive( img->duration,
@@ -1897,10 +2083,18 @@
 	/* Set slide duration */
 	full = img_calc_slide_duration_points( img->current_slide->points,
 										   img->current_slide->no_points );
+
 	if( ! full )
 		full = img->current_slide->duration;
+	
+	g_signal_handlers_block_by_func( img->duration,
+									 img_spinbutton_value_changed, img );
+	
 	gtk_spin_button_set_value( GTK_SPIN_BUTTON( img->duration ), full );
-
+	
+	g_signal_handlers_unblock_by_func( img->duration,
+									 img_spinbutton_value_changed, img );
+									 
 	/* Set point count */
 	string = g_strdup_printf( "%d", img->current_slide->no_points );
 	gtk_label_set_text( GTK_LABEL( img->total_stop_points_label), string );
@@ -1919,9 +2113,15 @@
 		/* Set duration of this point */
 		point = (ImgStopPoint *)g_list_nth_data( img->current_slide->points,
 												 img->current_slide->cur_point );
+		
+		g_signal_handlers_block_by_func( img->ken_duration,
+									 img_update_stop_point, img );
+	
 		gtk_spin_button_set_value( GTK_SPIN_BUTTON( img->ken_duration ),
 								   point->time );
-		
+		g_signal_handlers_unblock_by_func( img->ken_duration,
+									 img_update_stop_point, img );
+	
 		/* Set zoom value */
 		gtk_range_set_value( GTK_RANGE( img->ken_zoom ), point->zoom );
 
@@ -1947,9 +2147,12 @@
 void
 img_update_subtitles_widgets( img_window_struct *img )
 {
-	gchar       *string;
-	GdkColor     color;
-	gdouble     *f_colors;
+	gchar       	*string;
+	GdkColor     	color;
+	gdouble     	*f_colors;
+	GtkWidget		*tmp_image;
+	GdkPixbuf		*pattern_pix;
+	GtkIconTheme	*icon_theme;
 
 	/* Block all handlers */
 	g_signal_handlers_block_by_func( img->slide_text_buffer,
@@ -1958,22 +2161,45 @@
 									 img_text_font_set, img );
 	g_signal_handlers_block_by_func( img->sub_color,
 									 img_font_color_changed, img );
-    g_signal_handlers_block_by_func( img->sub_bgcolor,
-                                     img_font_bgcolor_changed, img );
+    g_signal_handlers_block_by_func( img->sub_brdr_color,
+                                     img_font_brdr_color_changed, img );
+	g_signal_handlers_block_by_func( img->sub_bgcolor,
+                                     img_font_bg_color_changed, img );
+	g_signal_handlers_block_by_func( img->sub_border_color,
+                                     img_sub_border_color_changed, img );
+    g_signal_handlers_block_by_func( img->sub_border_width,
+                                     img_sub_border_width_changed, img );                                    
 	g_signal_handlers_block_by_func( img->sub_anim,
 									 img_text_anim_set, img );
 	g_signal_handlers_block_by_func( img->sub_anim_duration,
 									 img_combo_box_anim_speed_changed, img );
-	g_signal_handlers_block_by_func( img->sub_placing,
-									 img_placing_changed, img );
-	g_signal_handlers_block_by_func( img->sub_pos, img_text_pos_changed, img );
-
+	g_signal_handlers_block_by_func( img->sub_posX, img_text_pos_changed, img );
+	g_signal_handlers_block_by_func( img->sub_posY, img_text_pos_changed, img );
+	g_signal_handlers_block_by_func( img->sub_angle,
+									   img_text_pos_changed, img );
+	g_signal_handlers_block_by_func( img->border_top,
+									   img_subtitle_top_border_toggled, img );
+	g_signal_handlers_block_by_func( img->border_bottom,
+									   img_subtitle_bottom_border_toggled, img );
 	/* Update text field */
 	string = ( img->current_slide->subtitle ?
 			   img->current_slide->subtitle :
 			   "" );
 	g_object_set( G_OBJECT( img->slide_text_buffer ), "text", string, NULL );
 
+	/* Update text pattern */
+	if (img->current_slide->pattern_filename)
+		pattern_pix = gdk_pixbuf_new_from_file_at_scale( img->current_slide->pattern_filename, 32, 32, TRUE, NULL);
+	else
+	{
+		icon_theme = gtk_icon_theme_get_default();
+		pattern_pix = gtk_icon_theme_load_icon(icon_theme,"image", 20, 0, NULL);
+	}
+	tmp_image = gtk_image_new_from_pixbuf(pattern_pix);
+	gtk_widget_show(tmp_image);
+	gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(img->pattern_image), tmp_image);
+	g_object_unref(pattern_pix);
+
 	/* Update font button */
 	string = pango_font_description_to_string(img->current_slide->font_desc);	
 	gtk_font_button_set_font_name(GTK_FONT_BUTTON(img->sub_font), string);
@@ -1988,15 +2214,40 @@
 	gtk_color_button_set_alpha( GTK_COLOR_BUTTON( img->sub_color ),
 								(gint)(f_colors3 * 0xffff ) );
 
+    /* Update border color button */
+    f_colors = img->current_slide->font_brdr_color;
+    color.red   = (gint)( f_colors0 * 0xffff );
+    color.green = (gint)( f_colors1 * 0xffff );
+    color.blue  = (gint)( f_colors2 * 0xffff );
+    gtk_color_button_set_color( GTK_COLOR_BUTTON( img->sub_brdr_color ), &color ); 
+    gtk_color_button_set_alpha( GTK_COLOR_BUTTON( img->sub_brdr_color ),
+                                (gint)(f_colors3 * 0xffff ) );
+                                
     /* Update background color button */
-    f_colors = img->current_slide->font_bgcolor;
+    f_colors = img->current_slide->font_bg_color;
     color.red   = (gint)( f_colors0 * 0xffff );
     color.green = (gint)( f_colors1 * 0xffff );
     color.blue  = (gint)( f_colors2 * 0xffff );
     gtk_color_button_set_color( GTK_COLOR_BUTTON( img->sub_bgcolor ), &color ); 
     gtk_color_button_set_alpha( GTK_COLOR_BUTTON( img->sub_bgcolor ),
                                 (gint)(f_colors3 * 0xffff ) );
+                                
+     /* Update border color button */
+    f_colors = img->current_slide->border_color;
+    color.red   = (gint)( f_colors0 * 0xffff );
+    color.green = (gint)( f_colors1 * 0xffff );
+    color.blue  = (gint)( f_colors2 * 0xffff );
+    gtk_color_button_set_color( GTK_COLOR_BUTTON( img->sub_border_color ), &color ); 
+    gtk_color_button_set_alpha( GTK_COLOR_BUTTON( img->sub_border_color ),
+                                (gint)(f_colors3 * 0xffff ) );
 
+	/* Update toggle buttons top/bottom borders */
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(img->border_top), img->current_slide->top_border);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(img->border_bottom), img->current_slide->bottom_border);
+
+	/* Update spinbutton border with*/
+	gtk_spin_button_set_value( GTK_SPIN_BUTTON( img->sub_border_width ), img->current_slide->border_width );
+	
 	/* Update animation */
 	gtk_combo_box_set_active( GTK_COMBO_BOX( img->sub_anim ),
 							  img->current_slide->anim_id );
@@ -2005,13 +2256,10 @@
 	gtk_spin_button_set_value( GTK_SPIN_BUTTON( img->sub_anim_duration ),
 							  img->current_slide->anim_duration );
 
-	/* Update placing */
-	gtk_combo_box_set_active( GTK_COMBO_BOX( img->sub_placing ),
-							  img->current_slide->placing );
-
 	/* Update position */
-	img_table_button_set_active_item( IMG_TABLE_BUTTON( img->sub_pos ),
-									  img->current_slide->position );
+	gtk_range_set_value( GTK_RANGE(img->sub_posX), (gdouble) img->current_slide->posX);
+	gtk_range_set_value( GTK_RANGE(img->sub_posY), (gdouble) img->current_slide->posY);
+	gtk_range_set_value( GTK_RANGE(img->sub_angle), (gdouble) img->current_slide->subtitle_angle);
 
 	/* Unblock all handlers */
 	g_signal_handlers_unblock_by_func( img->slide_text_buffer,
@@ -2020,16 +2268,28 @@
 									   img_text_font_set, img );
 	g_signal_handlers_unblock_by_func( img->sub_color,
 									   img_font_color_changed, img );
-    g_signal_handlers_unblock_by_func( img->sub_bgcolor,
-                                       img_font_bgcolor_changed, img );
+    g_signal_handlers_unblock_by_func( img->sub_brdr_color,
+                                       img_font_brdr_color_changed, img );
+	g_signal_handlers_unblock_by_func( img->sub_bgcolor,
+                                       img_font_bg_color_changed, img );
+	g_signal_handlers_unblock_by_func( img->sub_border_color,
+                                       img_sub_border_color_changed, img );                                       
+	g_signal_handlers_unblock_by_func( img->sub_border_width,
+                                     img_sub_border_width_changed, img );  
 	g_signal_handlers_unblock_by_func( img->sub_anim,
 									   img_text_anim_set, img );
 	g_signal_handlers_unblock_by_func( img->sub_anim_duration,
 									   img_combo_box_anim_speed_changed, img );
-	g_signal_handlers_unblock_by_func( img->sub_placing,
-									   img_placing_changed, img );
-	g_signal_handlers_unblock_by_func( img->sub_pos,
+	g_signal_handlers_unblock_by_func( img->sub_posX,
+									   img_text_pos_changed, img );
+	g_signal_handlers_unblock_by_func( img->sub_posY,
+									   img_text_pos_changed, img );
+	g_signal_handlers_unblock_by_func( img->sub_angle,
 									   img_text_pos_changed, img );
+	g_signal_handlers_unblock_by_func( img->border_top,
+									   img_subtitle_top_border_toggled, img );
+	g_signal_handlers_unblock_by_func( img->border_bottom,
+									   img_subtitle_bottom_border_toggled, img );								   								   
 }
 
 void
@@ -2120,14 +2380,13 @@
 		{ "application/imagination-info-list", 0, 0 }
 	};
 
-	selected =
-		gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->active_icon));
+	selected = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->active_icon));
 	if (selected == NULL)
 		return;
 
 	img_clipboard = gtk_clipboard_get (IMG_CLIPBOARD);
 
-	/* Let's delete the GList if the user selechooses Cut/Copy again instead of Paste */
+	/* Let's delete the GList if the user chooses Cut/Copy again instead of Paste */
 	if (img->selected_paths)
 	{
 		g_list_foreach (img->selected_paths, (GFunc)gtk_tree_path_free, NULL);
@@ -2161,7 +2420,7 @@
 					 img_window_struct *img )
 {
 	/* This structure retains values across invocations */
-	static ImgEmptySlide slide = { { 0, 0, 0 },         /* Start color */
+	ImgEmptySlide slide = { { 0, 0, 0 },         /* Start color */
 								   { 1, 1, 1 },         /* Stop color */
 								   { 0, 0 },            /* Start point (l) */
 								   { -1, 0 },           /* Stop point (l) */
@@ -2171,12 +2430,13 @@
 								   0,                   /* Gradient type */
 								   NULL,                /* Color button */
 								   NULL,                /* Preview area */
-								   { NULL, NULL, NULL } /* Radio buttons */
+							{ NULL, NULL, NULL, NULL }, /* Radio buttons */
+								   NULL,				/* Cairo context */
+								   1.0,					/* Fade alpha value */
+								   0
 								 }; 
 
 	GList *where_to_insert = NULL;
-
-	/* Widgets */
 	GtkWidget *dialog,
 			  *vbox,
 			  *frame,
@@ -2184,6 +2444,7 @@
 			  *radio1,
 			  *radio2,
 			  *radio3,
+			  *radio4,
 			  *color1,
 			  *color2,
 			  *preview,
@@ -2191,8 +2452,41 @@
 	GdkColor   color;
 	gint       i, w, h, pos;
 
+	w = img->video_size0 / 2;
+	h = img->video_size1 / 2;
+
+	if (GTK_WIDGET(item) == img->edit_empty_slide)
+	{
+		/* Let's copy the existing empty slide
+		 * values in the empty slide struct so
+		 * the preview dialog area shows the settings
+		 * user applied when creating the empty one */
+		slide.gradient = img->current_slide->gradient;
+		slide.c_start0 = img->current_slide->g_start_color0;
+		slide.c_start1 = img->current_slide->g_start_color1;
+		slide.c_start2 = img->current_slide->g_start_color2;
+		
+		slide.c_stop0 = img->current_slide->g_stop_color0;
+		slide.c_stop1 = img->current_slide->g_stop_color1;
+		slide.c_stop2 = img->current_slide->g_stop_color2;
+		
+		if (slide.gradient < 2) /* solid and linear */
+		{
+			slide.pl_start0 = img->current_slide->g_start_point0 * w;
+			slide.pl_start1 = img->current_slide->g_start_point1 * h;
+			slide.pl_stop0  = img->current_slide->g_stop_point0 * w;
+			slide.pl_stop1  = img->current_slide->g_stop_point1 * h;
+		}
+		else /* radial */
+		{
+			slide.pr_start0 = img->current_slide->g_start_point0 * w;
+			slide.pr_start1 = img->current_slide->g_start_point1 * h;
+			slide.pr_stop0  = img->current_slide->g_stop_point0 * w;
+			slide.pr_stop1  = img->current_slide->g_stop_point1 * h;
+		}
+	}
 	dialog = gtk_dialog_new_with_buttons(
-					_("Create empty slide"),
+					GTK_WIDGET(item) == img->edit_empty_slide ? _("Edit empty slide") : _("Create empty slide"),
 					GTK_WINDOW( img->imagination_window ),
 					GTK_DIALOG_MODAL,
 					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -2210,29 +2504,36 @@
 	hbox = gtk_hbox_new( FALSE, 6 );
 	gtk_container_add( GTK_CONTAINER( frame ), hbox );
 
-	table = gtk_table_new( 4, 2, TRUE );
+	table = gtk_table_new( 6, 2, TRUE );
 	gtk_box_pack_start( GTK_BOX( hbox ), table, FALSE, FALSE, 10 );
 
-	radio1 = gtk_radio_button_new_with_mnemonic( NULL, _("Use _solid color") );
+	radio1 = gtk_radio_button_new_with_mnemonic( NULL, _("_Solid color") );
 	gtk_table_attach( GTK_TABLE( table ), radio1, 0, 2, 0, 1,
 					  GTK_FILL, GTK_FILL, 0, 0 );
 	slide.radio0 = radio1;
 
 	radio2 = gtk_radio_button_new_with_mnemonic_from_widget(
-				GTK_RADIO_BUTTON( radio1 ), _("Use _linear gradient") );
+				GTK_RADIO_BUTTON( radio1 ), _("_Linear gradient") );
 	gtk_table_attach( GTK_TABLE( table ), radio2, 0, 2, 1, 2,
 					  GTK_FILL, GTK_FILL, 0, 0 );
 	slide.radio1 = radio2;
 
 	radio3 = gtk_radio_button_new_with_mnemonic_from_widget(
-				GTK_RADIO_BUTTON( radio1 ), _("Use _radial gradient") );
+				GTK_RADIO_BUTTON( radio1 ), _("_Radial gradient") );
 	gtk_table_attach( GTK_TABLE( table ), radio3, 0, 2, 2, 3,
 					  GTK_FILL, GTK_FILL, 0, 0 );
 	slide.radio2 = radio3;
+	
+	radio4 = gtk_radio_button_new_with_mnemonic_from_widget(
+				GTK_RADIO_BUTTON( radio1 ), _("_Fade gradient") );
+	gtk_table_attach( GTK_TABLE( table ), radio4, 0, 2, 3, 4,
+					  GTK_FILL, GTK_FILL, 0, 0 );
+	slide.radio3 = radio4;
 
 	gtk_toggle_button_set_active(
 			GTK_TOGGLE_BUTTON( slide.radioslide.gradient ), TRUE );
-	for( i = 0; i < 3; i++ )
+
+	for( i = 0; i < 4; i++ )
 		g_signal_connect( G_OBJECT( slide.radioi ), "toggled",
 						  G_CALLBACK( img_gradient_toggled ), &slide );
 
@@ -2240,7 +2541,7 @@
 	color.green = (gint)( slide.c_start1 * 0xffff );
 	color.blue  = (gint)( slide.c_start2 * 0xffff );
 	color1 = gtk_color_button_new_with_color( &color );
-	gtk_table_attach( GTK_TABLE( table ), color1, 0, 1, 3, 4,
+	gtk_table_attach( GTK_TABLE( table ), color1, 0, 1, 4, 5,
 					  GTK_FILL, GTK_FILL, 0, 0 );
 	g_signal_connect( G_OBJECT( color1 ), "color-set",
 					  G_CALLBACK( img_gradient_color_set ), &slide );
@@ -2249,23 +2550,19 @@
 	color.green = (gint)( slide.c_stop1 * 0xffff );
 	color.blue  = (gint)( slide.c_stop2 * 0xffff );
 	color2 = gtk_color_button_new_with_color( &color );
-	gtk_table_attach( GTK_TABLE( table ), color2, 1, 2, 3, 4,
+	gtk_table_attach( GTK_TABLE( table ), color2, 1, 2, 4, 5,
 					  GTK_FILL, GTK_FILL, 0, 0 );
 	gtk_widget_set_sensitive( color2, (gboolean)slide.gradient );
 	g_signal_connect( G_OBJECT( color2 ), "color-set",
 					  G_CALLBACK( img_gradient_color_set ), &slide );
 
-	frame = gtk_frame_new( _("Preview") );
-	gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 5 );
-
-	w = img->video_size0 / 2;
-	h = img->video_size1 / 2;
 	preview = gtk_drawing_area_new();
 	gtk_widget_set_size_request( preview, w, h );
 	gtk_widget_add_events( preview, GDK_BUTTON1_MOTION_MASK |
 									GDK_BUTTON_PRESS_MASK |
 									GDK_BUTTON_RELEASE_MASK );
-	gtk_container_add( GTK_CONTAINER( frame ), preview );
+	gtk_box_pack_start( GTK_BOX( hbox ), preview, TRUE, TRUE, 5 );
+
 	g_signal_connect( G_OBJECT( preview ), "expose-event",
 					  G_CALLBACK( img_gradient_expose ), &slide );
 	g_signal_connect( G_OBJECT( preview ), "button-press-event",
@@ -2293,9 +2590,32 @@
 	{
 		GtkTreeIter   iter;
 		slide_struct *slide_info;
-		GdkPixbuf    *thumb;
+		GdkPixbuf    *thumb, *pix;
+		GtkTreeModel *model;
+		gchar		 *path;
+
+		if (GTK_WIDGET(item) == img->edit_empty_slide)
+			slide_info = img->current_slide;
+		else
+			slide_info = img_create_new_slide();
+
+		if (slide.gradient == 3)
+			path = "10:0";
+		else
+			path = "0";
+
+		/* Set the transition type to Misc Cross Fade or to None */
+		g_signal_handlers_block_by_func(img->transition_type, (gpointer)img_combo_box_transition_type_changed, img);
+		{
+			GtkTreeIter   iter;
+			GtkTreeModel *model;
+
+			model = gtk_combo_box_get_model( GTK_COMBO_BOX( img->transition_type ) );
+			gtk_tree_model_get_iter_from_string( model, &iter, path );
+			gtk_combo_box_set_active_iter(GTK_COMBO_BOX(img->transition_type), &iter );
+		}
+		g_signal_handlers_unblock_by_func(img->transition_type, (gpointer)img_combo_box_transition_type_changed, img);
 
-		slide_info = img_create_new_slide();
 		if( slide_info )
 		{
 			gdouble p_start2,
@@ -2303,7 +2623,7 @@
 
 			/* Convert gradient points into relative offsets (this enables us to
 			 * scale gradient on any surface size) */
-			if( slide.gradient < 2 ) /* solid and linear */
+			if( slide.gradient == 0 || slide.gradient == 1 || slide.gradient == 3 ) /* Solid, linear and fade */
 			{
 				p_start0 = slide.pl_start0 / w;
 				p_start1 = slide.pl_start1 / h;
@@ -2314,8 +2634,8 @@
 			{
 				p_start0 = slide.pr_start0 / w;
 				p_start1 = slide.pr_start1 / h;
-				p_stop0 = slide.pr_stop0 / w;
-				p_stop1 = slide.pr_stop1 / h;
+				p_stop0  = slide.pr_stop0  / w;
+				p_stop1  = slide.pr_stop1  / h;
 			}
 
 			/* Update slide info */
@@ -2326,35 +2646,73 @@
 			/* Create thumbnail */
 			img_scale_gradient( slide.gradient, p_start, p_stop,
 								slide.c_start, slide.c_stop,
-								88, 72,
+								88, 49,
 								&thumb, NULL );
-										
-			/* Add slide to store */
-			where_to_insert	=	gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->active_icon));
+
+			/* If a slide is selected, add the empty slide after it */
+			where_to_insert	= gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->active_icon));
 			if (where_to_insert)
 			{
 				pos = gtk_tree_path_get_indices(where_to_insert->data)0+1;
-				gtk_list_store_insert_with_values(img->thumbnail_model, &iter,
-												 pos,
-												 0, thumb,
-						 						 1, slide_info,
-						 						 2, NULL,
-						 						 3, FALSE,
-						 						-1 );
+				/* Add empty slide */
+				if (GTK_WIDGET(item) != img->edit_empty_slide)
+				{
+					pix = img_set_fade_gradient(img, slide.gradient, slide_info);
+					gtk_list_store_insert_with_values(img->thumbnail_model, &iter,
+													pos,
+													0, thumb,
+													1, slide_info,
+													2, pix,
+													3, FALSE,
+													-1 );
+				}
+				else
+				{
+					/* Edit empty slide */
+					pix = img_set_fade_gradient(img, slide.gradient, slide_info);
+					model =	GTK_TREE_MODEL( img->thumbnail_model );
+					gtk_tree_model_get_iter(model, &iter, where_to_insert->data);
+					gtk_list_store_set(img->thumbnail_model, &iter,
+													0, thumb,
+													1, slide_info,
+													2, pix,
+													3, slide_info->subtitle ? TRUE : FALSE,
+													-1 );
+					/* Update gradient in image area */
+					img_scale_gradient( slide.gradient,
+								slide_info->g_start_point,
+								slide_info->g_stop_point,
+								slide_info->g_start_color,
+								slide_info->g_stop_color,
+								img->video_size0,
+								img->video_size1,
+								NULL,
+								&img->current_image );
+				}
 				g_list_foreach (where_to_insert, (GFunc)gtk_tree_path_free, NULL);
 				g_list_free (where_to_insert);
 			}
 			else
 			{
-				gtk_list_store_append( img->thumbnail_model, &iter );
-				gtk_list_store_set(img->thumbnail_model, &iter, 0, thumb, 1, slide_info, 2, NULL, 3, FALSE, -1 );
+				/* Add empty slide */
+				if (GTK_WIDGET(item) != img->edit_empty_slide)
+				{
+					pix = img_set_fade_gradient(img, slide.gradient, slide_info);
+					gtk_list_store_append( img->thumbnail_model, &iter );
+					gtk_list_store_set(img->thumbnail_model, &iter, 0, thumb, 1, slide_info, 2, pix, 3, FALSE, -1 );
+				}
+			}
+				
+			if (GTK_WIDGET(item) != img->edit_empty_slide)
+			{
+				img->slides_nr++;
+				img_set_total_slideshow_duration( img );
+				img_select_nth_slide( img, img->slides_nr );
 			}
 			g_object_unref( G_OBJECT( thumb ) );
-			img->slides_nr++;
-			img_set_total_slideshow_duration( img );
-
-			img_select_nth_slide( img, img->slides_nr );
 		}
+	img->project_is_modified = TRUE;
+	gtk_widget_queue_draw(img->image_area);
 	}
 	gtk_widget_destroy( dialog );
 }
@@ -2376,9 +2734,33 @@
 
 	gtk_widget_set_sensitive( slide->color2, (gboolean)i );
 
+	if (i == 3)
+	{
+		if (slide->source > 0)
+			g_source_remove(slide->source);
+		slide->source = g_timeout_add( 2000 * 0.01, (GSourceFunc)img_fade_gradient_decrease_alpha, slide );
+	}
 	gtk_widget_queue_draw( slide->preview );
 }
 
+static gboolean
+img_fade_gradient_decrease_alpha(ImgEmptySlide *slide)
+{
+	if (slide->gradient != 3)
+		return FALSE;
+
+	slide->alpha -= 0.01;
+	
+	if (slide->alpha <= 0)
+	{
+		slide->alpha = 1.0;
+		slide->source = 0;
+		return FALSE;
+	}
+	gtk_widget_queue_draw(slide->preview);
+	return TRUE;
+}
+
 static void
 img_gradient_color_set( GtkColorButton *button,
 						ImgEmptySlide  *slide )
@@ -2412,6 +2794,7 @@
 
 	gdk_drawable_get_size( expose->window, &w, &h );
 	cr = gdk_cairo_create( expose->window );
+
 	switch( slide->gradient )
 	{
 		case 0:
@@ -2441,10 +2824,10 @@
 			/* Paint indicators */
 			cairo_rectangle( cr, slide->pl_start0 - 7,
 								 slide->pl_start1 - 7,
-								 15, 15 );
+								 8, 8 );
 			cairo_rectangle( cr, slide->pl_stop0 - 7,
 								 slide->pl_stop1 - 7,
-								 15, 15 );
+								 8, 8 );
 			cairo_set_source_rgb( cr, 0, 0, 0 );
 			cairo_stroke_preserve( cr );
 			cairo_set_source_rgb( cr, 1, 1, 1 );
@@ -2476,15 +2859,29 @@
 			/* Paint indicators */
 			cairo_rectangle( cr, slide->pr_start0 - 7,
 								 slide->pr_start1 - 7,
-								 15, 15 );
+								 8, 8 );
 			cairo_rectangle( cr, slide->pr_stop0 - 7,
 								 slide->pr_stop1 - 7,
-								 15, 15 );
+								 8, 8 );
 			cairo_set_source_rgb( cr, 0, 0, 0 );
 			cairo_stroke_preserve( cr );
 			cairo_set_source_rgb( cr, 1, 1, 1 );
 			cairo_fill( cr );
 			break;
+
+		case 3:
+		cairo_set_source_rgb(cr,	slide->c_stop0,
+									slide->c_stop1,
+									slide->c_stop2 );
+		cairo_paint( cr );
+	
+		cairo_set_source_rgb(cr, 	slide->c_start0,
+									slide->c_start1,
+									slide->c_start2 ); 
+		cairo_paint_with_alpha(cr, slide->alpha);
+		if (slide->source == 0)
+			slide->source = g_timeout_add( 2000 * 0.01, (GSourceFunc)img_fade_gradient_decrease_alpha, slide );
+		break;
 	}
 	cairo_destroy( cr );
 
@@ -2622,7 +3019,6 @@
 	g_key_file_set_integer( kf, group, "mode",    img->mode );
 	g_key_file_set_double(  kf, group, "zoom_p",  img->image_area_zoom );
 	g_key_file_set_double(  kf, group, "zoom_o",  img->overview_zoom );
-	g_key_file_set_boolean( kf, group, "quality", img->low_quality );
 	g_key_file_set_boolean( kf, group, "max",     max );
 	g_key_file_set_integer( kf, group, "preview", img->preview_fps );
 
@@ -2665,7 +3061,6 @@
 	m                    = g_key_file_get_integer( kf, group, "mode",    NULL );
 	img->image_area_zoom = g_key_file_get_double(  kf, group, "zoom_p",  NULL );
 	img->overview_zoom   = g_key_file_get_double(  kf, group, "zoom_o",  NULL );
-	img->low_quality     = g_key_file_get_boolean( kf, group, "quality", NULL );
 	max                  = g_key_file_get_boolean( kf, group, "max",     NULL );
 
 	/* New addition to environment settings */
@@ -2703,7 +3098,6 @@
 {
 	img->image_area_zoom = 1.0;
 	img->overview_zoom = 1.0;
-	img->low_quality = TRUE;
 	img->preview_fps = PREVIEW_FPS_DEFAULT;
 
 	/* Update mode */
@@ -2780,4 +3174,180 @@
         gtk_label_set_attributes(GTK_LABEL(img->message_label), pango_list);
         pango_attr_list_unref (pango_list);
     }
-}
\ No newline at end of file
+}
+
+void img_align_text_horizontally_vertically(GtkMenuItem *item, img_window_struct *img)
+{
+	cairo_t	*cr;
+	gboolean centerX = FALSE, centerY = FALSE;
+
+	cr = gdk_cairo_create( img->image_area->window );
+	
+	if (GTK_WIDGET(item) == img->x_justify)
+	{
+		centerX = TRUE;
+		centerY = FALSE;
+	}
+	else if (GTK_WIDGET(item) == img->y_justify)
+	{
+		centerX = FALSE;
+		centerY = TRUE;
+	}
+	else
+	{	
+		img->current_slide->subtitle_angle = 0;
+		gtk_range_set_value( GTK_RANGE(img->sub_angle), 0);
+	}
+
+	img_render_subtitle( img,
+								 cr,
+								 img->video_size0,
+								 img->video_size1,
+								 img->image_area_zoom,
+								 img->current_slide->posX,
+								 img->current_slide->posY,
+								 img->current_slide->subtitle_angle,
+								 img->current_point.zoom,
+								 img->current_point.offx,
+								 img->current_point.offy,
+								 img->current_slide->subtitle,
+								 img->current_slide->pattern_filename,
+								 img->current_slide->font_desc,
+								 img->current_slide->font_color,
+                                 img->current_slide->font_brdr_color,
+                                 img->current_slide->font_bg_color,
+                                 img->current_slide->border_color,
+                                 img->current_slide->top_border,
+                                 img->current_slide->bottom_border,
+                                 img->current_slide->border_width,
+								 img->current_slide->anim,
+								 centerX,
+								 centerY,
+								 1.0 );
+
+	gtk_widget_queue_draw(img->image_area);
+}
+
+void
+img_pattern_clicked(GtkMenuItem *item,
+					img_window_struct *img)
+{
+	GtkWidget		*fc;
+	GtkWidget		*tmp_image;
+	gchar			*filename;
+	gint			response;
+	GtkFileFilter	*png_filter;
+	GError			*error = NULL;
+	GdkPixbuf		*pattern_pix;
+
+	fc = gtk_file_chooser_dialog_new (_("Please choose a PNG file"),
+							GTK_WINDOW (img->imagination_window),
+							GTK_FILE_CHOOSER_ACTION_OPEN,
+							GTK_STOCK_CANCEL,
+							GTK_RESPONSE_CANCEL,
+							GTK_STOCK_OPEN,
+							GTK_RESPONSE_ACCEPT,
+							NULL);
+
+	/*if (img->project_current_dir)
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fc),img->project_current_dir);*/
+
+	/* Image files filter */
+	png_filter = gtk_file_filter_new ();
+	gtk_file_filter_set_name(png_filter,_("PNG files"));
+	gtk_file_filter_add_pattern( png_filter, "*.png" );
+	gtk_file_filter_add_pattern( png_filter, "*.PNG" );
+	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fc),png_filter);
+
+	/* Set the delete pattern button */
+	GtkWidget *box = gtk_hbox_new (TRUE, 0);
+	GtkWidget *delete_pattern = gtk_button_new_with_mnemonic(_("Delete current pattern"));
+	gtk_box_pack_start (GTK_BOX (box), delete_pattern, FALSE, FALSE, 0);
+	gtk_widget_show(delete_pattern);
+	g_signal_connect (delete_pattern, "clicked", G_CALLBACK (img_delete_subtitle_pattern), img);
+	gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(fc), box );
+
+	response = gtk_dialog_run (GTK_DIALOG (fc));
+	if (response == GTK_RESPONSE_ACCEPT)
+	{
+		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fc));
+		if( ! filename )
+		{
+			gtk_widget_destroy(fc);
+			return;
+		}
+		if ( (img->current_slide)->pattern_filename)
+			g_free( ( img->current_slide )->pattern_filename);
+
+		(img->current_slide)->pattern_filename = g_strdup(filename);
+		pattern_pix = gdk_pixbuf_new_from_file_at_scale( filename, 32, 32, TRUE, &error);
+		g_free(filename);
+		if (! pattern_pix)
+		{
+			img_message(img, TRUE, error->message);
+			g_error_free(error);
+			gtk_widget_destroy(fc);
+			return;
+		}
+		/* Swap the current image button
+		 * with the loaded one */
+		tmp_image = gtk_image_new_from_pixbuf(pattern_pix);
+		gtk_widget_show(tmp_image);
+		gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(img->pattern_image), tmp_image);
+	
+		gtk_widget_set_sensitive(img->sub_color, FALSE);
+
+		if (pattern_pix)
+			g_object_unref(pattern_pix); 
+	}
+	if (GTK_IS_WIDGET(fc))
+		gtk_widget_destroy(fc);
+}
+
+void img_subtitle_top_border_toggled (GtkToggleButton *button, img_window_struct *img)
+{
+	img_update_sub_properties( img, NULL, -1, -1, NULL, NULL, NULL, NULL, NULL, 
+							gtk_toggle_button_get_active(button),
+							img->current_slide->bottom_border, -1);
+	
+	gtk_widget_queue_draw(img->image_area);
+}
+
+void img_subtitle_bottom_border_toggled (GtkToggleButton *button, img_window_struct *img)
+{
+	img_update_sub_properties( img, NULL, -1, -1, NULL, NULL, NULL, NULL, NULL, 
+								img->current_slide->top_border,
+								gtk_toggle_button_get_active(button), -1);
+	
+	gtk_widget_queue_draw(img->image_area);
+}
+
+void img_spinbutton_value_changed (GtkSpinButton *spinbutton, img_window_struct *img)
+{
+	gdouble duration = 0;
+	GList *selected, *bak;
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	slide_struct *info_slide;
+
+	model = GTK_TREE_MODEL( img->thumbnail_model );
+	selected = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->active_icon));
+	if (selected == NULL)
+		return;
+
+	duration = gtk_spin_button_get_value(spinbutton);
+	bak = selected;
+	while (selected)
+	{
+		gtk_tree_model_get_iter(model, &iter,selected->data);
+		gtk_tree_model_get(model, &iter,1,&info_slide,-1);
+		img_set_slide_still_info( info_slide, duration, img );
+		selected = selected->next;
+	}
+
+	g_list_foreach (bak, (GFunc)gtk_tree_path_free, NULL);
+	g_list_free(bak);
+
+	/* Sync timings */
+	img_sync_timings( img->current_slide, img );
+}

imagination-3.0.tar.bz2/src/callbacks.h -> imagination-3.4.tar.bz2/src/callbacks.h Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (c) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
  *  Copyright (c) 2009 Tadej Borovšak 	<tadeboro@gmail.com>
  * 
  *  This program is free software; you can redistribute it and/or modify
@@ -44,6 +44,7 @@
 						 img_window_struct *img );
 void img_show_about_dialog (GtkMenuItem *,img_window_struct *);
 void img_start_stop_preview(GtkWidget *, img_window_struct *);
+void img_go_fullscreen(GtkMenuItem *, img_window_struct *);
 void img_goto_first_slide(GtkWidget *, img_window_struct *);
 void img_goto_prev_slide(GtkWidget *, img_window_struct *);
 void img_goto_next_slide(GtkWidget *, img_window_struct *);
@@ -58,28 +59,23 @@
 GSList *img_import_slides_file_chooser(img_window_struct *);
 void img_free_allocated_memory(img_window_struct *);
 gint img_ask_user_confirmation(img_window_struct *, gchar *);
+gboolean img_key_pressed(GtkWidget *, GdkEventKey *, img_window_struct *);
+void img_exit_fullscreen(img_window_struct *img);
 gboolean img_quit_application(GtkWidget *, GdkEvent *, img_window_struct *);
 void img_move_audio_up( GtkButton *, img_window_struct * );
 void img_move_audio_down( GtkButton *, img_window_struct * );
 gboolean img_on_expose_event(GtkWidget *,GdkEventExpose *,img_window_struct *);
 void img_ken_burns_zoom_changed( GtkRange *, img_window_struct * );
 gboolean img_image_area_button_press( GtkWidget *, GdkEventButton *, img_window_struct * );
+gboolean img_image_area_button_release( GtkWidget *, GdkEventButton *, img_window_struct * );
 gboolean img_image_area_motion( GtkWidget *, GdkEventMotion *, img_window_struct * );
 void img_clipboard_cut_copy_operation(img_window_struct *, ImgClipboardMode );
 void img_clipboard_clear (GtkClipboard *, img_window_struct *);
 void img_clipboard_get (GtkClipboard *, GtkSelectionData *, guint , img_window_struct *);
-
-void
-img_zoom_in( GtkWidget         *item,
-			 img_window_struct *img );
-
-void
-img_zoom_out( GtkWidget         *item,
-			  img_window_struct *img );
-
-void
-img_zoom_reset( GtkWidget         *item,
-				img_window_struct *img );
+void img_text_pos_changed( GtkRange *range, img_window_struct *);
+void img_zoom_in ( GtkWidget         *item, img_window_struct *img );
+void img_zoom_out( GtkWidget        *item, img_window_struct *img );
+void img_zoom_reset( GtkWidget      *item, img_window_struct *img );
 
 void
 img_zoom_fit( GtkWidget         *item,
@@ -98,7 +94,7 @@
 img_add_stop_point( GtkButton         *button,
 					img_window_struct *img );
 void
-img_update_stop_point( GtkButton         *button,
+img_update_stop_point( GtkSpinButton         *button,
 					   img_window_struct *img );
 void
 img_delete_stop_point( GtkButton         *button,
@@ -150,4 +146,16 @@
                           guint              page_num,
                           img_window_struct *img);
 
+void img_align_text_horizontally_vertically(GtkMenuItem *item,
+					img_window_struct *img);
+
+void
+img_pattern_clicked(GtkMenuItem *item,
+					img_window_struct *img);
+
+void img_subtitle_top_border_toggled (GtkToggleButton *button, img_window_struct *img);
+
+void img_subtitle_bottom_border_toggled (GtkToggleButton *button, img_window_struct *img);
+
+void img_spinbutton_value_changed (GtkSpinButton *spinbutton, img_window_struct *img);
 #endif

imagination-3.0.tar.bz2/src/export.c -> imagination-3.4.tar.bz2/src/export.c Changed

@@ -1,8 +1,8 @@
 /*
-** Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
+** Copyright (c) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
 ** Copyright (C) 2009 Tadej Borovšak   <tadeboro@gmail.com>
 ** Copyright (c) 2011 Robert Chéramy   <robert@cheramy.net>
-**  
+**
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
 ** the Free Software Foundation; either version 2 of the License, or
@@ -25,6 +25,7 @@
 #include "img_sox.h"
 #include <fcntl.h>
 #include <glib/gstdio.h>
+#include "video_formats.h"
 
 static GtkWidget *
 img_create_export_dialog( img_window_struct  *img,
@@ -59,13 +60,6 @@
 img_export_frame_to_ppm( cairo_surface_t *surface,
 						 gint             file_desc );
 
-static void
-img_exporter_ogv( img_window_struct *img );
-static void
-img_exporter_flv( img_window_struct *img );
-static void
-img_exporter_3gp( img_window_struct *img );
-
 /*
  * img_create_export_dialog:
  * @title: title to display with dialog
@@ -165,9 +159,9 @@
 	gtk_box_pack_start( GTK_BOX( hbox_slideshow_name ), label, FALSE, TRUE, 0 );
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-	slideshow_title_entry = sexy_icon_entry_new();
-	sexy_icon_entry_add_clear_button( SEXY_ICON_ENTRY(slideshow_title_entry), img, img_show_file_chooser);
-    sexy_icon_entry_set_icon_highlight( SEXY_ICON_ENTRY(slideshow_title_entry), SEXY_ICON_ENTRY_PRIMARY, TRUE);
+    slideshow_title_entry = gtk_entry_new();
+    gtk_entry_set_icon_from_icon_name(GTK_ENTRY(slideshow_title_entry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_OPEN), 
+	g_signal_connect (slideshow_title_entry, "icon-press", G_CALLBACK (img_show_file_chooser), img);
 	gtk_box_pack_start( GTK_BOX( hbox_slideshow_name ), slideshow_title_entry, TRUE, TRUE, 0 );
 
 	if( box )
@@ -255,8 +249,8 @@
 
 		/* Spawn sox thread now. */
 		g_atomic_int_set( &img->sox_flags, 0 );
-		img->sox = g_thread_create( (GThreadFunc)img_produce_audio_data,
-									tdata, TRUE, NULL );
+		img->sox = g_thread_new( "Imagination" , (GThreadFunc)img_produce_audio_data,
+									tdata);
 
 		/* Chain last export step - video export */
 		g_idle_add( (GSourceFunc)img_start_export, img );
@@ -287,10 +281,10 @@
 	slide_struct *entry;
 	GtkTreeModel *model;
 	GtkWidget    *dialog;
+	GtkWidget	 *image;
 	GtkWidget    *vbox, *hbox;
 	GtkWidget    *label;
 	GtkWidget    *progress;
-	GtkWidget    *button;
 	gchar        *string;
 	cairo_t      *cr;
 
@@ -298,9 +292,9 @@
 	img->export_is_running = 3;
 
 	/* Spawn ffmepg and abort if needed */
-	if( ! img_run_encoder( img ) )
+	if( ! img_run_encoder(img) )
 	{
-		img_stop_export( img );
+		img_stop_export(img);
 		return( FALSE );
 	}
 
@@ -310,6 +304,7 @@
 	img->export_dialog = dialog;
 	gtk_window_set_title( GTK_WINDOW( img->export_dialog ),
 						  _("Exporting the slideshow") );
+	g_signal_connect (G_OBJECT(img->export_dialog), "delete_event", G_CALLBACK (on_close_export_dialog), img);
 	gtk_container_set_border_width( GTK_CONTAINER( dialog ), 10 );
 	gtk_window_set_default_size( GTK_WINDOW( dialog ), 400, -1 );
 	gtk_window_set_type_hint( GTK_WINDOW( dialog ), GDK_WINDOW_TYPE_HINT_DIALOG );
@@ -340,20 +335,35 @@
 	gtk_progress_bar_set_text( GTK_PROGRESS_BAR( progress ), string );
 	gtk_box_pack_start( GTK_BOX( vbox ), progress, FALSE, FALSE, 0 );
 	g_free( string );
+	
+	hbox = gtk_hbox_new( FALSE, 6 );
+	gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+	label = gtk_label_new( _("Elapsed time:") );
+	gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
+	gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, FALSE, 0 );
+
+	img->elapsed_time_label = gtk_label_new(NULL);
+	gtk_misc_set_alignment( GTK_MISC( img->elapsed_time_label ), 0, 0.5 );
+	gtk_box_pack_start( GTK_BOX( hbox ), img->elapsed_time_label, FALSE, FALSE, 0 );
 
 	hbox = gtk_hbox_new( TRUE, 6 );
 	gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
 
-	button = gtk_button_new_from_stock( GTK_STOCK_CANCEL );
-	g_signal_connect_swapped( G_OBJECT( button ), "clicked",
-							  G_CALLBACK( img_stop_export ), img );
-	gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
+	image = gtk_image_new_from_stock( GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON );
+	img->export_cancel_button = gtk_button_new();
+	gtk_button_set_image (GTK_BUTTON (img->export_cancel_button), image);
+	
+	g_signal_connect_swapped( G_OBJECT( img->export_cancel_button ), "clicked",
+							  G_CALLBACK( img_close_export_dialog ), img );
+	gtk_box_pack_end( GTK_BOX( hbox ), img->export_cancel_button, FALSE, FALSE, 0 );
+
+	image = gtk_image_new_from_stock( GTK_STOCK_MEDIA_PAUSE, GTK_ICON_SIZE_BUTTON );
+	img->export_pause_button = gtk_toggle_button_new();
+	gtk_button_set_image (GTK_BUTTON (img->export_pause_button), image);
 
-	button = gtk_toggle_button_new_with_label( GTK_STOCK_MEDIA_PAUSE );
-	gtk_button_set_use_stock( GTK_BUTTON( button ), TRUE );
-	g_signal_connect( G_OBJECT( button ), "toggled",
+	g_signal_connect( G_OBJECT( img->export_pause_button ), "toggled",
 					  G_CALLBACK( img_export_pause_unpause ), img );
-	gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
+	gtk_box_pack_end( GTK_BOX( hbox ), img->export_pause_button, FALSE, FALSE, 0 );
 
 	gtk_widget_show_all( dialog );
 
@@ -406,6 +416,22 @@
 													  img->video_size0,
 													  img->video_size1 );
 
+	if (entry->gradient == 3)
+	{
+		cairo_t	*cr;
+		cr = cairo_create(img->image_from);
+		cairo_set_source_rgb(cr,	entry->g_start_color0,
+									entry->g_start_color1,
+									entry->g_start_color2 );
+		cairo_paint( cr );
+			
+		cr = cairo_create(img->image_to);
+		cairo_set_source_rgb(cr,	entry->g_stop_color0,
+									entry->g_stop_color1,
+									entry->g_stop_color2 );
+		cairo_paint( cr );
+	}	
+
 	/* Set stop points */
 	img->cur_point = NULL;
 	img->point1 = NULL;
@@ -421,6 +447,8 @@
 	img->export_idle_func = (GSourceFunc)img_export_transition;
 	img->source_id = g_idle_add( (GSourceFunc)img_export_transition, img );
 
+	img->elapsed_timer = g_timer_new();
+
 	string = g_strdup_printf( _("Slide %d export progress:"), 1 );
 	/* I did this for the translators. ^^ */
 	gtk_label_set_label( GTK_LABEL( img->export_label ), string );
@@ -432,6 +460,38 @@
 	return( FALSE );
 }
 
+gboolean
+on_close_export_dialog(GtkWidget *widget, GdkEvent *event, img_window_struct *img)
+{
+    img_close_export_dialog(img);
+    return TRUE;
+}
+
+/* If the export wasn't aborted by user display the close button
+ * and wait for the user to click it to close the dialog. This
+ * way the elapsed time is still shown until the dialog is closed */
+void img_post_export(img_window_struct *img)
+{
+	gchar *dummy;
+
+	/* Free all the allocated resources */
+	img_stop_export(img);
+	
+	gtk_widget_hide(img->export_pause_button);
+	gtk_button_set_label(GTK_BUTTON(img->export_cancel_button), _("Close"));
+	g_signal_connect_swapped (img->export_cancel_button, "clicked", G_CALLBACK (gtk_widget_destroy), img->export_dialog);
+	
+	dummy = img_convert_seconds_to_time( (gint) img->elapsed_time);
+	img_message(img,TRUE, _("Elapsed time: %s\n\n"), dummy);
+	g_free(dummy);
+}
+
+void img_close_export_dialog(img_window_struct *img)
+{
+	img_stop_export(img);
+	gtk_widget_destroy(img->export_dialog);
+}
+
 /*
  * img_stop_export:
  * @img: global img_window_struct structure
@@ -453,12 +513,15 @@
 	/* Do any additional tasks */
 	if( img->export_is_running > 3 )
 	{
-		kill( img->ffmpeg_export, SIGINT );
+		kill( img->encoder_pid, SIGINT );
 		g_source_remove( img->source_id );
 
 		close(img->file_desc);
-		g_spawn_close_pid( img->ffmpeg_export );
+		g_spawn_close_pid( img->encoder_pid );
 
+		/* Free ffmpeg cmd line */
+		g_free( img->export_cmd_line );
+	
 		/* Destroy images that were used */
 		cairo_surface_destroy( img->image1 );
 		cairo_surface_destroy( img->image2 );
@@ -466,8 +529,8 @@
 		cairo_surface_destroy( img->image_to );
 		cairo_surface_destroy( img->exported_image );
 
-		/* Close export dialog */
-		gtk_widget_destroy( img->export_dialog );
+		/* Stops the timer */
+		g_timer_destroy(img->elapsed_timer);
 	}
 
 	if( img->export_is_running > 1 )
@@ -510,9 +573,6 @@
 		img->fifo = NULL;
 	}
 
-	/* Free ffmpeg cmd line */
-	g_free( img->export_cmd_line );
-
 	/* Indicate that export is not running any more */
 	img->export_is_running = 0;
 
@@ -539,17 +599,17 @@
  * This function is used when previewing or exporting slideshow. It goes
  * through the model and prepares everything for next transition.
  *
- * If @preview is TRUE, we also respect quality settings.
  *
  * This function also sets img->point12 that are used for transitions.
  *
  * Return value: TRUE if images have been succefully prepared, FALSE otherwise.
  */
 gboolean
-img_prepare_pixbufs( img_window_struct *img,
-					 gboolean           preview )
+img_prepare_pixbufs( img_window_struct *img)
 {
 	GtkTreeModel    *model;
+	GtkTreePath     *path;
+	gchar			*selected_slide_nr;
 	static gboolean  last_transition = TRUE;
 
 	model = GTK_TREE_MODEL( img->thumbnail_model );
@@ -559,8 +619,27 @@
 									g_list_last( img->work_slide->points )->data :
 									NULL );
 
+	/* save the cur iter in the iconview to unselect the slide before selecting the next one */
+	img->prev_ss_iter = img->cur_ss_iter;
+
 	if( last_transition && gtk_tree_model_iter_next( model, &img->cur_ss_iter ) )
 	{
+		img->cur_nr_of_selected_slide++;
+		path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), &img->prev_ss_iter); 
+		if (path)
+		{	
+			gtk_icon_view_unselect_path (GTK_ICON_VIEW(img->thumbnail_iconview), path);
+			gtk_tree_path_free(path);
+		}
+		path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), &img->cur_ss_iter); 
+		gtk_icon_view_select_path (GTK_ICON_VIEW(img->thumbnail_iconview), path);
+		gtk_icon_view_scroll_to_path(GTK_ICON_VIEW(img->thumbnail_iconview), path, FALSE, 0.0, 0.0);
+		gtk_tree_path_free(path);
+		
+		selected_slide_nr = g_strdup_printf("%d",img->cur_nr_of_selected_slide);
+		gtk_entry_set_text(GTK_ENTRY(img->slide_number_entry),selected_slide_nr);
+		g_free(selected_slide_nr);
+
 		/* We have next iter, so prepare for next round */
 		cairo_surface_destroy( img->image1 );
 		img->image1 = img->image2;
@@ -576,14 +655,9 @@
 								img->video_size0,
 								img->video_size1, NULL, &img->image2 );
 		}
-		else if( preview && img->low_quality )
-			img_scale_image( img->work_slide->r_filename, img->video_ratio,
+		img_scale_image( img->work_slide->r_filename, img->video_ratio,
 							 0, img->video_size1, img->distort_images,
 							 img->background_color, NULL, &img->image2 );
-		else
-			img_scale_image( img->work_slide->r_filename, img->video_ratio,
-							 0, 0, img->distort_images,
-							 img->background_color, NULL, &img->image2 );
 
 		/* Get first stop point */
 		img->point2 = (ImgStopPoint *)( img->work_slide->no_points ?
@@ -592,36 +666,55 @@
 
 		return( TRUE );
 	}
-	else if( last_transition )
+	else if (last_transition)
 	{
-		cairo_t *cr;
-
-		/* We displayed last image, but bye-bye transition hasn't
-		 * been displayed. */
-		last_transition = FALSE;
+		if( img->bye_bye_transition )
+		{
+			cairo_t *cr;
 
-		cairo_surface_destroy( img->image1 );
-		img->image1 = img->image2;
+			/* We displayed last image, but bye-bye transition hasn't
+			 * been displayed. */
+		
+			last_transition = FALSE;
+			cairo_surface_destroy( img->image1 );
+			img->image1 = img->image2;
 
-		img->image2 = cairo_image_surface_create( CAIRO_FORMAT_RGB24,
-												  img->video_size0,
-												  img->video_size1 );
-		cr = cairo_create( img->image2 );
-		cairo_set_source_rgb( cr, img->background_color0,
-								  img->background_color1,
-								  img->background_color2 );
-		cairo_paint( cr );
-		cairo_destroy( cr );
+			img->image2 = cairo_image_surface_create( CAIRO_FORMAT_RGB24,
+													  img->video_size0,
+													  img->video_size1 );
+			cr = cairo_create( img->image2 );
+			cairo_set_source_rgb( cr, img->background_color0,
+									  img->background_color1,
+									  img->background_color2 );
+			cairo_paint( cr );
+			cairo_destroy( cr );
+
+			img->work_slide = &img->final_transition;
+			img->point2 = NULL;
+			return( TRUE );
+		}
+		
+	}
+	/* Unselect the last selected item during the preview */
+	GList *list;
+	list = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->thumbnail_iconview));
 
-		img->work_slide = &img->final_transition;
-		img->point2 = NULL;
+	if (list)
+	{
+		gtk_icon_view_unselect_path (GTK_ICON_VIEW(img->thumbnail_iconview), (GtkTreePath*)list->data);
+		g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL);
+		g_list_free (list);
+	}
 
-		return( TRUE );
+	/*  Reselect the first selected slide before the preview if any */
+	if (img->first_selected_path)
+	{
+		gtk_icon_view_select_path (GTK_ICON_VIEW(img->thumbnail_iconview), img->first_selected_path);
+		gtk_icon_view_scroll_to_path(GTK_ICON_VIEW(img->thumbnail_iconview), img->first_selected_path, FALSE, 0.0, 0.0);
 	}
 
 	/* We're done now */
 	last_transition = TRUE;
-
 	return( FALSE );
 }
 
@@ -647,7 +740,7 @@
 
 	ret = g_spawn_async_with_pipes( NULL, argv, NULL,
 									G_SPAWN_SEARCH_PATH,
-									NULL, NULL, &img->ffmpeg_export,
+									NULL, NULL, &img->encoder_pid,
 									&img->file_desc,
                                     NULL,               /* print to standard_output */
                                     NULL,               /* print to standard_error */
@@ -688,7 +781,7 @@
  * Return value: new time offset. The same value is stored in
  * img->next_slide_off.
  */
-guint
+gdouble
 img_calc_next_slide_time_offset( img_window_struct *img,
 								 gdouble            rate )
 {
@@ -732,6 +825,7 @@
 img_export_transition( img_window_struct *img )
 {
 	gchar   string10;
+	gchar	*dummy;
 	gdouble export_progress;
 
 	/* If we rendered all transition frames, connect still export */
@@ -746,9 +840,6 @@
 	/* Draw one frame of transition animation */
 	img_render_transition_frame( img );
 
-	/* Export frame */
-	img_export_frame_to_ppm( img->exported_image, img->file_desc );
-
 	/* Increment global frame counters and update progress bars */
 	img->slide_cur_frame++;
 	img->displayed_frame++;
@@ -759,7 +850,6 @@
 	gtk_progress_bar_set_fraction( GTK_PROGRESS_BAR( img->export_pbar1 ),
 								   export_progress );
 	gtk_progress_bar_set_text( GTK_PROGRESS_BAR( img->export_pbar1 ), string );
-
 	export_progress = CLAMP( (gdouble)img->displayed_frame /
 									  img->total_nr_frames, 0, 1 );
 	snprintf( string, 10, "%.2f%%", export_progress * 100 );
@@ -767,9 +857,15 @@
 								   export_progress );
 	gtk_progress_bar_set_text( GTK_PROGRESS_BAR( img->export_pbar2 ), string );
 
-	/* Draw every 10th frame of animation on screen */
+	/* Update the elapsed time */
+	img->elapsed_time = g_timer_elapsed(img->elapsed_timer, NULL);  
+	dummy = img_convert_seconds_to_time( (gint) img->elapsed_time);
+	gtk_label_set_text(GTK_LABEL(img->elapsed_time_label), dummy);
+	g_free(dummy);
+
+	/* Draw every 10th frame of animation on screen 
 	if( img->displayed_frame % 10 == 0 )
-		gtk_widget_queue_draw( img->image_area );
+		gtk_widget_queue_draw( img->image_area );*/
 
 	return( TRUE );
 }
@@ -788,12 +884,13 @@
 {
 	gdouble export_progress;
 	gchar   string10;
+	gchar	*dummy;
 
 	/* If there is next slide, connect transition preview, else finish
 	 * preview. */
 	if( img->slide_cur_frame == img->slide_nr_frames )
 	{
-		if( img_prepare_pixbufs( img, FALSE ) )
+		if( img_prepare_pixbufs( img) )
 		{
 			gchar *string;
 
@@ -815,16 +912,14 @@
 			img->cur_point = NULL;
 		}
 		else
-			img_stop_export( img );
+			img_post_export(img);
 
 		return( FALSE );
 	}
 
 	/* Draw frames until we have enough of them to fill slide duration gap. */
-	img_render_still_frame( img, img->export_fps );
-
-	/* Export frame */
-	img_export_frame_to_ppm( img->exported_image, img->file_desc );
+	
+	 img_render_still_frame( img, img->export_fps );
 
 	/* Increment global frame counter and update progress bar */
 	img->still_counter++;
@@ -847,9 +942,15 @@
 								   export_progress );
 	gtk_progress_bar_set_text( GTK_PROGRESS_BAR( img->export_pbar2 ), string );
 
-	/* Draw every 10th frame of animation on screen */
+	/* Update the elapsed time */
+	img->elapsed_time = g_timer_elapsed(img->elapsed_timer, NULL);  
+	dummy = img_convert_seconds_to_time( (gint) img->elapsed_time);
+	gtk_label_set_text(GTK_LABEL(img->elapsed_time_label), dummy);
+	g_free(dummy);
+	
+	/* Draw every 10th frame of animation on screen 
 	if( img->displayed_frame % 10 == 0 )
-		gtk_widget_queue_draw( img->image_area );
+		gtk_widget_queue_draw( img->image_area );*/
 
 	return( TRUE );
 }
@@ -865,10 +966,16 @@
 						  img_window_struct *img )
 {
 	if( gtk_toggle_button_get_active( button ) )
+	{
 		/* Pause export */
 		g_source_remove( img->source_id );
+		g_timer_stop(img->elapsed_timer);
+	}
 	else
+	{
 		img->source_id = g_idle_add(img->export_idle_func, img);
+		g_timer_continue(img->elapsed_timer);
+	}
 }
 
 void
@@ -879,11 +986,25 @@
 	cairo_t      *cr;
 
 	/* Do image composing here and place result in exported_image */
-	/* Create first image */
-	cr = cairo_create( img->image_from );
-	img_draw_image_on_surface( cr, img->video_size0, img->image1,
-							   ( img->point1 ? img->point1 : &point ), img );
-
+	
+	/* Create first image
+	 * this is a dirt hack to have Imagination use the image_from painted
+	 * with the second color set in the empty slide fade gradient */
+	if (img->work_slide->o_filename && img->gradient_slide)
+	{
+		cr = cairo_create( img->image_from );
+		cairo_set_source_rgb(cr,	img->g_stop_color0,
+									img->g_stop_color1,
+									img->g_stop_color2);
+		cairo_paint( cr );
+	}
+	else
+	{
+		cr = cairo_create( img->image_from );
+		if (img->work_slide->gradient != 3)
+			img_draw_image_on_surface( cr, img->video_size0, img->image1,
+								( img->point1 ? img->point1 : &point ), img );
+	}
 #if 0
 	/* Render subtitle if present */
 	if( img->work_slide->subtitle )
@@ -897,12 +1018,12 @@
 
 		p_draw_point = ( img->point1 ? img->point1 : &point );
 
-		img_render_subtitle( cr,
+		img_render_subtitle( img,
+							 cr,
 							 img->video_size0,
 							 img->video_size1,
 							 1.0,
 							 img->work_slide->position,
-							 img->work_slide->placing,
 							 p_draw_point->zoom,
 							 p_draw_point->offx,
 							 p_draw_point->offy,
@@ -910,6 +1031,8 @@
 							 img->work_slide->font_desc,
 							 img->work_slide->font_color,
 							 img->work_slide->anim,
+							 FALSE,
+							 FALSE,
 							 progress );
 	}
 #endif
@@ -917,7 +1040,8 @@
 
 	/* Create second image */
 	cr = cairo_create( img->image_to );
-	img_draw_image_on_surface( cr, img->video_size0, img->image2,
+	if (img->work_slide->gradient != 3)
+		img_draw_image_on_surface( cr, img->video_size0, img->image2,
 							   ( img->point2 ? img->point2 : &point ), img );
 	/* FIXME: Add subtitles here */
 	cairo_destroy( cr );
@@ -928,6 +1052,10 @@
 	cairo_save( cr );
 	img->work_slide->render( cr, img->image_from, img->image_to, progress );
 	cairo_restore( cr );
+	
+	/* Export frame */
+	if (img->export_is_running)
+		img_export_frame_to_ppm( img->exported_image, img->file_desc );
 
 	cairo_destroy( cr );
 }
@@ -1006,7 +1134,11 @@
 
 	/* Paint surface */
 	cr = cairo_create( img->exported_image );
-	img_draw_image_on_surface( cr, img->video_size0, img->image2,
+	if (img->work_slide->gradient == 3)
+		img_draw_image_on_surface( cr, img->video_size0, img->image_to,
+							   p_draw_point, img );
+	else
+		img_draw_image_on_surface( cr, img->video_size0, img->image2,
 							   p_draw_point, img );
 
 	/* Render subtitle if present */
@@ -1018,23 +1150,37 @@
 		progress = CLAMP( progress, 0, 1 );
 		img->cur_text_frame++;
 
-		img_render_subtitle( cr,
+		img_render_subtitle( img,
+							 cr,
 							 img->video_size0,
 							 img->video_size1,
 							 1.0,
-							 img->work_slide->position,
-							 img->work_slide->placing,
+							 img->work_slide->posX,
+							 img->work_slide->posY,
+							 img->work_slide->subtitle_angle,
 							 p_draw_point->zoom,
 							 p_draw_point->offx,
 							 p_draw_point->offy,
 							 img->work_slide->subtitle,
+							 img->work_slide->pattern_filename,
 							 img->work_slide->font_desc,
 							 img->work_slide->font_color,
-                             img->work_slide->font_bgcolor,
+                             img->work_slide->font_brdr_color,
+                             img->work_slide->font_bg_color,
+                             img->work_slide->border_color,
+                             img->work_slide->top_border,
+                             img->work_slide->bottom_border,
+                             img->work_slide->border_width,
 							 img->work_slide->anim,
+							 FALSE,
+							 FALSE,
 							 progress );
 	}
 
+	/* Export frame */
+	if (img->export_is_running)
+		img_export_frame_to_ppm( img->exported_image, img->file_desc );
+
 	/* Destroy drawing context */
 	cairo_destroy( cr );
 }
@@ -1043,7 +1189,6 @@
 img_export_frame_to_ppm( cairo_surface_t *surface,
 						 gint             file_desc )
 {
-	cairo_format_t  format;
 	gint            width, height, stride, row, col;
 	guchar         *data, *pix;
 	gchar          *header;
@@ -1051,19 +1196,6 @@
 	guchar         *buffer, *tmp;
 	gint            buf_size;
 
-	/* Get info about cairo surface passed in. */
-	format = cairo_image_surface_get_format( surface );
-
-	/* For more information on diferent formats, see
-	 * www.cairographics.org/manual/cairo-image-surface.html#cairo-format-t */
-	/* Currently this exporter only handles CAIRO_FORMAT_(ARGB32|RGB24)
-	 * formats. */
-	if( ! format == CAIRO_FORMAT_ARGB32 && ! format == CAIRO_FORMAT_RGB24 )
-	{
-		g_print("Unsupported cairo surface format!\n" );
-		return;
-	}
-
 	/* Image info and pixel data */
 	width  = cairo_image_surface_get_width( surface );
 	height = cairo_image_surface_get_height( surface );
@@ -1131,20 +1263,19 @@
 }
 
 /* ****************************************************************************
- * Exporter functions
+ * Exporter function
  *
- * These are the functions that will be called when user selects export format.
+ * This is the function that will be called when user selects export format.
  *
- * There is exactly one function per export format. Addresses of these functions
- * are stored inside Exporter structs, which can be obtained by calling
- * img_get_exporters function.
+ * There is one function for all formats, data is stored in video_format_list
+ * (new_slideshow.c). If you wish to add a new format, have a look at 
+ * video_format_list.
  *
- * Each exporter function receives pointer to main img_window_struct structure,
+ * The exporter function receives a pointer to main img_window_struct structure,
  * from which it calculates appropriate ffmpeg export string.
  *
  * Structure, passed in as a parameter, should be treated like read-only
- * information source. Exceptions to this rule are export_fps and
- * export_cmd_line fields. Those fields MUST be set to appropriate value.
+ * information source. Exceptions to this rule is the export_cmd_line field.
  *
  * For example, if we spawn ffmpeg with "-r 25" in it's cmd line, export_fps
  * should be set to 25. This will ensure that ffmpeg will receive proper amount
@@ -1156,31 +1287,19 @@
  * path to newly produced audio file (at this stage, we don't have any).
  * ************************************************************************* */
 
-void img_exporter_vob( img_window_struct *img )
+void img_exporter (GtkWidget *button, img_window_struct *img )
 {
-	gchar          *cmd_line;
-	gchar          *format;
+	gchar          *cmd_line, *bitrate_cmd, *aspect_ratio_cmd;
 	const gchar    *filename;
-	gchar          *aspect_ratio, *aspect_ratio_cmd;
 	GtkWidget      *dialog;
 	GtkEntry       *entry;
 	GtkWidget      *vbox;
 
-	/* Additional options - VOB only */
-	GtkWidget *frame;
-	GtkWidget *label;
-	GtkWidget *hbox;
-	GtkWidget *radio1, *radio2;
-    
-    /* ffmpeg test */
-    gchar *ffmpeg_test_result;
-    gchar **argv;
-    gint    argc;
-
 	/* This function call should be the first thing exporter does, since this
 	 * function will take some preventive measures and also switches mode into
 	 * preview if needed. */
-	dialog = img_create_export_dialog( img, _("VOB (DVD video)"),
+    /* FIXME: change with a gtk_file_chooser ? */
+	dialog = img_create_export_dialog( img, _(video_format_listimg->video_format_index.name),
 									   GTK_WINDOW( img->imagination_window ),
 									   &entry, &vbox );
 
@@ -1188,625 +1307,100 @@
 	if( dialog == NULL )
 		return;
 
-	/* Add any export format specific GUI elements here */
-	frame = gtk_frame_new( NULL );
-	gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, FALSE, 0 );
+	gtk_widget_show_all (dialog );
 
-	label = gtk_label_new( _("<b>Television Format</b>") );
-	gtk_label_set_use_markup( GTK_LABEL( label ), TRUE );
-	gtk_frame_set_label_widget( GTK_FRAME( frame ), label );
-
-	hbox = gtk_hbox_new( TRUE, 5 );
-	gtk_container_add( GTK_CONTAINER( frame ), hbox );
-
-	radio1 = gtk_radio_button_new_with_mnemonic( NULL, _("Normal 4:3") );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radio1 ), TRUE );
-	gtk_box_pack_start( GTK_BOX( hbox ), radio1, FALSE, FALSE, 0 );
-
-	radio2 = gtk_radio_button_new_with_mnemonic_from_widget(
-				GTK_RADIO_BUTTON( radio1 ), _("Widescreen 16:9") );
-	gtk_box_pack_start( GTK_BOX( hbox ), radio2, FALSE, FALSE, 0 );
-
-	gtk_widget_show_all( dialog );
-
-	/* Run dialog and abort if needed */
-	if( gtk_dialog_run( GTK_DIALOG( dialog ) ) != GTK_RESPONSE_ACCEPT )
+    /* Run dialog and abort if needed */
+	if ( gtk_dialog_run( GTK_DIALOG( dialog ) ) != GTK_RESPONSE_ACCEPT )
 	{
 		gtk_widget_destroy( dialog );
 		return;
 	}
 
-	/* User is serious, so we better prepare ffmepg command line;) */
-	img->export_is_running = 1;
-    if (img->video_size1 == 576)
-    {
-        format = "pal";
-        img->export_fps = 25;
-    }
-    else
-    {
-        format = "ntsc";
-        img->export_fps = 30;
-    }
-	filename = gtk_entry_get_text( entry );
-	if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radio1 ) ) )
-		aspect_ratio = "4:3";
-	else
-		aspect_ratio = "16:9";
-
-
-    /* Check if ffmpeg is compiled with avfilter setdar */
-    img_message(img, FALSE, "Testing ffmpeg abilities with \"ffmpeg -filters\" ... ");
-
-    g_shell_parse_argv("ffmpeg -filters", &argc, &argv, NULL);
-    g_spawn_sync(NULL, argv, NULL,
-                 G_SPAWN_STDERR_TO_DEV_NULL|G_SPAWN_SEARCH_PATH,
-                 NULL, NULL,
-                 &ffmpeg_test_result, NULL,
-                 NULL, NULL);
-    if (NULL != ffmpeg_test_result && NULL != g_strrstr(ffmpeg_test_result, "setdar"))
-    {
-        img_message(img, FALSE, "setdar found!\n");
-        aspect_ratio_cmd = "-vf setdar=";
-    }
-    else
+    if (gtk_entry_get_text_length (entry) == 0) /* No filename given */
     {
-        img_message(img, FALSE, "setdar not found!\n");
-        aspect_ratio_cmd = "-aspect ";
-
+        gtk_widget_destroy( dialog );
+        return;
     }
-    g_strfreev( argv );
-
-	cmd_line = g_strdup_printf( "ffmpeg -f image2pipe -vcodec ppm -r %.0f "
-								"-i pipe: <#AUDIO#> -y "
-								"-bf 2 -target %s-dvd -s %dx%d %s%s \"%s\"",
-								img->export_fps,
-								format,
-                                img->video_size0, img->video_size1,
-                                aspect_ratio_cmd, aspect_ratio, filename );
-	img->export_cmd_line = cmd_line;
-
-	/* Initiate stage 2 of export - audio processing */
-	g_idle_add( (GSourceFunc)img_prepare_audio, img );
-
-	gtk_widget_destroy( dialog );
-}
-
-static void
-img_exporter_ogv( img_window_struct *img )
-{
-	gchar          *cmd_line;
-	const gchar    *filename;
-	gchar          *aspect_ratio;
-	GtkWidget      *dialog;
-	GtkEntry       *entry;
-	GtkWidget      *vbox;
-
-	/* Additional options - OGG  only */
-	GtkWidget *frame, *alignment, *label;
-	GtkWidget *hbox, *vbox_normal;
-	GtkWidget *radio1, *radio2;
-	GtkWidget *video_size_combo;
-	GtkWidget *radios3;
-	gint	  i, width, height;
-
-	/* These values have been contributed by Jean-Pierre Redonnet.
-	 * Thanks. */
-	gint       qualities = { 512, 1024, 2048 };
-
-	/* This function call should be the first thing exporter does, since this
-	 * function will take some preventive measures. */
-	dialog = img_create_export_dialog( img, _("OGV (Theora/Vorbis)"),
-									   GTK_WINDOW( img->imagination_window ),
-									   &entry, &vbox );
-
-	/* If dialog is NULL, abort. */
-	if( dialog == NULL )
-		return;
-
-	/* Add any export format specific GUI elements here */
-	hbox = gtk_hbox_new( TRUE, 10 );
-	gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
-
-	/* Aspect Ratio */
-	frame = gtk_frame_new( NULL );
-	gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
-
-	label = gtk_label_new( _("<b>Aspect Ratio</b>") );
-	gtk_label_set_use_markup( GTK_LABEL( label ), TRUE );
-	gtk_frame_set_label_widget( GTK_FRAME( frame ), label );
-
-	alignment = gtk_alignment_new(0.5, 0.5, 0.5, 0.5);
-	gtk_container_add (GTK_CONTAINER (frame), alignment);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 5, 5);
-
-	vbox_normal = gtk_vbox_new( FALSE, 0 );
-	gtk_container_add( GTK_CONTAINER( alignment ), vbox_normal );
-
-	radio1 = gtk_radio_button_new_with_mnemonic( NULL, _("Normal 4:3") );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radio1 ), TRUE );
-	gtk_box_pack_start( GTK_BOX( vbox_normal ), radio1, FALSE, FALSE, 0 );
-
-	radio2 = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON( radio1 ), _("Widescreen 16:9") );
-	gtk_box_pack_start( GTK_BOX( vbox_normal ), radio2, FALSE, FALSE, 0 );
-
-	/* Video Size */
-	frame = gtk_frame_new( NULL );
-	gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
-
-	label = gtk_label_new( _("<b>Video Size</b>") );
-	gtk_label_set_use_markup( GTK_LABEL( label ), TRUE );
-	gtk_frame_set_label_widget( GTK_FRAME( frame ), label );
-
-	alignment = gtk_alignment_new(0.5, 0.5, 0.5, 0.5);
-	gtk_container_add (GTK_CONTAINER (frame), alignment);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 5, 5);
-
-	vbox_normal = gtk_vbox_new( FALSE, 0 );
-	gtk_container_add (GTK_CONTAINER (alignment), vbox_normal);
-
-	video_size_combo = _gtk_combo_box_new_text(FALSE);
-	gtk_box_pack_start( GTK_BOX( vbox_normal ), video_size_combo, FALSE, FALSE, 0 );
-	{
-		GtkTreeIter   iter;
-		GtkListStore *store = GTK_LIST_STORE( gtk_combo_box_get_model(GTK_COMBO_BOX( video_size_combo ) ) );
-
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "320 x 240", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "352 x 288", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "400 x 300", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "512 x 384", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "640 x 480", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "704 x 576", -1 );
-	}
-	gtk_combo_box_set_active( GTK_COMBO_BOX( video_size_combo ), 0 );
-
-	/* Video Quality */
-	frame = gtk_frame_new( NULL );
-	gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, FALSE, 0 );
-
-	label = gtk_label_new( _("<b>Video Quality:</b>") );
-	gtk_label_set_use_markup( GTK_LABEL( label ), TRUE );
-	gtk_frame_set_label_widget( GTK_FRAME( frame ), label );
-
-	hbox = gtk_hbox_new( TRUE, 5 );
-	gtk_container_add( GTK_CONTAINER( frame ), hbox );
 
-	radios0 = gtk_radio_button_new_with_mnemonic( NULL, _("Low") );
-	gtk_box_pack_start( GTK_BOX( hbox ), radios0, FALSE, FALSE, 0 );
+    filename = gtk_entry_get_text( entry );
 
-	radios1 = gtk_radio_button_new_with_mnemonic_from_widget(
-				GTK_RADIO_BUTTON( radios0 ), _("Medium") );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radios1 ), TRUE );
-	gtk_box_pack_start( GTK_BOX( hbox ), radios1, FALSE, FALSE, 0 );
-
-	radios2 = gtk_radio_button_new_with_mnemonic_from_widget(
-				GTK_RADIO_BUTTON( radios0 ), _("High") );
-	gtk_box_pack_start( GTK_BOX( hbox ), radios2, FALSE, FALSE, 0 );
-
-	gtk_widget_show_all( dialog );
-
-	/* Run dialog and abort if needed */
-	if( gtk_dialog_run( GTK_DIALOG( dialog ) ) != GTK_RESPONSE_ACCEPT )
-	{
-		gtk_widget_destroy( dialog );
-		return;
-	}
-
-	/* User is serious, so we better prepare ffmpeg command line;) */
+	/* User is serious, so we better prepare ffmepg command line;) */
 	img->export_is_running = 1;
-	img->export_fps = 30;
-	filename = gtk_entry_get_text( entry );
 
-	/* Any additional calculation can be placed here. */
-	switch(gtk_combo_box_get_active(GTK_COMBO_BOX(video_size_combo)) )
-	{
-		case 0:
-		width  = 320;
-		height = 240;
-		break;
-		
-		case 1:
-		width  = 352;
-		height = 288;
-		break;
-
-		case 2:
-		width  = 400;
-		height = 300;
-		break;
-
-		case 3:
-		width  = 512;
-		height = 384;
-		break;
-
-		case 4:
-		width  = 640;
-		height = 480;
-		break;
-
-		case 5:
-		width  = 704;
-		height = 576;
-		break;
-	}
-
-	if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radio1 ) ) )
-		aspect_ratio = "4:3";
-	else
-		aspect_ratio = "16:9";
-
-	for( i = 0; i < 3; i++ )
-	{
-		if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radiosi ) ) )
-			break;
-	}
+    if (NULL != video_format_listimg->video_format_index.aspect_ratio_list)
+        aspect_ratio_cmd = g_strdup_printf("%s%s",
+                    img->ffmpeg_aspect_ratio_cmd,
+                    video_format_listimg->video_format_index.aspect_ratio_listimg->aspect_ratio_index.ffmpeg_option);
+    else
+        aspect_ratio_cmd = g_strdup("");
 
-	cmd_line = g_strdup_printf( "ffmpeg -f image2pipe -vcodec ppm -r %.0f "
-								"-i pipe: <#AUDIO#> -f ogg -aspect %s -s %dx%d "
-								"-vcodec libtheora -b %dk -acodec libvorbis "
-								"-y \"%s\"",
-								img->export_fps, aspect_ratio, width, height,
-								qualitiesi, filename );
+    if (NULL != video_format_listimg->video_format_index.bitratelist)
+        bitrate_cmd = g_strdup_printf("-b:v %s",
+                    video_format_listimg->video_format_index.bitratelistimg->bitrate_index.value);
+    else
+        bitrate_cmd = g_strdup("");
+
+
+	cmd_line = g_strdup_printf("%s -f image2pipe -vcodec ppm "
+				"-i pipe: <#AUDIO#> "
+				"-r %s "                /* frame rate */
+				"-y "                   /* overwrite output */
+                "%s "                   /* ffmpeg option */
+                "-s %dx%d "             /* size */
+                "%s "                   /* aspect ratio */
+                "%s "                   /* Bitrate */
+                "\"%s\"",               /*filename */
+                img->encoder_name,
+                video_format_listimg->video_format_index.fps_listimg->fps_index.ffmpeg_option,
+                video_format_listimg->video_format_index.ffmpeg_option,
+                img->video_size0, img->video_size1,
+                aspect_ratio_cmd,
+                bitrate_cmd,
+                filename);
 	img->export_cmd_line = cmd_line;
 
 	/* Initiate stage 2 of export - audio processing */
 	g_idle_add( (GSourceFunc)img_prepare_audio, img );
 
+    g_free(aspect_ratio_cmd);
+    g_free(bitrate_cmd);
 	gtk_widget_destroy( dialog );
 }
 
-static void
-img_exporter_flv( img_window_struct *img )
-{
-	gchar          *cmd_line;
-	const gchar    *filename;
-	GtkWidget      *dialog;
-	GtkEntry       *entry;
-	GtkWidget      *vbox;
-
-	/* Additional options - FLV  only */
-	GtkWidget *frame;
-	GtkWidget *label;
-	GtkWidget *hbox, *vbox_normal, *alignment;
-	GtkWidget *radio1, *radio2;
-	GtkWidget *video_size_combo;
-	GtkWidget *radios3;
-	gint       i, width, height;
-	gint       qualities = { 384, 768, 1536 };
-
-	/* This function call should be the first thing exporter does, since this
-	 * function will take some preventive measures. */
-	dialog = img_create_export_dialog( img, _("FLV (Flash video)"),
-									   GTK_WINDOW( img->imagination_window ),
-									   &entry, &vbox );
-
-	/* If dialog is NULL, abort. */
-	if( dialog == NULL )
-		return;
-
-	/* Add any export format specific GUI elements here */
-	hbox = gtk_hbox_new( TRUE, 10 );
-	gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
-
-	/* Aspect Ratio */
-	frame = gtk_frame_new( NULL );
-	gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
-
-	label = gtk_label_new( _("<b>Aspect Ratio</b>") );
-	gtk_label_set_use_markup( GTK_LABEL( label ), TRUE );
-	gtk_frame_set_label_widget( GTK_FRAME( frame ), label );
-
-	alignment = gtk_alignment_new(0.5, 0.5, 0.5, 0.5);
-	gtk_container_add (GTK_CONTAINER (frame), alignment);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 5, 5);
-
-	vbox_normal = gtk_vbox_new( FALSE, 0 );
-	gtk_container_add( GTK_CONTAINER( alignment ), vbox_normal );
 
-	radio1 = gtk_radio_button_new_with_mnemonic( NULL, _("Normal 4:3") );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radio1 ), TRUE );
-	gtk_box_pack_start( GTK_BOX( vbox_normal ), radio1, FALSE, FALSE, 0 );
-
-	radio2 = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON( radio1 ), _("Widescreen 16:9") );
-	gtk_box_pack_start( GTK_BOX( vbox_normal ), radio2, FALSE, FALSE, 0 );
-
-	/* Video Size */
-	frame = gtk_frame_new( NULL );
-	gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
-
-	label = gtk_label_new( _("<b>Video Size</b>") );
-	gtk_label_set_use_markup( GTK_LABEL( label ), TRUE );
-	gtk_frame_set_label_widget( GTK_FRAME( frame ), label );
-
-	alignment = gtk_alignment_new(0.5, 0.5, 0.5, 0.5);
-	gtk_container_add (GTK_CONTAINER (frame), alignment);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 5, 5);
-
-	vbox_normal = gtk_vbox_new( FALSE, 0 );
-	gtk_container_add (GTK_CONTAINER (alignment), vbox_normal);
-
-	video_size_combo = _gtk_combo_box_new_text(FALSE);
-	gtk_box_pack_start( GTK_BOX( vbox_normal ), video_size_combo, FALSE, FALSE, 0 );
-	{
-		GtkTreeIter   iter;
-		GtkListStore *store = GTK_LIST_STORE( gtk_combo_box_get_model(GTK_COMBO_BOX( video_size_combo ) ) );
-
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "320 x 240", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "352 x 288", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "400 x 300", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "512 x 384", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "640 x 360", -1 );
-	}
-	gtk_combo_box_set_active( GTK_COMBO_BOX( video_size_combo ), 0 );
-
-	frame = gtk_frame_new( NULL );
-	gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, FALSE, 0 );
-
-	label = gtk_label_new( _("<b>Video Quality:</b>") );
-	gtk_label_set_use_markup( GTK_LABEL( label ), TRUE );
-	gtk_frame_set_label_widget( GTK_FRAME( frame ), label );
-
-	hbox = gtk_hbox_new( TRUE, 5 );
-	gtk_container_add( GTK_CONTAINER( frame ), hbox );
-
-	radios0 = gtk_radio_button_new_with_mnemonic( NULL, _("Low") );
-	gtk_box_pack_start( GTK_BOX( hbox ), radios0, FALSE, FALSE, 0 );
-
-	radios1 = gtk_radio_button_new_with_mnemonic_from_widget(
-				GTK_RADIO_BUTTON( radios0 ), _("Medium") );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radios1 ), TRUE );
-	gtk_box_pack_start( GTK_BOX( hbox ), radios1, FALSE, FALSE, 0 );
-
-	radios2 = gtk_radio_button_new_with_mnemonic_from_widget(
-				GTK_RADIO_BUTTON( radios0 ), _("High") );
-	gtk_box_pack_start( GTK_BOX( hbox ), radios2, FALSE, FALSE, 0 );
-
-	gtk_widget_show_all( dialog );
-
-	/* Run dialog and abort if needed */
-	if( gtk_dialog_run( GTK_DIALOG( dialog ) ) != GTK_RESPONSE_ACCEPT )
-	{
-		gtk_widget_destroy( dialog );
-		return;
-	}
-
-	/* User is serious, so we better prepare ffmpeg command line;) */
-	img->export_is_running = 1;
-	img->export_fps = 30;
-	filename = gtk_entry_get_text( entry );
-
-	/* The -aspect parameter for FLV format seems to be ignored by ffmpeg */
-	if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radio1 ) ) )
-	{
-		switch(gtk_combo_box_get_active(GTK_COMBO_BOX(video_size_combo)) )
-		{
-			case 0:
-			width  = 320;
-			height = 240;
-			break;
-		
-			case 1:
-			width  = 352;
-			height = 288;
-			break;
-
-			case 2:
-			width  = 400;
-			height = 300;
-			break;
-
-			case 3:
-			width  = 512;
-			height = 384;
-			break;
-
-			case 4:
-			width  = 640;
-			height = 480;
-			break;
-		}
-	}
-	else
-	{
-		switch(gtk_combo_box_get_active(GTK_COMBO_BOX(video_size_combo)) )
-		{
-			case 0:
-			width  = 426;
-			height = 240;
-			break;
-		
-			case 1:
-			width  = 512;
-			height = 288;
-			break;
-
-			case 2:
-			width  = 534;
-			height = 300;
-			break;
-
-			case 3:
-			width  = 682;
-			height = 384;
-			break;
-
-			case 4:
-			width  = 640;
-			height = 360;
-			break;
-		}
-	}
-
-	for( i = 0; i < 3; i++ )
-	{
-		if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radiosi ) ) )
-			break;
-	}
-
-	cmd_line = g_strdup_printf( "ffmpeg -f image2pipe -vcodec ppm -r %.0f "
-								"-i pipe: <#AUDIO#> -f flv -s %dx%d "
-								"-vcodec flv -b %dk -acodec libmp3lame -ab 56000 "
-								"-ar 22050 -ac 1 -y \"%s\"",
-								img->export_fps, width, height,
-								qualitiesi, filename );
-	img->export_cmd_line = cmd_line;
-
-	/* Initiate stage 2 of export - audio processing */
-	g_idle_add( (GSourceFunc)img_prepare_audio, img );
-
-	gtk_widget_destroy( dialog );
-}
-
-static void
-img_exporter_3gp( img_window_struct *img )
+/* Test ffmpeg abilities */
+void test_ffmpeg(img_window_struct *img)
 {
-	gchar          *cmd_line;
-	const gchar    *filename;
-	GtkWidget      *dialog;
-	GtkEntry       *entry;
-	GtkWidget      *vbox;
-
-	/* Additional options - 3GP  only */
-	GtkWidget *frame1, *alignment;
-	GtkWidget *label;
-	GtkWidget *hbox, *vbox_normal;
-	GtkWidget *normal_combo;
-	gint       width, height;
-
-	/* This function call should be the first thing exporter does, since this
-	 * function will take some preventive measures. */
-	dialog = img_create_export_dialog( img, _("3GP (Mobile Phones)"),
-									   GTK_WINDOW( img->imagination_window ),
-									   &entry, &vbox );
-
-	/* If dialog is NULL, abort. */
-	if( dialog == NULL )
-		return;
-
-	/* Add any export format specific GUI elements here */
-	hbox = gtk_hbox_new( TRUE, 5 );
-	gtk_container_add( GTK_CONTAINER( vbox ), hbox );
-	
-	frame1 = gtk_frame_new( NULL );
-	gtk_box_pack_start( GTK_BOX( hbox ), frame1, FALSE, TRUE, 0 );
-
-	label = gtk_label_new( _("<b>Video Size</b>") );
-	gtk_label_set_use_markup( GTK_LABEL( label ), TRUE );
-	gtk_frame_set_label_widget( GTK_FRAME( frame1 ), label );
-
-	alignment = gtk_alignment_new(0, 0, 0.5, 0.5);
-	gtk_container_add (GTK_CONTAINER (frame1), alignment);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 5, 5);
-
-	vbox_normal = gtk_vbox_new( FALSE, 0 );
-	gtk_container_add (GTK_CONTAINER (alignment), vbox_normal);
-
-	normal_combo = _gtk_combo_box_new_text(FALSE);
-	gtk_box_pack_start( GTK_BOX( vbox_normal ), normal_combo, FALSE, FALSE, 0 );
-	{
-		GtkTreeIter   iter;
-		GtkListStore *store = GTK_LIST_STORE( gtk_combo_box_get_model(GTK_COMBO_BOX( normal_combo ) ) );
-
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "128 x 96", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "176 x 144", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "352 x 288", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "704 x 576", -1 );
-	}
-	gtk_combo_box_set_active( GTK_COMBO_BOX( normal_combo ), 0 );
-	gtk_widget_show_all( dialog );
-
-	/* Run dialog and abort if needed */
-	if( gtk_dialog_run( GTK_DIALOG( dialog ) ) != GTK_RESPONSE_ACCEPT )
-	{
-		gtk_widget_destroy( dialog );
-		return;
-	}
-
-	/* User is serious, so we better prepare ffmpeg command line;) */
-	img->export_is_running = 1;
-	img->export_fps = 25;
-	filename = gtk_entry_get_text( entry );
+    /* ffmpeg test */
+    gchar *ffmpeg_test_result;
+    gchar **argv;
+    gint    argc;
 
-	/* Any additional calculation can be placed here. */
-	switch(gtk_combo_box_get_active(GTK_COMBO_BOX(normal_combo)) )
-	{
-		case 0:
-		width  = 128;
-		height = 96;
-		break;
-
-		case 1:
-		width  = 176;
-		height = 144;
-		break;
-
-		case 2:
-		width  = 352;
-		height = 288;
-		break;
-
-		case 3:
-		width  = 704;
-		height = 576;
-		break;
-	}
+   /* Check if ffmpeg/avconv is compiled with avfilter setdar */
+    img_message(img, FALSE, (g_strrstr(img->encoder_name, "ffmpeg") ? "Testing ffmpeg abilities with \"ffmpeg -filters\" ... "
+    															   : "Testing avconv abilities with \"avconv -filters\" ... "));
 
-	cmd_line = g_strdup_printf( "ffmpeg -f image2pipe -vcodec ppm -r %.0f "
-								"-i pipe: <#AUDIO#> -f 3gp -s %dx%d "
-								"-vcodec h263 -acodec libfaac -b 192k -ab 32k "
-								"-ar 8000 -ac 1 -y \"%s\"",
-								img->export_fps,
-								width, height, filename );
-	img->export_cmd_line = cmd_line;
+    if (g_strrstr(img->encoder_name, "ffmpeg"))
+    	g_shell_parse_argv("ffmpeg -filters", &argc, &argv, NULL);
+    else
+    	g_shell_parse_argv("avconv -filters", &argc, &argv, NULL);
 
-	/* Initiate stage 2 of export - audio processing */
-	g_idle_add( (GSourceFunc)img_prepare_audio, img );
+    g_spawn_sync(NULL, argv, NULL,
+                 G_SPAWN_STDERR_TO_DEV_NULL|G_SPAWN_SEARCH_PATH,
+                 NULL, NULL,
+                 &ffmpeg_test_result, NULL,
+                 NULL, NULL);
+    if (NULL != ffmpeg_test_result && NULL != g_strrstr(ffmpeg_test_result, "setdar"))
+    {
+        img_message(img, FALSE, "setdar found!\n");
+        img->ffmpeg_aspect_ratio_cmd = "-vf setdar=";
+    }
+    else
+    {
+        img_message(img, FALSE, "setdar not found!\n");
+        img->ffmpeg_aspect_ratio_cmd = "-aspect ";
 
-	gtk_widget_destroy( dialog );
-}
-/* ****************************************************************************
- * End exporters
- * ************************************************************************* */
+    }
+    g_strfreev( argv );
 
-void img_choose_exporter(GtkWidget *button, img_window_struct *img)
-{
-	switch (img->video_format)
-	{
-		default:
-		case 'V':
-		img_exporter_vob(img);
-		break;
-
-		case 'O':
-		img_exporter_ogv(img);
-		break;
-
-		case 'F':
-		img_exporter_flv(img);
-		break;
-
-		case '3':
-		img_exporter_3gp(img);
-		break;
-
-		case 'M':
-		//img_exporter_vob(img);
-		break;
-	}
 }

imagination-3.0.tar.bz2/src/export.h -> imagination-3.4.tar.bz2/src/export.h Changed

@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
+** Copyright (c) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
 ** Copyright (C) 2009 Tadej Borovšak   <tadeboro@gmail.com>
 **  
 ** This program is free software; you can redistribute it and/or modify
@@ -27,14 +27,23 @@
 img_stop_export( img_window_struct *img );
 
 gboolean
-img_prepare_pixbufs( img_window_struct *img,
+img_prepare_pixbufs( img_window_struct *img);
+gboolean
+on_close_export_dialog(GtkWidget *widget,
+						GdkEvent *event,
+						img_window_struct *img);
 
-					 gboolean           preview );
-guint
+gdouble
 img_calc_next_slide_time_offset( img_window_struct *img,
 								 gdouble            rate );
 
 void
+img_post_export(img_window_struct *img);
+
+void
+img_close_export_dialog(img_window_struct *img);
+
+void
 img_exporter_vob( img_window_struct *img );
 
 void
@@ -45,6 +54,10 @@
 						gdouble            rate );
 
 void
-img_choose_exporter(GtkWidget *button, img_window_struct *img);
+img_exporter(GtkWidget *button, img_window_struct *img);
+
+void
+test_ffmpeg(img_window_struct *img);
+
 
 #endif

imagination-3.0.tar.bz2/src/imagination.c -> imagination-3.4.tar.bz2/src/imagination.c Changed

imagination-3.0.tar.bz2/src/imagination.h -> imagination-3.4.tar.bz2/src/imagination.h Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (c) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
  *  Copyright (c) 2009 Tadej Borovšak 	<tadeboro@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -37,8 +37,6 @@
 #define	NORMAL	4
 #define	SLOW	8
 
-#define old_comment_string \
-	"Imagination Slideshow Project - http://imagination.sf.net"
 #define comment_string \
 	"Imagination 2.0 Slideshow Project - http://imagination.sf.net"
 
@@ -46,28 +44,6 @@
 /* ****************************************************************************
  * Subtitles related definitions
  * ************************************************************************* */
-/* Enum that holds all available positions of text. */
-typedef enum
-{
-	IMG_SUB_POS_TOP_LEFT = 0,
-	IMG_SUB_POS_TOP_CENTER,
-	IMG_SUB_POS_TOP_RIGHT,
-	IMG_SUB_POS_MIDDLE_LEFT,
-	IMG_SUB_POS_MIDDLE_CENTER,
-	IMG_SUB_POS_MIDDLE_RIGHT,
-	IMG_SUB_POS_BOTTOM_LEFT,
-	IMG_SUB_POS_BOTTOM_CENTER,
-	IMG_SUB_POS_BOTTOM_RIGHT
-}
-ImgSubPos;
-
-/* Enum with relative placings */
-typedef enum
-{
-	IMG_REL_PLACING_EXPORTED_VIDEO = 0,
-	IMG_REL_PLACING_ORIGINAL_IMAGE
-}
-ImgRelPlacing;
 
 typedef enum
 {
@@ -105,9 +81,16 @@
 								   gint         lh,
 								   gint         posx,
 								   gint         posy,
+								   gint         angle,
+								   gchar		*pattern_filename,
 								   gdouble      progress,
 								   gdouble     *font_color,
-                                   gdouble     *font_bgcolor );
+								   gdouble     *font_brdr_color,
+                                   gdouble     *font_bg_color,
+                                   gdouble     *border_color,
+                                   gboolean		top_border,
+                                   gboolean		bottom_border,
+                                   gint			border_width );
 
 
 /* ****************************************************************************
@@ -162,14 +145,14 @@
 
 
 	/* Fields that are filled if we create slide in memory */
-	gint    gradient;         /* Gradient type */
+	gint    gradient;         			/* Gradient type */
 	gdouble g_start_color3; /* RGB start color */
 	gdouble g_stop_color3;  /* RGB stop color */
 	gdouble g_start_point2; /* x, y coordinates of start point */
 	gdouble g_stop_point2;  /* x, y coordinates of stop point */
 
 	/* Still part of the slide params */
-	guint duration; /* Duration of still part */ /* NOTE: sub1 */
+	gdouble duration; /* Duration of still part */ /* NOTE: sub1 */
 
 	/* Transition params */
 	gchar     *path;          /* Transition model path to transition */
@@ -184,21 +167,31 @@
 
 	/* Subtitle variables */
 	gchar                *subtitle;        /* Subtitle text */
+	gchar			 	 *pattern_filename;/* Pattern image file */
 	TextAnimationFunc     anim;            /* Animation functions */
+	gint                  posX;       	   /* subtitle X position */
+	gint                  posY;        	   /* subtitle Y position */
+	gint                  subtitle_angle;  /* subtitle rotation angle */
 	gint                  anim_id;         /* Animation id */
 	gint                  anim_duration;   /* Duration of animation */
-	ImgSubPos             position;        /* Final position of subtitle */
-	ImgRelPlacing         placing;         /* Relative placing */
+	//ImgRelPlacing         placing;         /* Relative placing */
 	PangoFontDescription *font_desc;       /* Font description */
 	gdouble               font_color4;   /* Font color (RGBA format) */
-    gdouble               font_bgcolor4; /* Font background color (RGBA format) */
+    gdouble               font_brdr_color4; /* Font border color (RGBA format) */
+    gdouble               font_bg_color4; /* Font background color (RGBA format) */
+    gdouble               border_color4; /* Border on background color (RGBA format) */
+    gboolean           	  top_border;
+    gboolean           	  bottom_border;
+    gint               	  border_width;		/* Border on background color (RGBA format) */
 };
 
 typedef struct _img_window_struct img_window_struct;
 struct _img_window_struct
 {
 	/* Main GUI related variables */
-	GtkWidget	*imagination_window;	// Main window
+	GtkWidget	*imagination_window;
+	GtkWidget 	*menubar;
+	GtkWidget *toolbar;
 	GtkAccelGroup *accel_group;
 	GtkWidget	*open_menu;
     GtkWidget   *close_menu;
@@ -210,10 +203,16 @@
 	GtkWidget	*cut;
 	GtkWidget	*copy;
 	GtkWidget	*paste;
+	GtkWidget	*edit_empty_slide;
 	GtkWidget	*remove_menu;
+	GtkWidget	*select_all_menu;
 	GtkWidget	*report_menu;
-	GtkWidget	*preview_menu;
+	GtkWidget	*fullscreen;
+	GtkWidget 	*fullscreen_music_preview;
+	GtkWidget 	*fullscreen_no_music;
+	GtkWidget 	*fullscreen_loop_preview;
 	GtkWidget 	*preview_button;
+	GtkWidget	*notebook;
 	GtkWidget	*menu_preview_mode;
 	GtkWidget	*menu_overview_mode;
 	GtkWidget	*transition_type;
@@ -224,14 +223,13 @@
 	GtkWidget	*filename_data;
 	GtkTextBuffer *slide_text_buffer;
 	GtkWidget	*scrolled_win;
-	GtkWidget	*expand_button;
 	GtkWidget   *text_pos_button;
+	GtkWidget 	*thumb_scrolledwindow;
   	GtkWidget	*thumbnail_iconview;
   	GtkWidget	*statusbar;
   	GtkWidget	*progress_bar;
+  	GtkWidget 	*viewport_align;
   	GtkWidget	*image_area;
-  	GtkWidget	*video_format_combo;
-  	GtkWidget	*video_size_combo;
   	guint		context_id;
   	GtkListStore *thumbnail_model;
   	gchar		*current_dir;
@@ -256,24 +254,34 @@
 	GtkWidget *ken_duration; /* Stop point duration spin button */
 	GtkWidget *ken_zoom;     /* Zoom slider */
 	GtkWidget *ken_add;      /* Add stop point button */
-	GtkWidget *ken_update;   /* Update stop point button */
 	GtkWidget *ken_remove;   /* Remove stop point button */
 
 	/* Subtitle related controls */
 	GtkWidget *sub_textview;      /* Text view */
 	GtkWidget *sub_font;          /* Font button */
-	GtkWidget *sub_color;         /* Color selector button */
-    GtkWidget *sub_bgcolor;       /* Background Color selector button */
+	GtkWidget *sub_color;         /* Font color selector button */
+    GtkWidget *sub_brdr_color;    /* Border font color selector button */
+    GtkWidget *sub_bgcolor;       /* Background font color selector button */
+    GtkWidget *sub_border_color;  /* Border on font background color selector button */
+    GtkWidget *border_top;  	  /* Border top widget */
+    GtkWidget *border_bottom;  	  /* Border bottom widget */
+    GtkWidget *sub_border_width;  /* Border width on font background button */
+    GtkWidget *pattern_image;	  /* Font Pattern */
 	GtkWidget *sub_anim;          /* Animation combo box */
 	GtkWidget *sub_anim_duration; /* Animation duration spin button */
-	GtkWidget *sub_placing;       /* Placing combo box */
-	GtkWidget *sub_pos;           /* Position selector button */
-
+	GtkWidget *sub_posX;          /* Position X hscale range */
+	GtkWidget *sub_posY;          /* Position Y hscale range */
+	GtkWidget *x_justify;         /* Button to justify text on x axis */
+	GtkWidget *y_justify;         /* Button to justify text on y axis */
+	GtkWidget *reset_angle;       /* Button to reset the angle to 0 */
+	GtkWidget *sub_angle;          /* Text angle hscale range */
+	GtkAdjustment *sub_posX_adj;	/* Gtk Adjustment for pos x scale */
+	GtkAdjustment *sub_posY_adj;	/* Gtk Adjustment for pos y scale */
 	/* Import slides dialog variables */
 	GtkWidget	*dim_label;
 	GtkWidget	*size_label;
   	GtkWidget	*preview_image;
-
+ 
 	/* Current image position parameters */
 	gdouble       x;             /* Last button press coordinates */
 	gdouble       y;
@@ -296,14 +304,27 @@
 	gchar       *project_filename;		// project name for saving
 	gchar       *project_current_dir;
 	gboolean	distort_images;
+	gboolean	bye_bye_transition;
 	gboolean	project_is_modified;
-	gchar		video_format;
+	gboolean	relative_filenames;
+    GtkWidget   *video_format_combo;
+    GtkWidget   *bye_bye_transition_checkbox;
+	gint        video_format_index;
+    GtkWidget   *video_size_combo;
 	gint        video_size2;
 	gdouble     video_ratio;
-	gdouble     background_color3;
-  	gint		total_secs;
+    GtkWidget  *aspect_ratio_combo;
+    gint        aspect_ratio_index;
+    gchar      *ffmpeg_aspect_ratio_cmd;
+    GtkWidget  *fps_combo;
+    gint        fps_index;
+    GtkWidget  *bitrate_combo;
+    gint        bitrate_index;
+    gdouble     background_color3;
+  	gdouble		total_secs;
 	gint		total_music_secs;
   	gint		slides_nr;
+  	gint		cur_nr_of_selected_slide;
 	slide_struct final_transition;  /* Only speed, render and duration fields
 									   of this structure are used (and duration
 									   is always 0). */
@@ -319,7 +340,14 @@
 	ImgStopPoint    *point1;        /* Last stop point of image1 */
 	ImgStopPoint    *point2;        /* First stop point of image2 */
   	GtkTreeIter      cur_ss_iter;
+  	GtkTreeIter      prev_ss_iter;
+  	GtkTreePath 	*first_selected_path;
   	guint		     source_id;
+  	gboolean	     gradient_slide; /* Flag to allow the hack when transitioning
+										from an empty slide with fade gradient */
+	gdouble			g_stop_color3; /* Backup stop color to allow the transition
+										from image_from painted with the second color
+										set in the empty slide fade gradient */
 
 	/* Counters that control animation flow */
 	guint  total_nr_frames;    /* Total number of frames */
@@ -328,7 +356,7 @@
 	guint  slide_cur_frame;    /* Current slide frame */
 	guint  slide_trans_frames; /* Number of frames in transition */
 	guint  slide_still_frames; /* Number of frames in still part */
-	guint  next_slide_off;     /* Time offset of next slide */
+	gdouble  next_slide_off;     /* Time offset of next slide */
 
 	gint   still_counter; /* Currently displayed still frame */
 	gint   still_max;     /* Number of frames per stop point */
@@ -340,7 +368,11 @@
 	gint   no_text_frames; /* All text frames */
 
 	/* Preview related variables */
+	gboolean	window_is_fullscreen;
   	gboolean	preview_is_running;
+  	gboolean	no_music;
+  	gboolean	music_preview;
+  	gboolean	loop_preview;
   	GtkWidget	*import_slide_chooser;
 	GtkWidget	*total_stop_points_label;
   	GtkWidget	*total_slide_number_label;
@@ -368,12 +400,18 @@
 	GtkWidget   *export_pbar1;
 	GtkWidget   *export_pbar2;
 	GtkWidget   *export_label;
+	GtkWidget	*elapsed_time_label;
 	GtkWidget   *export_dialog;
+	GtkWidget   *export_cancel_button;
+	GtkWidget   *export_pause_button;
 	gdouble      export_fps;        /* Frame rate for exported video */
+	gdouble      elapsed_time;      /* Elapsed time during export */
+	gchar		*encoder_name;		/* ffmpeg or avconv	*/
 	gchar       *export_cmd_line;   /* ffmpeg spawn cmd line */
 	guint        export_slide;		/* Number of slide being exported */
 	GSourceFunc  export_idle_func;	/* Stored procedure for pause */
-	GPid         ffmpeg_export;     /* ffmpeg's process id */
+	GPid         encoder_pid;       /* ffmpeg/avconv process id */
+	GTimer		 *elapsed_timer;	/* GTimer for the elasped time */
 
 	/* Sox thread related variables */
 	gint      sox_flags;         /* Thread controls:
@@ -390,8 +428,10 @@
 	GtkWidget	*play_audio_button;
 	GtkWidget	*remove_audio_button;
 	GtkListStore *music_file_liststore;
+	GtkTreeIter	next_audio_iter;
 	GtkWidget	*music_time_data;
 	GPid		play_child_pid;
+	guint		audio_source_id;
     
     /* Messages related stuf */
     GtkTextBuffer  *message_buffer;
@@ -402,9 +442,6 @@
 	gdouble  image_area_zoom; /* Zoom to be applied to image area */
 	gdouble  overview_zoom;   /* Zoom to be applied in overview mode */
 	gint     preview_fps;     /* Preview frame rate */
-	gboolean low_quality;     /* Preview quality:
-								  TRUE  - preview in low-res
-								  FALSE - preview in hi-res */
 
 	/* Clipboard related stuff */
 	GList				*selected_paths;

imagination-3.0.tar.bz2/src/img_sox.c -> imagination-3.4.tar.bz2/src/img_sox.c Changed

imagination-3.0.tar.bz2/src/main-window.c -> imagination-3.4.tar.bz2/src/main-window.c Changed

@@ -1,8 +1,8 @@
 /*
- *  Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (c) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
  *  Copyright (c) 2009 Tadej Borovšak 	<tadeboro@gmail.com>
  *  Copyright (c) 2011 Robert Chéramy   <robert@cheramy.net>
- * 
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License,or
@@ -29,6 +29,7 @@
 #include "export.h"
 #include "subtitles.h"
 #include "imgcellrendererpixbuf.h"
+#include "video_formats.h"
 
 static const GtkTargetEntry drop_targets =
 {
@@ -38,17 +39,14 @@
 /* ****************************************************************************
  * Local function declarations
  * ************************************************************************* */
-static void img_combo_box_transition_type_changed (GtkComboBox *, img_window_struct *);
 static void img_random_button_clicked(GtkButton *, img_window_struct *);
 static GdkPixbuf *img_set_random_transition(img_window_struct *, slide_struct *);
 static void img_combo_box_speed_changed (GtkComboBox *,  img_window_struct *);
-static void img_spinbutton_value_changed (GtkSpinButton *, img_window_struct *);
 static void img_slide_cut(GtkMenuItem * , img_window_struct *);
 static void img_slide_copy(GtkMenuItem * , img_window_struct *);
 static void img_slide_paste(GtkMenuItem* , img_window_struct *);
 static void img_report_slides_transitions(img_window_struct *);
 static void img_clear_audio_files(GtkButton *, img_window_struct *);
-static void img_expand_button_clicked(GtkButton *, img_window_struct *);
 static void img_on_drag_audio_data_received (GtkWidget *,GdkDragContext *, int, int, GtkSelectionData *, unsigned int, unsigned int, img_window_struct *);
 static gboolean img_sub_textview_focus_in (GtkWidget *, GdkEventFocus *, img_window_struct *);
 static gboolean img_sub_textview_focus_out(GtkWidget *, GdkEventFocus *, img_window_struct *);
@@ -99,40 +97,34 @@
 {
 	img_window_struct *img_struct = NULL;
 	GtkWidget *vbox1;
-	GtkWidget *menubar;
 	GtkWidget *menuitem1;
+	GtkWidget *menuitem2;
 	GtkWidget *menu1;
 	GtkWidget *imagemenuitem1;
 	GtkWidget *imagemenuitem5;
 	GtkWidget *separatormenuitem1;
-	GtkWidget *menuitem2;
 	GtkWidget *slide_menu;
-	GtkWidget *separator_slide_menu;
 	GtkWidget *image_menu;
-	GtkWidget *select_all_menu;
 	GtkWidget *deselect_all_menu;
 	GtkWidget *menuitem3;
 	GtkWidget *tmp_image;
 	GtkWidget *menu3;
 	GtkWidget *about;
 	GtkWidget *contents;
-	GtkWidget *toolbar;
 	GtkWidget *new_button;
 	GtkWidget *add_slide;
 	GtkWidget *separatortoolitem;
 	GtkWidget *toolbutton_slide_goto;
 	GtkWidget *first_slide, *last_slide, *prev_slide, *next_slide, *label_of;
-	GtkWidget *notebook;
 	GtkWidget *video_tab;
 	GtkWidget *audio_tab;
 	GtkWidget *swindow, *scrollable_window;
 	GtkWidget *viewport;
 	GtkWidget *align;
-	GtkWidget *image_area_frame;
 	GtkWidget *vbox_frames, *vbox_audio_frames, *frame1_alignment, *frame2_alignment, *frame3_alignment,*frame4_alignment;
 	GtkWidget *frame1, *frame2, *frame3, *frame4, *frame_label;
 	GtkWidget *transition_label;
-	GtkWidget *vbox_info_slide, *vbox_slide_motion, *vbox_slide_caption;
+	GtkWidget *vbox_info_slide, *vbox_slide_motion, *vbox_slide_caption, *vbox_slide_position;
 	GtkWidget *table;
 	GtkWidget *duration_label;
 	GtkWidget *trans_duration_label;
@@ -146,9 +138,9 @@
 	GtkWidget *move_down_button, *clear_button, *image_buttons, *vbox2, *scrolledwindow1;
     GtkWidget *message_scroll, *message_view;
 	GtkCellRenderer *renderer, *pixbuf_cell;
-	GtkTreeSelection *selection;
+	//GtkTreeSelection *selection;
 	GtkTreeViewColumn *column;
-	GtkIconSize tmp_toolbar_icon_size;
+	//GtkIconSize tmp_toolbar_icon_size;
 	GtkIconTheme *icon_theme;
 	GdkPixbuf *icon;
 	gint x;
@@ -156,9 +148,8 @@
 	GtkWidget *a_label;
 	GtkWidget *a_hbox;
 	GtkWidget *modes_vbox;
-
-	/* Added after cleaning up the img_window_struct */
 	GtkWidget *properties_menu;
+	GtkWidget *preview_menu;
 	GtkWidget *import_menu;
 	GtkWidget *import_audio_menu;
 	GtkWidget *import_button;
@@ -166,7 +157,6 @@
 	GtkWidget *remove_button;
 	GtkWidget *zoom_in_button, *zoom_out_button, *zoom_normal, *zoom_fit;
 	GtkWidget *export_menu;
-	GtkWidget *thumb_scrolledwindow;
 	GdkPixbuf *pixbuf;
 	GtkWidget *rotate_left_menu;
 	GtkWidget *rotate_right_menu;
@@ -193,6 +183,11 @@
 	img_struct->video_size0 = 720;
 	img_struct->video_size1 = 576;
 	img_struct->video_ratio = (gdouble)720 / 576;
+	img_struct->video_format_index = 0; /* VOB is default */
+    img_struct->aspect_ratio_index = 0;
+    img_struct->bitrate_index = 0;
+    img_struct->fps_index = 0;
+    img_struct->export_fps = video_format_listimg_struct->video_format_index.fps_listimg_struct->fps_index.value;
 
 	img_struct->final_transition.duration = 0;
 	img_struct->final_transition.render = NULL;
@@ -209,6 +204,7 @@
 	img_set_window_title(img_struct,NULL);
 	g_signal_connect (G_OBJECT (img_struct->imagination_window),"delete-event",G_CALLBACK (img_quit_application),img_struct);
 	g_signal_connect (G_OBJECT (img_struct->imagination_window), "destroy", G_CALLBACK (gtk_main_quit), NULL );
+	g_signal_connect (G_OBJECT (img_struct->imagination_window), "key_press_event", G_CALLBACK(img_key_pressed), img_struct);
 	img_struct->accel_group = gtk_accel_group_new();
 
 	vbox1 = gtk_vbox_new (FALSE, 0);
@@ -216,11 +212,11 @@
 	gtk_container_add (GTK_CONTAINER (img_struct->imagination_window), vbox1);
 
 	/* Create the menu items */
-	menubar = gtk_menu_bar_new ();
-	gtk_box_pack_start (GTK_BOX (vbox1), menubar, FALSE, TRUE, 0);
+	img_struct->menubar = gtk_menu_bar_new ();
+	gtk_box_pack_start (GTK_BOX (vbox1), img_struct->menubar, FALSE, TRUE, 0);
 
 	menuitem1 = gtk_menu_item_new_with_mnemonic (_("_Slideshow"));
-	gtk_container_add (GTK_CONTAINER (menubar), menuitem1);
+	gtk_container_add (GTK_CONTAINER (img_struct->menubar), menuitem1);
 
 	menu1 = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem1), menu1);
@@ -262,7 +258,7 @@
 	gtk_widget_add_accelerator (import_menu,"activate",img_struct->accel_group,GDK_i,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
 	g_signal_connect (G_OBJECT (import_menu),"activate",G_CALLBACK (img_add_slides_thumbnails),img_struct);
 
-	pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 18, 0, NULL);
+	pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 16, 0, NULL);
 	image_menu = gtk_image_new_from_pixbuf(pixbuf);
 	g_object_unref(pixbuf);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_menu),image_menu);
@@ -272,7 +268,7 @@
 	gtk_widget_add_accelerator (import_audio_menu,"activate",img_struct->accel_group,GDK_m,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
 	g_signal_connect (G_OBJECT (import_audio_menu),"activate",G_CALLBACK (img_select_audio_files_to_add),img_struct);
 
-	pixbuf = gtk_icon_theme_load_icon(icon_theme,"sound", 18, 0, NULL);
+	pixbuf = gtk_icon_theme_load_icon(icon_theme,"sound", 16, 0, NULL);
 	image_menu = gtk_image_new_from_pixbuf(pixbuf);
 	g_object_unref(pixbuf);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_audio_menu),image_menu);
@@ -284,17 +280,41 @@
 	separatormenuitem1 = gtk_separator_menu_item_new ();
 	gtk_container_add (GTK_CONTAINER (menu1), separatormenuitem1);
 
-	img_struct->preview_menu = gtk_image_menu_item_new_with_mnemonic (_("_Preview"));
-	gtk_container_add (GTK_CONTAINER (menu1), img_struct->preview_menu);
-	gtk_widget_add_accelerator (img_struct->preview_menu, "activate",img_struct->accel_group,GDK_p,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
-	g_signal_connect (G_OBJECT (img_struct->preview_menu),"activate",G_CALLBACK (img_start_stop_preview),img_struct);
+	preview_menu = gtk_image_menu_item_new_with_mnemonic (_("Preview"));
+	gtk_menu_shell_append( GTK_MENU_SHELL( menu1 ), preview_menu);
+	tmp_image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preview_menu),tmp_image);
+	
+	menu3 = gtk_menu_new ();
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (preview_menu), menu3);
 
-	tmp_image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY,GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (img_struct->preview_menu),tmp_image);
+	img_struct->fullscreen_music_preview = gtk_image_menu_item_new_with_mnemonic(_("With music") );
+	pixbuf = gtk_icon_theme_load_icon(icon_theme,"sound", 16, 0, NULL);
+	image_menu = gtk_image_new_from_pixbuf(pixbuf);
+	g_object_unref(pixbuf);
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (img_struct->fullscreen_music_preview),image_menu);
+	gtk_widget_add_accelerator (img_struct->fullscreen_music_preview, "activate",img_struct->accel_group, GDK_space, GDK_MODE_DISABLED, GTK_ACCEL_VISIBLE);
+	g_signal_connect (G_OBJECT (img_struct->fullscreen_music_preview),"activate",G_CALLBACK (img_start_stop_preview),img_struct);
+	gtk_menu_shell_append( GTK_MENU_SHELL( menu3 ), img_struct->fullscreen_music_preview );
+	
+	img_struct->fullscreen_no_music = gtk_image_menu_item_new_with_mnemonic(_("Without music") );
+	tmp_image = gtk_image_new_from_stock (GTK_STOCK_FULLSCREEN,GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (img_struct->fullscreen_no_music),tmp_image);
+	gtk_widget_add_accelerator (img_struct->fullscreen_no_music, "activate",img_struct->accel_group, GDK_m, GDK_SHIFT_MASK|GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+	g_signal_connect (G_OBJECT (img_struct->fullscreen_no_music),"activate",G_CALLBACK (img_start_stop_preview), img_struct);
+	gtk_menu_shell_append( GTK_MENU_SHELL( menu3 ), img_struct->fullscreen_no_music );
+	
+	img_struct->fullscreen_loop_preview = gtk_image_menu_item_new_with_mnemonic(_("Continuos") );
+	tmp_image = gtk_image_new_from_stock (GTK_STOCK_REFRESH,GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (img_struct->fullscreen_loop_preview),tmp_image);
+	gtk_widget_add_accelerator (img_struct->fullscreen_loop_preview, "activate",img_struct->accel_group,GDK_p,GDK_SHIFT_MASK|GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
+	g_signal_connect (G_OBJECT (img_struct->fullscreen_loop_preview),"activate",G_CALLBACK (img_start_stop_preview), img_struct);
+	gtk_menu_shell_append( GTK_MENU_SHELL( menu3 ), img_struct->fullscreen_loop_preview );
 
-	export_menu = gtk_image_menu_item_new_with_mnemonic (_("Export"));
+	export_menu = gtk_image_menu_item_new_with_mnemonic (_("Ex_port"));
 	gtk_container_add (GTK_CONTAINER (menu1), export_menu);
-	g_signal_connect (G_OBJECT (export_menu),"activate",G_CALLBACK (img_choose_exporter),img_struct);
+	gtk_widget_add_accelerator (export_menu, "activate",img_struct->accel_group,GDK_p,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
+	g_signal_connect (G_OBJECT (export_menu),"activate",G_CALLBACK (img_exporter),img_struct);
 
 	image_menu = img_load_icon ("imagination-generate.png",GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (export_menu),image_menu);
@@ -308,7 +328,7 @@
 
 	/* Slide menu */
 	menuitem2 = gtk_menu_item_new_with_mnemonic (_("_Slide"));
-	gtk_container_add (GTK_CONTAINER (menubar), menuitem2);
+	gtk_container_add (GTK_CONTAINER (img_struct->menubar), menuitem2);
 
 	slide_menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem2), slide_menu);
@@ -325,23 +345,6 @@
 	gtk_container_add (GTK_CONTAINER (slide_menu), img_struct->paste);
 	g_signal_connect (G_OBJECT (img_struct->paste), "activate", G_CALLBACK (img_slide_paste), img_struct);
 
-	separator_slide_menu = gtk_separator_menu_item_new ();
-	gtk_container_add (GTK_CONTAINER (slide_menu),separator_slide_menu);
-
-	/* Preview quality menu */
-	menuitem1 = gtk_menu_item_new_with_mnemonic( _("Preview quality") );
-	gtk_menu_shell_append( GTK_MENU_SHELL( slide_menu ), menuitem1 );
-
-	menu3 = gtk_menu_new();
-	gtk_menu_item_set_submenu( GTK_MENU_ITEM( menuitem1 ), menu3 );
-
-	menuitem2 = gtk_radio_menu_item_new_with_mnemonic( NULL, _("_Low") );
-	gtk_menu_shell_append( GTK_MENU_SHELL( menu3 ), menuitem2 );
-	g_signal_connect( G_OBJECT( menuitem2 ), "toggled",
-					  G_CALLBACK( img_quality_toggled ), img_struct );
-	menuitem3 = gtk_radio_menu_item_new_with_mnemonic_from_widget(GTK_RADIO_MENU_ITEM( menuitem2 ), _("High") );
-	gtk_menu_shell_append( GTK_MENU_SHELL( menu3 ), menuitem3 );
-
 	/* Zoom controls */
 	menuitem1 = gtk_menu_item_new_with_mnemonic( _("_Zoom") );
 	gtk_menu_shell_append( GTK_MENU_SHELL( slide_menu ), menuitem1 );
@@ -367,18 +370,25 @@
 					  G_CALLBACK( img_zoom_reset ), img_struct );
 	gtk_menu_shell_append( GTK_MENU_SHELL( menu3 ), menuitem2 );
 
-	separator_slide_menu = gtk_separator_menu_item_new ();
-	gtk_container_add (GTK_CONTAINER (slide_menu),separator_slide_menu);
-
 	add_slide = gtk_image_menu_item_new_with_mnemonic (_("Add empt_y slide"));
 	gtk_container_add (GTK_CONTAINER (slide_menu), add_slide);
 	gtk_widget_add_accelerator( add_slide, "activate", img_struct->accel_group,	GDK_y, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE );
 	g_signal_connect( G_OBJECT( add_slide ), "activate",
 					  G_CALLBACK( img_add_empty_slide ), img_struct );
 
+	img_struct->edit_empty_slide = gtk_image_menu_item_new_with_mnemonic (_("Edit _empty slide"));
+	gtk_container_add (GTK_CONTAINER (slide_menu), img_struct->edit_empty_slide);
+	gtk_widget_set_sensitive(img_struct->edit_empty_slide, FALSE);
+	gtk_widget_add_accelerator( img_struct->edit_empty_slide, "activate", img_struct->accel_group,	GDK_e, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE );
+	g_signal_connect( G_OBJECT( img_struct->edit_empty_slide ), "activate",
+					  G_CALLBACK( img_add_empty_slide ), img_struct );
+
 	image_menu = img_load_icon ("imagination-add-new-slide.png",GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_slide), image_menu);
 
+	tmp_image = gtk_image_new_from_stock (GTK_STOCK_EDIT,GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (img_struct->edit_empty_slide),tmp_image);
+	
 	img_struct->remove_menu = gtk_image_menu_item_new_with_mnemonic (_("Dele_te"));
 	gtk_container_add (GTK_CONTAINER (slide_menu), img_struct->remove_menu);
 	gtk_widget_add_accelerator (img_struct->remove_menu,"activate",img_struct->accel_group, GDK_Delete,0,GTK_ACCEL_VISIBLE);
@@ -417,22 +427,19 @@
 					  G_CALLBACK ( img_rotate_slides_right ), img_struct );
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (rotate_right_menu),tmp_image);
 
-	separator_slide_menu = gtk_separator_menu_item_new ();
-	gtk_container_add (GTK_CONTAINER (slide_menu),separator_slide_menu);
-
-	select_all_menu = gtk_image_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, img_struct->accel_group);
-	gtk_container_add (GTK_CONTAINER (slide_menu),select_all_menu);
-	gtk_widget_add_accelerator (select_all_menu,"activate",img_struct->accel_group,GDK_a,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
-	g_signal_connect (G_OBJECT (select_all_menu),"activate",G_CALLBACK (img_select_all_thumbnails),img_struct);
+	img_struct->select_all_menu = gtk_image_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, img_struct->accel_group);
+	gtk_container_add (GTK_CONTAINER (slide_menu),img_struct->select_all_menu);
+	gtk_widget_add_accelerator (img_struct->select_all_menu,"activate",img_struct->accel_group,GDK_a,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
+	g_signal_connect (G_OBJECT (img_struct->select_all_menu),"activate",G_CALLBACK (img_select_all_thumbnails),img_struct);
 
 	deselect_all_menu = gtk_image_menu_item_new_with_mnemonic (_("Un_select all"));
 	gtk_container_add (GTK_CONTAINER (slide_menu),deselect_all_menu);
-	gtk_widget_add_accelerator (deselect_all_menu,"activate",img_struct->accel_group,GDK_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
+	gtk_widget_add_accelerator (deselect_all_menu,"activate",img_struct->accel_group,GDK_a,GDK_CONTROL_MASK | GDK_SHIFT_MASK,GTK_ACCEL_VISIBLE);
 	g_signal_connect (G_OBJECT (deselect_all_menu),"activate",G_CALLBACK (img_unselect_all_thumbnails),img_struct);
 
 	/* View menu */
 	menuitem1 = gtk_menu_item_new_with_mnemonic (_("_View"));
-	gtk_container_add (GTK_CONTAINER (menubar), menuitem1);
+	gtk_container_add (GTK_CONTAINER (img_struct->menubar), menuitem1);
 
 	menu1 = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem1), menu1);
@@ -446,12 +453,16 @@
 							GTK_RADIO_MENU_ITEM( img_struct->menu_preview_mode ), _("Overview mode") );
 	gtk_menu_shell_append( GTK_MENU_SHELL( menu1 ), img_struct->menu_overview_mode );
 
-	menuitem1 = gtk_separator_menu_item_new();
-	gtk_menu_shell_append( GTK_MENU_SHELL( menu1 ), menuitem1 );
-
 	menuitem1 = gtk_menu_item_new_with_mnemonic( _("Preview _frame rate") );
 	gtk_menu_shell_append( GTK_MENU_SHELL( menu1 ), menuitem1 );
 
+	img_struct->fullscreen = gtk_image_menu_item_new_with_mnemonic (_("Fullscreen"));
+	gtk_container_add (GTK_CONTAINER (menu1),img_struct->fullscreen);
+	gtk_widget_add_accelerator (img_struct->fullscreen, "activate", img_struct->accel_group,GDK_F11,GDK_MODE_DISABLED,GTK_ACCEL_VISIBLE);
+	g_signal_connect (G_OBJECT (img_struct->fullscreen),"activate", G_CALLBACK (img_go_fullscreen), img_struct);
+	tmp_image = gtk_image_new_from_stock (GTK_STOCK_FULLSCREEN, GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (img_struct->fullscreen),tmp_image);
+
 	menu1 = gtk_menu_new();
 	gtk_menu_item_set_submenu( GTK_MENU_ITEM( menuitem1 ), menu1 );
 
@@ -484,7 +495,7 @@
 
 	/* Help menu */
 	menuitem3 = gtk_menu_item_new_with_mnemonic (_("_Help"));
-	gtk_container_add (GTK_CONTAINER (menubar), menuitem3);
+	gtk_container_add (GTK_CONTAINER (img_struct->menubar), menuitem3);
 	menu3 = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem3), menu3);
 
@@ -498,40 +509,40 @@
 
 	about = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, img_struct->accel_group);
 	gtk_container_add (GTK_CONTAINER (menu3), about);
-	gtk_widget_show_all (menubar);
+	gtk_widget_show_all (img_struct->menubar);
 	g_signal_connect (G_OBJECT (about),"activate",G_CALLBACK (img_show_about_dialog),img_struct);
 
 	/* Create the toolbar */
-	toolbar = gtk_toolbar_new ();
-	gtk_box_pack_start (GTK_BOX (vbox1), toolbar, FALSE, FALSE, 0);
-	gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
-	tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar));
+	img_struct->toolbar = gtk_toolbar_new ();
+	gtk_box_pack_start (GTK_BOX (vbox1), img_struct->toolbar, FALSE, FALSE, 0);
+	gtk_toolbar_set_style (GTK_TOOLBAR (img_struct->toolbar), GTK_TOOLBAR_ICONS);
+	//tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (img_struct->toolbar));
 
 	new_button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_NEW));
-	gtk_container_add (GTK_CONTAINER (toolbar),new_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),new_button);
 	gtk_widget_set_tooltip_text(new_button, _("Create a new slideshow"));
 	g_signal_connect (G_OBJECT (new_button),"clicked",G_CALLBACK (img_new_slideshow),img_struct);
 
 	img_struct->open_button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_OPEN));
-	gtk_container_add (GTK_CONTAINER (toolbar),img_struct->open_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),img_struct->open_button);
 	gtk_widget_set_tooltip_text(img_struct->open_button, _("Open a slideshow"));
 	g_signal_connect (G_OBJECT (img_struct->open_button),"clicked",G_CALLBACK (img_choose_slideshow_filename),img_struct);
 
 	img_struct->save_button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_SAVE));
-	gtk_container_add (GTK_CONTAINER (toolbar), img_struct->save_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar), img_struct->save_button);
 	gtk_widget_set_tooltip_text(img_struct->save_button, _("Save the slideshow"));
 	g_signal_connect (G_OBJECT (img_struct->save_button),"clicked",G_CALLBACK (img_choose_slideshow_filename),img_struct);
 
 	separatortoolitem = GTK_WIDGET (gtk_separator_tool_item_new());
 	gtk_widget_show (separatortoolitem);
-	gtk_container_add (GTK_CONTAINER (toolbar),separatortoolitem);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),separatortoolitem);
 
 	pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 20, 0, NULL);
 	tmp_image = gtk_image_new_from_pixbuf(pixbuf);
 	g_object_unref(pixbuf);
 
 	import_button = GTK_WIDGET (gtk_tool_button_new (tmp_image,""));
-	gtk_container_add (GTK_CONTAINER (toolbar),import_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),import_button);
 	gtk_widget_set_tooltip_text(import_button, _("Import pictures"));
 	g_signal_connect ((gpointer)import_button, "clicked", G_CALLBACK (img_add_slides_thumbnails),img_struct);
 
@@ -540,12 +551,12 @@
 	g_object_unref(pixbuf);
 
 	import_audio_button = GTK_WIDGET (gtk_tool_button_new (tmp_image,""));
-	gtk_container_add (GTK_CONTAINER (toolbar),import_audio_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),import_audio_button);
 	gtk_widget_set_tooltip_text(import_audio_button, _("Import music"));
 	g_signal_connect(G_OBJECT(import_audio_button), "clicked", G_CALLBACK(img_select_audio_files_to_add), img_struct);
 
 	remove_button = GTK_WIDGET (gtk_tool_button_new_from_stock ("gtk-delete"));
-	gtk_container_add (GTK_CONTAINER (toolbar),remove_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),remove_button);
 	gtk_widget_set_tooltip_text(remove_button, _("Delete the selected slides"));
 	g_signal_connect (G_OBJECT (remove_button),"clicked",G_CALLBACK (img_delete_selected_slides),img_struct);
 
@@ -554,7 +565,7 @@
 	g_object_unref(pixbuf);
 
 	rotate_left_button = GTK_WIDGET (gtk_tool_button_new(tmp_image,""));
-	gtk_container_add (GTK_CONTAINER (toolbar), rotate_left_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar), rotate_left_button);
 	gtk_widget_set_tooltip_text( rotate_left_button,
 								 _("Rotate the slide 90 degrees to the left") );
 	g_signal_connect( G_OBJECT( rotate_left_button ), "clicked",
@@ -565,57 +576,57 @@
 	g_object_unref(pixbuf);
 
 	rotate_right_button = GTK_WIDGET (gtk_tool_button_new(tmp_image,""));
-	gtk_container_add (GTK_CONTAINER (toolbar),rotate_right_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),rotate_right_button);
 	gtk_widget_set_tooltip_text( rotate_right_button,
 								 _("Rotate the slide 90 degrees to the right") );
 	g_signal_connect( G_OBJECT( rotate_right_button ), "clicked",
 					  G_CALLBACK( img_rotate_slides_right ), img_struct );
 
 	zoom_in_button = GTK_WIDGET (gtk_tool_button_new_from_stock ("gtk-zoom-in"));
-	gtk_container_add (GTK_CONTAINER (toolbar),zoom_in_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),zoom_in_button);
 	gtk_widget_set_tooltip_text(zoom_in_button, _("Zoom In"));
 	g_signal_connect (G_OBJECT (zoom_in_button),"clicked",G_CALLBACK (img_zoom_in),img_struct);
 
 	zoom_out_button = GTK_WIDGET (gtk_tool_button_new_from_stock ("gtk-zoom-out"));
-	gtk_container_add (GTK_CONTAINER (toolbar),zoom_out_button);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),zoom_out_button);
 	gtk_widget_set_tooltip_text(zoom_out_button, _("Zoom Out"));
 	g_signal_connect (G_OBJECT (zoom_out_button),"clicked",G_CALLBACK (img_zoom_out),img_struct);
 
 	zoom_normal = GTK_WIDGET (gtk_tool_button_new_from_stock ("gtk-zoom-100"));
-	gtk_container_add (GTK_CONTAINER (toolbar),zoom_normal);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),zoom_normal);
 	gtk_widget_set_tooltip_text(zoom_normal, _("Normal Size"));
 	g_signal_connect (G_OBJECT (zoom_normal),"clicked",G_CALLBACK (img_zoom_reset),img_struct);
 
     zoom_fit = GTK_WIDGET (gtk_tool_button_new_from_stock ("gtk-zoom-fit"));
-    gtk_container_add (GTK_CONTAINER (toolbar),zoom_fit);
+    gtk_container_add (GTK_CONTAINER (img_struct->toolbar),zoom_fit);
     gtk_widget_set_tooltip_text(zoom_fit, _("Fit Zoom in Window"));
     g_signal_connect (G_OBJECT (zoom_fit),"clicked",G_CALLBACK (img_zoom_fit),img_struct);
 
 	separatortoolitem = GTK_WIDGET (gtk_separator_tool_item_new());
-	gtk_container_add (GTK_CONTAINER (toolbar),separatortoolitem);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),separatortoolitem);
 
 	img_struct->preview_button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_PLAY));
-	gtk_container_add (GTK_CONTAINER (toolbar),img_struct->preview_button);
-	gtk_widget_set_tooltip_text(img_struct->preview_button, _("Starts the preview"));
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),img_struct->preview_button);
+	gtk_widget_set_tooltip_text(img_struct->preview_button, _("Starts the preview without music"));
 	g_signal_connect (G_OBJECT (img_struct->preview_button),"clicked",G_CALLBACK (img_start_stop_preview),img_struct);
 
 	separatortoolitem = GTK_WIDGET (gtk_separator_tool_item_new());
-	gtk_container_add (GTK_CONTAINER (toolbar),separatortoolitem);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),separatortoolitem);
 
 	first_slide = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_GOTO_FIRST));
-	gtk_container_add (GTK_CONTAINER (toolbar),first_slide);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),first_slide);
 	gtk_widget_set_tooltip_text( first_slide,
 								 _("Go to the first slide of the slideshow") );
 	g_signal_connect (G_OBJECT (first_slide),"clicked",G_CALLBACK (img_goto_first_slide),img_struct);
 
 	prev_slide = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK));
-	gtk_container_add (GTK_CONTAINER (toolbar),prev_slide);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),prev_slide);
 	gtk_widget_set_tooltip_text( prev_slide,
 								 _("Go to the previous slide of the slideshow") );
 	g_signal_connect (G_OBJECT (prev_slide),"clicked",G_CALLBACK (img_goto_prev_slide),img_struct);
 
 	toolbutton_slide_goto = GTK_WIDGET(gtk_tool_item_new ());
-	gtk_container_add (GTK_CONTAINER (toolbar), toolbutton_slide_goto);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar), toolbutton_slide_goto);
  
 	img_struct->slide_number_entry = gtk_entry_new();
 	gtk_entry_set_max_length(GTK_ENTRY (img_struct->slide_number_entry), 4);
@@ -625,30 +636,30 @@
 	g_signal_connect(G_OBJECT (img_struct->slide_number_entry), "insert-text", G_CALLBACK (img_check_numeric_entry), NULL );
 
 	toolbutton_slide_goto = GTK_WIDGET(gtk_tool_item_new ());
-	gtk_container_add (GTK_CONTAINER (toolbar), toolbutton_slide_goto);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar), toolbutton_slide_goto);
 
 	label_of = gtk_label_new(_(" of "));
 	gtk_container_add (GTK_CONTAINER (toolbutton_slide_goto),label_of);
 
 	toolbutton_slide_goto = GTK_WIDGET(gtk_tool_item_new ());
-	gtk_container_add (GTK_CONTAINER (toolbar), toolbutton_slide_goto);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar), toolbutton_slide_goto);
 
 	img_struct->total_slide_number_label = gtk_label_new(NULL);
 	gtk_container_add (GTK_CONTAINER (toolbutton_slide_goto),img_struct->total_slide_number_label);
 
 	next_slide = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD));
-	gtk_container_add (GTK_CONTAINER (toolbar),next_slide);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),next_slide);
 	gtk_widget_set_tooltip_text( next_slide,
 								 _("Go to the next slide of the slideshow") );
 	g_signal_connect (G_OBJECT (next_slide),"clicked",G_CALLBACK (img_goto_next_slide),img_struct);
 
 	last_slide = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_GOTO_LAST));
-	gtk_container_add (GTK_CONTAINER (toolbar),last_slide);
+	gtk_container_add (GTK_CONTAINER (img_struct->toolbar),last_slide);
 	gtk_widget_set_tooltip_text( last_slide,
 								 _("Go to the last slide of the slideshow") );
 	g_signal_connect (G_OBJECT (last_slide),"clicked",G_CALLBACK (img_goto_last_slide),img_struct);
 
-	gtk_widget_show_all (toolbar);
+	gtk_widget_show_all (img_struct->toolbar);
 
 	/* Create the image area and the other widgets */
 	img_struct->paned = gtk_hpaned_new();
@@ -666,28 +677,26 @@
 	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
 	gtk_container_add( GTK_CONTAINER( swindow ), viewport );
 
-	align = gtk_alignment_new(0.5, 0.5, 0, 0);
-	gtk_container_add( GTK_CONTAINER( viewport ), align );
+	img_struct->viewport_align = gtk_alignment_new(0.5, 0.5, 0, 0);
+	gtk_container_add( GTK_CONTAINER( viewport ), img_struct->viewport_align );
 
-	image_area_frame = gtk_frame_new(NULL);
-	gtk_frame_set_shadow_type(GTK_FRAME(image_area_frame), GTK_SHADOW_IN);
-	gtk_container_add(GTK_CONTAINER(align), image_area_frame);
+	
 
 	align = gtk_event_box_new();
-	gtk_container_add(GTK_CONTAINER(image_area_frame), align);
+	gtk_container_add(GTK_CONTAINER(img_struct->viewport_align), align);
 
 	img_struct->image_area = gtk_drawing_area_new();
-	gtk_widget_set_size_request( img_struct->image_area,
-								 img_struct->video_size0,
-								 img_struct->video_size1 );
 	gtk_container_add(GTK_CONTAINER(align), img_struct->image_area);
 	gtk_widget_add_events( img_struct->image_area, GDK_BUTTON1_MOTION_MASK
 												 | GDK_POINTER_MOTION_HINT_MASK
-												 | GDK_BUTTON_PRESS_MASK );
+												 | GDK_BUTTON_PRESS_MASK
+												 | GDK_BUTTON_RELEASE_MASK );
 	g_signal_connect( G_OBJECT( img_struct->image_area ), "expose-event",
 					  G_CALLBACK( img_on_expose_event ), img_struct );
 	g_signal_connect( G_OBJECT( img_struct->image_area ), "button-press-event",
 					  G_CALLBACK( img_image_area_button_press ), img_struct );
+	g_signal_connect( G_OBJECT( img_struct->image_area ), "button-release-event",
+					  G_CALLBACK( img_image_area_button_release ), img_struct );
 	g_signal_connect( G_OBJECT( img_struct->image_area ), "motion-notify-event",
 					  G_CALLBACK( img_image_area_motion ), img_struct );
 
@@ -697,13 +706,13 @@
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollable_window), vbox_frames);
 	
 	video_tab = gtk_label_new (_("Video"));
-	notebook = gtk_notebook_new();
-	gtk_paned_add2( GTK_PANED( img_struct->paned ), notebook );
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrollable_window, video_tab);
+	img_struct->notebook = gtk_notebook_new();
+	gtk_paned_add2( GTK_PANED( img_struct->paned ), img_struct->notebook );
+	gtk_notebook_append_page(GTK_NOTEBOOK(img_struct->notebook), scrollable_window, video_tab);
 
 	viewport = gtk_bin_get_child(GTK_BIN(scrollable_window));
 	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
-	gtk_container_set_border_width( GTK_CONTAINER( viewport ), 10 );
+	gtk_container_set_border_width( GTK_CONTAINER( viewport ), 5 );
 
 	/* Slide frame */
 	frame1 = gtk_frame_new (NULL);
@@ -777,7 +786,8 @@
 	gtk_table_attach (GTK_TABLE (table), duration_label, 0, 1, 2, 3,(GtkAttachOptions) (GTK_FILL),(GtkAttachOptions) (0), 0, 0);
 	gtk_misc_set_alignment (GTK_MISC (duration_label), 0, 0.5);
 
-	img_struct->duration = gtk_spin_button_new_with_range (1, 300, 1);
+	GtkAdjustment *adj = (GtkAdjustment *) gtk_adjustment_new (0.10, 0.01, 9999.0, 0.01, 1.0, 0.0);
+	img_struct->duration = gtk_spin_button_new (adj, 1.0, 2);
 	gtk_table_attach (GTK_TABLE (table), img_struct->duration, 1, 2, 2, 3,(GtkAttachOptions) (GTK_FILL),(GtkAttachOptions) (0), 0, 0);
 	gtk_widget_set_sensitive(img_struct->duration, FALSE);
 	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON (img_struct->duration),TRUE);
@@ -846,14 +856,35 @@
 	image_buttons = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);
 	gtk_button_set_image(GTK_BUTTON(img_struct->ken_right), image_buttons);
 
+	img_struct->ken_add = gtk_button_new();
+	g_signal_connect( G_OBJECT( img_struct->ken_add ), "clicked",
+					  G_CALLBACK( img_add_stop_point ), img_struct );
+	gtk_box_pack_start (GTK_BOX (hbox_stop_points), img_struct->ken_add, FALSE, FALSE, 5);
+	image_buttons = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image(GTK_BUTTON(img_struct->ken_add), image_buttons);
+	gtk_widget_set_tooltip_text(img_struct->ken_add,_("Add Stop point"));
+
 	hbox_time_offset = gtk_hbox_new(FALSE,0);
 	gtk_box_pack_start (GTK_BOX (vbox_slide_motion), hbox_time_offset, FALSE, FALSE, 0);
 	time_offset_label = gtk_label_new(_("Duration:"));
 	gtk_box_pack_start (GTK_BOX (hbox_time_offset), time_offset_label, TRUE, TRUE, 0);
 	gtk_misc_set_alignment(GTK_MISC(time_offset_label),0.0, 0.5);
 	img_struct->ken_duration = gtk_spin_button_new_with_range (1, 60, 1);
+	gtk_widget_set_size_request(img_struct->ken_duration, 50, -1);
+	gtk_entry_set_max_length(GTK_ENTRY(img_struct->ken_duration), 2);
 	gtk_box_pack_start (GTK_BOX (hbox_time_offset), img_struct->ken_duration, FALSE, FALSE, 0);
 	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON (img_struct->ken_duration),TRUE);
+	g_signal_connect( G_OBJECT( img_struct->ken_duration ), "value-changed",
+					  G_CALLBACK( img_update_stop_point ), img_struct );
+	
+	img_struct->ken_remove = gtk_button_new();
+	g_signal_connect( G_OBJECT( img_struct->ken_remove ), "clicked",
+					  G_CALLBACK( img_delete_stop_point ), img_struct );
+	gtk_box_pack_start (GTK_BOX (hbox_time_offset), img_struct->ken_remove, FALSE, FALSE, 5);
+	image_buttons = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image(GTK_BUTTON(img_struct->ken_remove), image_buttons);
+	gtk_widget_set_tooltip_text(img_struct->ken_remove,_("Remove Stop point"));
+
 	GtkWidget *hbox_zoom = gtk_hbox_new(FALSE,0);
 	gtk_box_pack_start (GTK_BOX (vbox_slide_motion), hbox_zoom, FALSE, FALSE, 0);
 
@@ -867,24 +898,6 @@
 	g_signal_connect( G_OBJECT( img_struct->ken_zoom ), "value-changed",
 					  G_CALLBACK( img_ken_burns_zoom_changed ), img_struct );
 	
-	hbox_buttons = gtk_hbutton_box_new();
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox_buttons), GTK_BUTTONBOX_SPREAD);
-	gtk_box_pack_start (GTK_BOX (vbox_slide_motion), hbox_buttons, FALSE, FALSE, 0);
-
-	img_struct->ken_add = gtk_button_new_with_label(_("Add"));
-	g_signal_connect( G_OBJECT( img_struct->ken_add ), "clicked",
-					  G_CALLBACK( img_add_stop_point ), img_struct );
-	gtk_box_pack_start (GTK_BOX (hbox_buttons), img_struct->ken_add, FALSE, FALSE, 0);
-	img_struct->ken_update = gtk_button_new_with_label( _("Update") );
-	g_signal_connect( G_OBJECT( img_struct->ken_update ), "clicked",
-					  G_CALLBACK( img_update_stop_point ), img_struct );
-	gtk_box_pack_start( GTK_BOX( hbox_buttons ), img_struct->ken_update,
-						FALSE, FALSE, 0 );
-	img_struct->ken_remove = gtk_button_new_with_label(_("Remove"));
-	g_signal_connect( G_OBJECT( img_struct->ken_remove ), "clicked",
-					  G_CALLBACK( img_delete_stop_point ), img_struct );
-	gtk_box_pack_start (GTK_BOX (hbox_buttons), img_struct->ken_remove, FALSE, FALSE, 0);
-
 	/* Slide text frame */
 	frame4 = gtk_frame_new (NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_frames), frame4, FALSE, FALSE, 0);
@@ -917,22 +930,10 @@
 	g_signal_connect( G_OBJECT( img_struct->sub_textview ), "focus-out-event",
 					  G_CALLBACK( img_sub_textview_focus_out ), img_struct );
 	img_struct->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
-	gtk_widget_set_size_request(img_struct->scrolled_win, -1, 18);
 	g_object_set (G_OBJECT (img_struct->scrolled_win),"hscrollbar-policy",GTK_POLICY_AUTOMATIC,"vscrollbar-policy",GTK_POLICY_AUTOMATIC,"shadow-type",GTK_SHADOW_IN,NULL);
 	gtk_container_add(GTK_CONTAINER (img_struct->scrolled_win), img_struct->sub_textview);
 	gtk_box_pack_start (GTK_BOX (hbox_textview), img_struct->scrolled_win, TRUE, TRUE, 0);
 
-	img_struct->expand_button = gtk_button_new();
-	gtk_widget_set_tooltip_text(img_struct->expand_button, _("Click to expand the area"));
-	gtk_button_set_relief(GTK_BUTTON(img_struct->expand_button), GTK_RELIEF_NONE);
-	gtk_widget_set_size_request(img_struct->expand_button, 22, 20);
-	g_signal_connect (G_OBJECT (img_struct->expand_button),"clicked",G_CALLBACK (img_expand_button_clicked),img_struct);
-
-	image_buttons = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
-	gtk_widget_set_size_request(image_buttons, 14, 14);
-	gtk_button_set_image(GTK_BUTTON(img_struct->expand_button),image_buttons);
-	gtk_box_pack_start (GTK_BOX (hbox_textview), img_struct->expand_button, FALSE, FALSE, 0);
-
 	text_animation_hbox = gtk_hbox_new( FALSE, 6 );
 	gtk_box_pack_start( GTK_BOX( vbox_slide_caption ), text_animation_hbox, FALSE, FALSE, 0 );
 
@@ -949,12 +950,73 @@
 	gtk_box_pack_start( GTK_BOX( text_animation_hbox ), img_struct->sub_color, FALSE, FALSE, 0 );
     gtk_widget_set_tooltip_text(img_struct->sub_color, _("Click to choose the font color"));
 
-    img_struct->sub_bgcolor = gtk_color_button_new();
-    gtk_color_button_set_use_alpha( GTK_COLOR_BUTTON( img_struct->sub_bgcolor ), TRUE );
+    img_struct->sub_brdr_color = gtk_color_button_new();
+    gtk_color_button_set_use_alpha( GTK_COLOR_BUTTON( img_struct->sub_brdr_color ), TRUE );
+    g_signal_connect( G_OBJECT( img_struct->sub_brdr_color ), "color-set",
+                      G_CALLBACK( img_font_brdr_color_changed ), img_struct );
+    gtk_box_pack_start( GTK_BOX( text_animation_hbox ), img_struct->sub_brdr_color, FALSE, FALSE, 0 );
+    gtk_widget_set_tooltip_text(img_struct->sub_brdr_color, _("Click to choose the font border color. If the opacity value is set to 0, Imagination will not render any border."));
+
+	img_struct->sub_bgcolor = gtk_color_button_new();
+	gtk_color_button_set_use_alpha( GTK_COLOR_BUTTON( img_struct->sub_bgcolor ), TRUE );
+	gtk_color_button_set_alpha(GTK_COLOR_BUTTON( img_struct->sub_bgcolor ), 0);
     g_signal_connect( G_OBJECT( img_struct->sub_bgcolor ), "color-set",
-                      G_CALLBACK( img_font_bgcolor_changed ), img_struct );
+                      G_CALLBACK( img_font_bg_color_changed ), img_struct );
     gtk_box_pack_start( GTK_BOX( text_animation_hbox ), img_struct->sub_bgcolor, FALSE, FALSE, 0 );
-    gtk_widget_set_tooltip_text(img_struct->sub_bgcolor, _("Click to choose the font background color"));
+	gtk_widget_set_tooltip_text(img_struct->sub_bgcolor, _("Click to choose the font background color. If the opacity value is set to 0, Imagination will not render any background."));
+
+	gtk_widget_set_size_request(img_struct->sub_color, 35, -1);
+	gtk_widget_set_size_request(img_struct->sub_brdr_color, 35, -1);
+	gtk_widget_set_size_request(img_struct->sub_bgcolor, 35, -1);
+	
+	a_hbox = gtk_hbox_new(FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (vbox_slide_caption), a_hbox, FALSE, FALSE, 0);
+	a_label = gtk_label_new(_("Text pattern:"));
+	gtk_misc_set_alignment(GTK_MISC(a_label), 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (a_hbox), a_label, TRUE, TRUE, 0);
+
+	pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 20, 0, NULL);
+	tmp_image = gtk_image_new_from_pixbuf(pixbuf);
+	g_object_unref(pixbuf);
+
+	img_struct->pattern_image = GTK_WIDGET (gtk_tool_button_new (tmp_image,""));
+	gtk_box_pack_start (GTK_BOX (a_hbox), img_struct->pattern_image, FALSE, FALSE, 0);
+	gtk_widget_set_tooltip_text(img_struct->pattern_image, _("Click to choose the text pattern") );
+	g_signal_connect (	G_OBJECT (img_struct->pattern_image), "clicked", G_CALLBACK (img_pattern_clicked), img_struct);
+	gtk_widget_set_size_request(img_struct->pattern_image, 32, 32);
+
+	a_hbox = gtk_hbox_new(FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (vbox_slide_caption), a_hbox, FALSE, FALSE, 0);
+	
+	img_struct->border_top = gtk_check_button_new_with_mnemonic(_("Top Border"));
+	gtk_box_pack_start( GTK_BOX( a_hbox ), img_struct->border_top, TRUE, TRUE, 0 );
+	g_signal_connect (img_struct->border_top, "toggled", G_CALLBACK (img_subtitle_top_border_toggled), img_struct);
+
+	img_struct->border_bottom = gtk_check_button_new_with_mnemonic(_("Bottom Border"));
+	gtk_box_pack_start( GTK_BOX( a_hbox ), img_struct->border_bottom, TRUE, TRUE, 0 );
+	g_signal_connect (img_struct->border_bottom, "toggled", G_CALLBACK (img_subtitle_bottom_border_toggled), img_struct);
+
+	a_hbox = gtk_hbox_new(FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (vbox_slide_caption), a_hbox, FALSE, FALSE, 0);
+
+	a_label = gtk_label_new( _("Border Width:") );
+	gtk_misc_set_alignment( GTK_MISC( a_label ), 0, 0.5 );
+	gtk_box_pack_start( GTK_BOX( a_hbox ), a_label, TRUE, TRUE, 0 );
+
+	img_struct->sub_border_width = gtk_spin_button_new_with_range (1, 10, 1);
+	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON (img_struct->sub_border_width),TRUE);
+	gtk_box_pack_start( GTK_BOX( a_hbox ), img_struct->sub_border_width, FALSE, FALSE, 0 );
+	gtk_widget_set_size_request(img_struct->sub_border_width, 50, -1);
+	gtk_entry_set_max_length(GTK_ENTRY(img_struct->sub_border_width), 2);
+	g_signal_connect( G_OBJECT( img_struct->sub_border_width ), "value-changed", G_CALLBACK( img_sub_border_width_changed ), img_struct );
+
+	img_struct->sub_border_color = gtk_color_button_new();
+	gtk_color_button_set_use_alpha( GTK_COLOR_BUTTON( img_struct->sub_border_color ), TRUE );
+	gtk_color_button_set_alpha(GTK_COLOR_BUTTON( img_struct->sub_border_color ), 65535);
+	g_signal_connect( G_OBJECT( img_struct->sub_border_color ), "color-set", G_CALLBACK( img_sub_border_color_changed ), img_struct );
+    gtk_box_pack_start( GTK_BOX( a_hbox ), img_struct->sub_border_color, FALSE, FALSE, 0 );
+	gtk_widget_set_tooltip_text(img_struct->sub_border_color, _("Click to choose the slide text borders color"));
+	gtk_widget_set_size_request(img_struct->sub_border_color, 35, -1);
 
 	a_hbox = gtk_hbox_new(FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox_slide_caption), a_hbox, FALSE, FALSE, 0);
@@ -978,84 +1040,95 @@
 	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON (img_struct->sub_anim_duration),TRUE);
 	gtk_box_pack_start( GTK_BOX( a_hbox ), img_struct->sub_anim_duration,
 						FALSE, FALSE, 0 );
-
+	gtk_widget_set_size_request(img_struct->sub_anim_duration, 50, -1);
+	gtk_entry_set_max_length(GTK_ENTRY(img_struct->sub_anim_duration), 2);
+	
 	gtk_widget_set_sensitive( img_struct->sub_anim_duration, FALSE );
 	g_signal_connect( G_OBJECT( img_struct->sub_anim_duration ), "value-changed",
 					  G_CALLBACK( img_combo_box_anim_speed_changed ), img_struct );
 
-	a_hbox = gtk_hbox_new(FALSE, 6);
-	gtk_box_pack_start( GTK_BOX( vbox_slide_caption ), a_hbox, FALSE, FALSE, 0 );
+	frame4 = gtk_frame_new (NULL);
+	gtk_box_pack_start (GTK_BOX (vbox_frames), frame4, FALSE, FALSE, 0);
+	gtk_frame_set_shadow_type (GTK_FRAME (frame4), GTK_SHADOW_OUT);
 
-	a_label = gtk_label_new( _("Placing is relative to:") );
-	gtk_misc_set_alignment( GTK_MISC( a_label ), 0, 0.5 );
-	gtk_box_pack_start( GTK_BOX( a_hbox ), a_label, TRUE, TRUE, 0 );
+	frame4_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
+	gtk_container_add (GTK_CONTAINER (frame4), frame4_alignment);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (frame4_alignment), 5, 5, 5, 5);
 
-	img_struct->sub_placing = _gtk_combo_box_new_text( FALSE );
-	gtk_box_pack_start( GTK_BOX( a_hbox ), img_struct->sub_placing,
-						FALSE, FALSE, 0 );
-	{
-		GtkTreeIter   iter;
-		GtkListStore *store =
-				GTK_LIST_STORE( gtk_combo_box_get_model(
-						GTK_COMBO_BOX( img_struct->sub_placing ) ) );
+	vbox_slide_position = gtk_vbox_new (FALSE, 2);
+	gtk_container_add (GTK_CONTAINER (frame4_alignment), vbox_slide_position);
 
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, _("Exported video"), -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, _("Original image"), -1 );
-	}
-	gtk_combo_box_set_active( GTK_COMBO_BOX( img_struct->sub_placing ), 1 );
-	g_signal_connect( G_OBJECT( img_struct->sub_placing ), "changed",
-					  G_CALLBACK( img_placing_changed ), img_struct );
-					 
-	a_hbox = gtk_hbox_new(FALSE, 6);
-	gtk_box_pack_start( GTK_BOX( vbox_slide_caption ), a_hbox, FALSE, FALSE, 0 );
+	frame_label = gtk_label_new (_("<b>Slide Text Position</b>"));
+	gtk_frame_set_label_widget (GTK_FRAME (frame4), frame_label);
+	gtk_label_set_use_markup (GTK_LABEL (frame_label), TRUE);
+	gtk_misc_set_padding (GTK_MISC (frame_label), 2, 2);
 
-	a_label = gtk_label_new( _("Subtitle position:") );
-	gtk_misc_set_alignment( GTK_MISC( a_label ), 0, 0.5 );
-	gtk_box_pack_start( GTK_BOX( a_hbox ), a_label, TRUE, TRUE, 0 );
+	table = gtk_table_new (3, 3, FALSE);
+	gtk_box_pack_start (GTK_BOX (vbox_slide_position), table, TRUE, TRUE, 0);
+	gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+	gtk_table_set_col_spacings (GTK_TABLE (table), 4);
 
-	img_struct->sub_pos = img_table_button_new();
-	gtk_box_pack_start( GTK_BOX( a_hbox ), img_struct->sub_pos,
-						FALSE, FALSE, 0 );
-	{
-		/* Load position icons */
-		GdkPixbuf *pixs9;
-		gint       i;
-		gchar     *path;
+	label = gtk_label_new(_("Horizontal Position: "));
+	gtk_misc_set_alignment(GTK_MISC(label),0.0, 0.5);
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 
-		/* First code snippet is in use for development version,
-		 * while second is intendeded for releases */
-#if PLUGINS_INSTALLED
-		path = g_strconcat( DATADIR, "/imagination/pixmaps/imagination-pos", NULL );
-#else
-		path = g_strconcat( "pixmaps/imagination-pos", NULL );
-#endif
-		for( i = 0; i < 9; i++ )
-		{
-			gchar *file;
+	img_struct->sub_posX_adj = (GtkAdjustment *) gtk_adjustment_new( 1.0, 1, (gdouble)img_struct->video_size0, 1.0, 1.0, 0.0 );
+	img_struct->sub_posX = gtk_hscale_new(img_struct->sub_posX_adj);
+	gtk_table_attach (GTK_TABLE (table), img_struct->sub_posX, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+	gtk_scale_set_draw_value( GTK_SCALE(img_struct->sub_posX), FALSE);
+	g_signal_connect( G_OBJECT( img_struct->sub_posX ), "value-changed",
+					  G_CALLBACK( img_text_pos_changed ), img_struct );
 
-			file = g_strdup_printf( "%s-%d.png", path, i );
-			pixsi = gdk_pixbuf_new_from_file( file, NULL );
-			g_free( file );
-		}
-		g_free( path );
+	img_struct->x_justify = gtk_button_new();
+	g_signal_connect( G_OBJECT( img_struct->x_justify ), "clicked",
+					  G_CALLBACK( img_align_text_horizontally_vertically ), img_struct );
+	gtk_table_attach (GTK_TABLE (table), img_struct->x_justify, 2, 3, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+	image_buttons = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_CENTER, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image(GTK_BUTTON(img_struct->x_justify), image_buttons);
+	gtk_widget_set_tooltip_text(img_struct->x_justify,_("Center the text horizontally"));
 
-		img_table_button_set_pixbufs( IMG_TABLE_BUTTON( img_struct->sub_pos ),
-									  9, pixs );
+	label = gtk_label_new(_("Vertical Position: "));
+	gtk_misc_set_alignment(GTK_MISC(label),0.0, 0.5);
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
 
-		for( i = 0; i < 9; i++ )
-			g_object_unref( G_OBJECT( pixsi ) );
-	}
-	img_table_button_set_active_item( IMG_TABLE_BUTTON( img_struct->sub_pos ), 4 );
-	g_signal_connect( G_OBJECT( img_struct->sub_pos ), "active-item-changed",
+	img_struct->sub_posY_adj = (GtkAdjustment *) gtk_adjustment_new( 1.0, 1, (gdouble)img_struct->video_size1, 1.0, 1.0, 0.0 );
+	img_struct->sub_posY = gtk_hscale_new(img_struct->sub_posY_adj);
+	gtk_table_attach (GTK_TABLE (table), img_struct->sub_posY, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+	gtk_scale_set_draw_value( GTK_SCALE(img_struct->sub_posY), FALSE);
+	g_signal_connect( G_OBJECT( img_struct->sub_posY ), "value-changed",
 					  G_CALLBACK( img_text_pos_changed ), img_struct );
 
+	img_struct->y_justify = gtk_button_new();
+	g_signal_connect( G_OBJECT( img_struct->y_justify ), "clicked",
+					  G_CALLBACK( img_align_text_horizontally_vertically ), img_struct );
+	gtk_table_attach (GTK_TABLE (table), img_struct->y_justify, 2, 3, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+	image_buttons = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_CENTER, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image(GTK_BUTTON(img_struct->y_justify), image_buttons);
+	gtk_widget_set_tooltip_text(img_struct->y_justify,_("Center the text vertically"));
+
+	label = gtk_label_new(_("Angle: "));
+	gtk_misc_set_alignment(GTK_MISC(label),0.0, 0.5);
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+
+	img_struct->sub_angle = gtk_hscale_new_with_range(-90, 90, 1);
+	gtk_table_attach (GTK_TABLE (table), img_struct->sub_angle, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+	gtk_scale_set_draw_value( GTK_SCALE(img_struct->sub_angle), FALSE);
+	g_signal_connect( G_OBJECT( img_struct->sub_angle ), "value-changed",
+					  G_CALLBACK( img_text_pos_changed ), img_struct );
+
+	img_struct->reset_angle = gtk_button_new();
+	g_signal_connect( G_OBJECT( img_struct->reset_angle ), "clicked",
+					  G_CALLBACK( img_align_text_horizontally_vertically ), img_struct );
+	gtk_table_attach (GTK_TABLE (table), img_struct->reset_angle, 2, 3, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+	image_buttons = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image(GTK_BUTTON(img_struct->reset_angle), image_buttons);
+	gtk_widget_set_tooltip_text(img_struct->reset_angle,_("Reset the angle"));
+
 	/* Background music frame */
 	audio_tab = gtk_label_new (_("Audio"));
 	vbox_audio_frames = gtk_vbox_new(FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox_audio_frames), 10);
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox_audio_frames, audio_tab);
+	gtk_notebook_append_page(GTK_NOTEBOOK(img_struct->notebook), vbox_audio_frames, audio_tab);
 
 	frame3 = gtk_frame_new (NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_audio_frames), frame3, TRUE, TRUE, 0);
@@ -1084,7 +1157,7 @@
 	g_signal_connect (G_OBJECT (img_struct->music_file_liststore), "row-inserted",	G_CALLBACK (img_activate_remove_button_music_liststore) , img_struct);
 
 	img_struct->music_file_treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(img_struct->music_file_liststore));
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(img_struct->music_file_treeview));
+	//selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(img_struct->music_file_treeview));
 
 	gtk_drag_dest_set (GTK_WIDGET(img_struct->music_file_treeview),GTK_DEST_DEFAULT_ALL,drop_targets,1,GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_ASK);
 	g_signal_connect (G_OBJECT (img_struct->music_file_treeview),"drag-data-received",G_CALLBACK (img_on_drag_audio_data_received), img_struct);
@@ -1166,7 +1239,7 @@
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(message_scroll),
                                    GTK_POLICY_AUTOMATIC,
                                    GTK_POLICY_AUTOMATIC);
-    img_struct->message_page = gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+    img_struct->message_page = gtk_notebook_append_page(GTK_NOTEBOOK(img_struct->notebook),
                              message_scroll,
                              img_struct->message_label);
 
@@ -1175,11 +1248,11 @@
     gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(message_view), GTK_WRAP_WORD);
     gtk_container_add(GTK_CONTAINER(message_scroll), message_view);
     img_struct->message_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (message_view));
-    g_signal_connect( (gpointer) notebook, "switch_page",
+    g_signal_connect( (gpointer) img_struct->notebook, "switch_page",
                       G_CALLBACK (img_notebook_switch_page), img_struct);
     /* End of Message tab */
 
-	/* Create the model */
+	/* Create the bottom slides thumbnail model */
 	img_struct->thumbnail_model = gtk_list_store_new( 4,
                                                       GDK_TYPE_PIXBUF,  /* thumbnail */
                                                       G_TYPE_POINTER,   /* slide_info */
@@ -1261,16 +1334,16 @@
 	gtk_box_pack_start( GTK_BOX( vbox1 ), eventbox, FALSE, TRUE, 0 );
 
 	/* Create the thumbnail viewer */
-	thumb_scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-	gtk_widget_set_size_request( thumb_scrolledwindow, -1, 115 );
-	g_signal_connect( G_OBJECT( thumb_scrolledwindow ), "scroll-event",
+	img_struct->thumb_scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
+	gtk_widget_set_size_request( img_struct->thumb_scrolledwindow, -1, 85 );
+	g_signal_connect( G_OBJECT( img_struct->thumb_scrolledwindow ), "scroll-event",
 					  G_CALLBACK( img_scroll_thumb ), img_struct );
-	gtk_container_add( GTK_CONTAINER( eventbox ), thumb_scrolledwindow );
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (thumb_scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (thumb_scrolledwindow), GTK_SHADOW_IN);
+	gtk_container_add( GTK_CONTAINER( eventbox ), img_struct->thumb_scrolledwindow );
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (img_struct->thumb_scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (img_struct->thumb_scrolledwindow), GTK_SHADOW_IN);
 
 	img_struct->thumbnail_iconview = gtk_icon_view_new_with_model(GTK_TREE_MODEL (img_struct->thumbnail_model));
-	gtk_container_add( GTK_CONTAINER( thumb_scrolledwindow ), img_struct->thumbnail_iconview );
+	gtk_container_add( GTK_CONTAINER( img_struct->thumb_scrolledwindow ), img_struct->thumbnail_iconview );
 
 	/* Create the cell layout */
 	pixbuf_cell = img_cell_renderer_pixbuf_new();
@@ -1309,6 +1382,8 @@
 	gtk_icon_view_set_column_spacing (GTK_ICON_VIEW (img_struct->thumbnail_iconview),0);
 	gtk_icon_view_set_row_spacing (GTK_ICON_VIEW (img_struct->thumbnail_iconview),0);
 	gtk_icon_view_set_columns (GTK_ICON_VIEW (img_struct->thumbnail_iconview), G_MAXINT);
+	gtk_icon_view_set_item_padding (GTK_ICON_VIEW (img_struct->thumbnail_iconview), 0);
+
 	g_signal_connect (G_OBJECT (img_struct->thumbnail_iconview),"selection-changed",G_CALLBACK (img_iconview_selection_changed),img_struct);
 	g_signal_connect (G_OBJECT (img_struct->thumbnail_iconview),"select-all",G_CALLBACK (img_iconview_selection_changed),img_struct);
 	g_signal_connect (G_OBJECT (img_struct->thumbnail_iconview),"button-press-event",G_CALLBACK (img_iconview_selection_button_press),img_struct);
@@ -1351,7 +1426,9 @@
 		gtk_check_menu_item_set_active(
 				GTK_CHECK_MENU_ITEM( tmp_checksindex ), TRUE );
 	}
-
+	
+	/* As many distros replaced ffmpeg with avconv let's check for it */
+	img_check_for_encoder(img_struct);
 	return img_struct;
 }
 
@@ -1546,33 +1623,20 @@
 	gtk_label_set_text(GTK_LABEL(img->music_time_data), "");
 }
 
-static void img_expand_button_clicked(GtkButton *button, img_window_struct *img)
-{
-	gint width, height;
-
-	gtk_widget_get_size_request(img->scrolled_win, &width, &height);
-	if (height == 18)
-	{
-		gtk_widget_set_size_request(img->scrolled_win, -1, 90);
-		gtk_widget_set_tooltip_text(img->expand_button, _("Click to shrink the area"));
-	}
-	else
-	{
-		gtk_widget_set_size_request(img->scrolled_win, -1, 18);
-		gtk_widget_set_tooltip_text(img->expand_button, _("Click to expand the area"));
-	}
-}
-
 static gboolean img_sub_textview_focus_in(GtkWidget *widget, GdkEventFocus *event, img_window_struct *img)
 {
-	gtk_widget_remove_accelerator (img->remove_menu, img->accel_group, GDK_Delete, 0);
+	gtk_widget_remove_accelerator (img->select_all_menu, img->accel_group, GDK_a, GDK_CONTROL_MASK);
+	gtk_widget_remove_accelerator (img->remove_menu,     img->accel_group, GDK_Delete, 0);
+	gtk_widget_remove_accelerator (img->fullscreen_music_preview,     img->accel_group, GDK_space, 0);
 	return FALSE;
 }
 
 
 static gboolean img_sub_textview_focus_out(GtkWidget *widget, GdkEventFocus *event, img_window_struct *img)
 {
-	gtk_widget_add_accelerator (img->remove_menu,"activate", img->accel_group, GDK_Delete, 0, GTK_ACCEL_VISIBLE);
+	gtk_widget_add_accelerator (img->select_all_menu,"activate", img->accel_group, GDK_a, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+	gtk_widget_add_accelerator (img->remove_menu,    "activate", img->accel_group, GDK_Delete, 0, GTK_ACCEL_VISIBLE);
+	gtk_widget_add_accelerator (img->fullscreen_music_preview,    "activate", img->accel_group, GDK_space, 0, GTK_ACCEL_VISIBLE);
 	return FALSE;
 }
 
@@ -1626,17 +1690,15 @@
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	GtkTreePath *path = NULL;
 	gint dummy, nr_selected = 0;
 	GList *selected = NULL;
 	gchar *slide_info_msg = NULL, *selected_slide_nr = NULL;
 	slide_struct *info_slide;
 
-	if (img->preview_is_running || img->export_is_running)
+	if (img->export_is_running)
 		return;
 
 	model = gtk_icon_view_get_model(iconview);
-	gtk_icon_view_get_cursor(iconview,&path,NULL);
 
 	selected = gtk_icon_view_get_selected_items(iconview);
 	nr_selected = g_list_length(selected);
@@ -1659,16 +1721,16 @@
 		if (img->slides_nr == 0)
 			gtk_label_set_text(GTK_LABEL (img->total_time_data),"");
 
+		gtk_widget_set_sensitive(img->edit_empty_slide, FALSE);
 		return;
 	}
-
 	gtk_widget_set_sensitive(img->trans_duration,	TRUE);
 	gtk_widget_set_sensitive(img->duration,			TRUE);
 	gtk_widget_set_sensitive(img->transition_type,	TRUE);
 	gtk_widget_set_sensitive(img->random_button,	TRUE);
 
-	dummy = gtk_tree_path_get_indices(selected->data)0+1;
-	selected_slide_nr = g_strdup_printf("%d",dummy);
+	img->cur_nr_of_selected_slide = gtk_tree_path_get_indices(selected->data)0+1;
+	selected_slide_nr = g_strdup_printf("%d",img->cur_nr_of_selected_slide);
 	gtk_entry_set_text(GTK_ENTRY(img->slide_number_entry),selected_slide_nr);
 	g_free(selected_slide_nr);
 
@@ -1682,7 +1744,7 @@
 	model = gtk_combo_box_get_model(GTK_COMBO_BOX(img->transition_type));
 
 	/* Block "changed" signal from model to avoid rewriting the same value back into current slide. */
-	g_signal_handlers_block_by_func((gpointer)img->transition_type, (gpointer)img_combo_box_transition_type_changed, img);
+	g_signal_handlers_block_by_func(img->transition_type, (gpointer)img_combo_box_transition_type_changed, img);
 	{
 		GtkTreeIter   iter;
 		GtkTreeModel *model;
@@ -1691,7 +1753,7 @@
 		gtk_tree_model_get_iter_from_string( model, &iter, info_slide->path );
 		gtk_combo_box_set_active_iter(GTK_COMBO_BOX(img->transition_type), &iter );
 	}
-	g_signal_handlers_unblock_by_func((gpointer)img->transition_type, (gpointer)img_combo_box_transition_type_changed, img);
+	g_signal_handlers_unblock_by_func(img->transition_type, (gpointer)img_combo_box_transition_type_changed, img);
 
 	/* Moved this piece of code below the setting the transition, since we
 	 * get false negatives in certain situations (eg.: if the previously
@@ -1723,8 +1785,12 @@
 	/* Update subtitle widgets */
 	img_update_subtitles_widgets( img );
 
-	img->project_is_modified = TRUE;
-
+	/* Enable/disable Edit empty slide menu item */
+	if (info_slide->original_filename == NULL)
+		gtk_widget_set_sensitive(img->edit_empty_slide, TRUE);
+	else
+		gtk_widget_set_sensitive(img->edit_empty_slide, FALSE);
+	
 	if (nr_selected > 1)
 	{
 		img_set_statusbar_message(img,nr_selected);
@@ -1774,21 +1840,16 @@
 								img->video_size1, NULL,
 								&img->current_image );
 		}
-		/* Respect quality settings */
-		else if( img->low_quality )
-			img_scale_image( info_slide->r_filename,
-							 (gdouble)img->video_size0 / img->video_size1,
-							 0, img->video_size1, img->distort_images,
-							 img->background_color, NULL, &img->current_image );
 		else
+			/* Respect quality settings */
 			img_scale_image( info_slide->r_filename,
-							 (gdouble)img->video_size0 / img->video_size1,
-							 0, 0, img->distort_images,
-							 img->background_color, NULL, &img->current_image );
+								(gdouble)img->video_size0 / img->video_size1,
+								0, img->video_size1, img->distort_images,
+								img->background_color, NULL, &img->current_image );
 	}
 }
 
-static void img_combo_box_transition_type_changed (GtkComboBox *combo, img_window_struct *img)
+void img_combo_box_transition_type_changed (GtkComboBox *combo, img_window_struct *img)
 {
 	GList        *selected,
 				 *bak;
@@ -1842,7 +1903,7 @@
 
 		/* If this is first slide, we need to copy transition
 		 * to the last pseudo-slide too. */
-		if( gtk_tree_path_get_indices( selected->data )0 == 0 )
+		if( gtk_tree_path_get_indices( selected->data )0 == 0 && img->bye_bye_transition)
 			img->final_transition.render = (ImgRender)address;
 
 		selected = selected->next;
@@ -1884,7 +1945,7 @@
 
 		/* If this is first slide, copy transition to last
 		 * pseudo-slide */
-		if( gtk_tree_path_get_indices( selected->data )0 == 0 )
+		if( gtk_tree_path_get_indices( selected->data )0 == 0 && img->bye_bye_transition)
 			img->final_transition.render = info_slide->render;
 
 		selected = selected->next;
@@ -1980,9 +2041,9 @@
 		gtk_tree_model_get(model, &iter,1,&info_slide,-1);
 		info_slide->speed = duration;
 
-		/* If we're modifying fisr slide, we need to modify
+		/* If we're modifying first slide, we need to modify
 		 * last pseudo-slide too. */
-		if( gtk_tree_path_get_indices( selected->data )0 == 0 )
+		if( gtk_tree_path_get_indices( selected->data )0 == 0 && img->bye_bye_transition)
 			img->final_transition.speed = duration;
 
 		selected = selected->next;
@@ -1993,37 +2054,6 @@
 	g_list_free(bak);
 }
 
-static void img_spinbutton_value_changed (GtkSpinButton *spinbutton, img_window_struct *img)
-{
-	gint duration = 0;
-	GList *selected, *bak;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
-	slide_struct *info_slide;
-
-	model = GTK_TREE_MODEL( img->thumbnail_model );
-	selected = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->active_icon));
-	if (selected == NULL)
-		return;
-
-	duration = gtk_spin_button_get_value_as_int(spinbutton);
-	
-	bak = selected;
-	while (selected)
-	{
-		gtk_tree_model_get_iter(model, &iter,selected->data);
-		gtk_tree_model_get(model, &iter,1,&info_slide,-1);
-		img_set_slide_still_info( info_slide, duration, img );
-		selected = selected->next;
-	}
-
-	g_list_foreach (bak, (GFunc)gtk_tree_path_free, NULL);
-	g_list_free(bak);
-
-	/* Sync timings */
-	img_sync_timings( img->current_slide, img );
-}
-
 static void img_select_all_thumbnails(GtkMenuItem *item, img_window_struct *img)
 {
 	gtk_icon_view_select_all(GTK_ICON_VIEW (img->active_icon));
@@ -2145,7 +2175,7 @@
 img_queue_subtitle_update( GtkTextBuffer     *buffer,
 						   img_window_struct *img )
 {
-	/* This queue enables us to avid sensless copying and redrawing when typing
+	/* This queue enables us to avoid sensless copying and redrawing when typing
 	 * relatively fast (limit is cca. 3 keypresses per second) */
 	if( img->subtitle_update_id )
 		g_source_remove( img->subtitle_update_id );
@@ -2235,7 +2265,8 @@
 	
 	string = gtk_font_button_get_font_name( button );
 
-	img_update_sub_properties( img, NULL, -1, -1, -1, -1, string, NULL, NULL );
+	img_update_sub_properties( img, NULL, -1, -1, string, NULL, NULL, NULL, NULL,
+								img->current_slide->top_border, img->current_slide->bottom_border,-1);
 
 	gtk_widget_queue_draw( img->image_area );
 }
@@ -2253,7 +2284,8 @@
 	gtk_combo_box_get_active_iter( combo, &iter );
 	gtk_tree_model_get( model, &iter, 1, &anim, 2, &anim_id, -1 );
 
-	img_update_sub_properties( img, anim, anim_id, -1, -1, -1, NULL, NULL, NULL);
+	img_update_sub_properties( img, anim, anim_id, -1, NULL, NULL, NULL, NULL, NULL, 
+								img->current_slide->top_border, img->current_slide->bottom_border,-1);
 
 	/* Speed should be disabled when None is in effect */
 	gtk_widget_set_sensitive( img->sub_anim_duration,
@@ -2277,14 +2309,37 @@
 	font_color1 = (gdouble)color.green / 0xffff;
 	font_color2 = (gdouble)color.blue  / 0xffff;
 	font_color3 = (gdouble)alpha       / 0xffff;
-
-	img_update_sub_properties( img, NULL, -1, -1, -1, -1, NULL, font_color, NULL );
+ 
+	img_update_sub_properties( img, NULL, -1, -1, NULL, font_color, NULL, NULL, NULL,
+								img->current_slide->top_border, img->current_slide->bottom_border,-1);
 
 	gtk_widget_queue_draw( img->image_area );
 }
 
 void
-img_font_bgcolor_changed( GtkColorButton    *button,
+img_font_brdr_color_changed( GtkColorButton    *button,
+                          img_window_struct *img )
+{
+    GdkColor color;
+    guint16  alpha;
+    gdouble  font_brdr_color4;
+
+    gtk_color_button_get_color( button, &color );
+    alpha = gtk_color_button_get_alpha( button  );
+
+    font_brdr_color0 = (gdouble)color.red   / 0xffff;
+    font_brdr_color1 = (gdouble)color.green / 0xffff;
+    font_brdr_color2 = (gdouble)color.blue  / 0xffff;
+    font_brdr_color3 = (gdouble)alpha       / 0xffff;
+    
+    img_update_sub_properties( img, NULL, -1, -1, NULL, NULL, font_brdr_color, NULL, NULL,
+								img->current_slide->top_border, img->current_slide->bottom_border, -1);
+
+    gtk_widget_queue_draw( img->image_area );
+}
+
+void
+img_font_bg_color_changed( GtkColorButton    *button,
                           img_window_struct *img )
 {
     GdkColor color;
@@ -2299,46 +2354,53 @@
     font_bgcolor2 = (gdouble)color.blue  / 0xffff;
     font_bgcolor3 = (gdouble)alpha       / 0xffff;
 
-    img_update_sub_properties( img, NULL, -1, -1, -1, -1, NULL, NULL, font_bgcolor);
+    img_update_sub_properties( img, NULL, -1, -1, NULL, NULL, NULL, font_bgcolor, NULL, 
+								img->current_slide->top_border, img->current_slide->bottom_border, -1);
 
     gtk_widget_queue_draw( img->image_area );
 }
 
 void
-img_combo_box_anim_speed_changed( GtkSpinButton       *spinbutton,
-								  img_window_struct *img )
+img_sub_border_color_changed( GtkColorButton    *button,
+                          img_window_struct *img )
 {
-	gint speed;
+    GdkColor color;
+    guint16  alpha;
+    gdouble  font_bgcolor4;
 
-	speed = gtk_spin_button_get_value_as_int(spinbutton);
-	img_update_sub_properties( img, NULL, -1, speed, -1, -1, NULL, NULL, NULL);
-}
+    gtk_color_button_get_color( button, &color );
+    alpha = gtk_color_button_get_alpha( button  );
 
-void
-img_text_pos_changed( ImgTableButton    *button,
-					  gint               item,
-					  img_window_struct *img )
-{
-	/* NOTE: This can be done because we know how items are packed into table
-	 * button. For safety measures and future expandability, this should be
-	 * converted into switch statement. */
-	img_update_sub_properties( img, NULL, -1, -1, item, -1, NULL, NULL, NULL);
+    font_bgcolor0 = (gdouble)color.red   / 0xffff;
+    font_bgcolor1 = (gdouble)color.green / 0xffff;
+    font_bgcolor2 = (gdouble)color.blue  / 0xffff;
+    font_bgcolor3 = (gdouble)alpha       / 0xffff;
 
-	gtk_widget_queue_draw( img->image_area );
+    img_update_sub_properties( img, NULL, -1, -1, NULL, NULL, NULL, NULL, font_bgcolor, 
+								img->current_slide->top_border, img->current_slide->bottom_border, -1);
+
+    gtk_widget_queue_draw( img->image_area );
 }
 
 void
-img_placing_changed( GtkComboBox   *combo,
-					 img_window_struct *img )
+img_combo_box_anim_speed_changed( GtkSpinButton       *spinbutton,
+								  img_window_struct *img )
 {
-	ImgRelPlacing placing;
+	gint speed;
 
-	if( gtk_combo_box_get_active(combo) == 0 )
-		placing = IMG_REL_PLACING_EXPORTED_VIDEO;
-	else
-		placing = IMG_REL_PLACING_ORIGINAL_IMAGE;
+	speed = gtk_spin_button_get_value_as_int(spinbutton);
+	img_update_sub_properties( img, NULL, -1, speed, NULL, NULL, NULL, NULL, NULL, 
+								img->current_slide->top_border, img->current_slide->bottom_border, -1);
+}
+
+void img_sub_border_width_changed( GtkSpinButton       *spinbutton,
+								  img_window_struct *img )
+{
+	gint width;
 
-	img_update_sub_properties( img, NULL, -1, -1, -1, placing, NULL, NULL, NULL);
+	width = gtk_spin_button_get_value_as_int(spinbutton);
+	img_update_sub_properties( img, NULL, -1, -1, NULL, NULL, NULL, NULL, NULL, 
+								img->current_slide->top_border, img->current_slide->bottom_border, width);
 
 	gtk_widget_queue_draw( img->image_area );
 }
@@ -2394,7 +2456,6 @@
 	gtk_widget_set_sensitive( img->ken_duration, FALSE );
 	gtk_widget_set_sensitive( img->ken_zoom,     FALSE );
 	gtk_widget_set_sensitive( img->ken_add,      FALSE );
-	gtk_widget_set_sensitive( img->ken_update,   FALSE );
 	gtk_widget_set_sensitive( img->ken_remove,   FALSE );
 
 	/* Enabler */
@@ -2406,7 +2467,6 @@
 			gtk_widget_set_sensitive( img->ken_right,    TRUE );
 
 		case 1: /* Disable navigation only */
-			gtk_widget_set_sensitive( img->ken_update,   TRUE );
 			gtk_widget_set_sensitive( img->ken_remove,   TRUE );
 
 		case 2: /* Only adding is enabled */
@@ -2452,25 +2512,42 @@
 	else
 		gtk_widget_set_sensitive( img->sub_anim_duration, FALSE );
 
-	/* All other controls are simple */
 	gtk_widget_set_sensitive( img->sub_font,    (gboolean)mode );
-	gtk_widget_set_sensitive( img->sub_color,   (gboolean)mode );
-    gtk_widget_set_sensitive( img->sub_bgcolor, (gboolean)mode );
+
+	if ( img->current_slide && img->current_slide->pattern_filename)
+	{
+		gtk_widget_set_sensitive( img->sub_color,  FALSE );
+		gtk_widget_set_tooltip_text( img->sub_color, _("Please delete the pattern to choose the color") );
+	}
+	else
+		gtk_widget_set_sensitive( img->sub_color,   (gboolean)mode );
+
+    gtk_widget_set_sensitive( img->sub_brdr_color, (gboolean)mode );
+	gtk_widget_set_sensitive( img->sub_bgcolor, (gboolean)mode );
+	gtk_widget_set_sensitive( img->sub_border_color, (gboolean)mode );
+	gtk_widget_set_sensitive( img->pattern_image, (gboolean)mode );
+	gtk_widget_set_sensitive( img->border_top, (gboolean)mode );
+	gtk_widget_set_sensitive( img->border_bottom, (gboolean)mode );
+	gtk_widget_set_sensitive( img->sub_border_width, (gboolean)mode );
 	gtk_widget_set_sensitive( img->sub_anim,    (gboolean)mode );
-	gtk_widget_set_sensitive( img->sub_placing, (gboolean)mode );
-	gtk_widget_set_sensitive( img->sub_pos,     (gboolean)mode );
+	gtk_widget_set_sensitive( img->sub_posX,     (gboolean)mode );
+	gtk_widget_set_sensitive( img->sub_posY,     (gboolean)mode );
+	gtk_widget_set_sensitive( img->sub_angle,    (gboolean)mode );
 }
 
 void
 img_update_sub_properties( img_window_struct *img,
 						   TextAnimationFunc  anim,
 						   gint               anim_id,
-						   gint               anim_duration,
-						   ImgSubPos          position,
-						   ImgRelPlacing      placing,
+						   gdouble            anim_duration,
 						   const gchar       *desc,
 						   gdouble           *color,
-						   gdouble           *bgcolor)
+						   gdouble           *brdr_color,
+						   gdouble           *bg_color,
+						   gdouble           *border_color,
+						   gboolean			top_border,
+						   gboolean			bottom_border,
+						   gint	             border_width)
 {
 	GList        *selected,
 				 *tmp;
@@ -2492,9 +2569,11 @@
 		gtk_tree_model_get_iter( model, &iter, (GtkTreePath *)tmp->data );
 		gtk_tree_model_get( model, &iter, 1, &slide, -1 );
 		
-		img_set_slide_text_info( slide, NULL, NULL, NULL,
-								 anim_id, anim_duration, position,
-								 placing, desc, color, bgcolor, img );
+		img_set_slide_text_info( slide, NULL, NULL, NULL, NULL,
+								 anim_id, anim_duration,	img->current_slide->posX,
+															img->current_slide->posY, 
+															img->current_slide->subtitle_angle,
+								 desc, color, brdr_color, bg_color, border_color, top_border, bottom_border, border_width, img );
 	}
 
 	g_list_foreach( selected, (GFunc)gtk_tree_path_free, NULL );

imagination-3.0.tar.bz2/src/main-window.h -> imagination-3.4.tar.bz2/src/main-window.h Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (c) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 #include <gtk/gtk.h>
 #include "support.h"
 #include "imagination.h"
-#include "imgtablebutton.h"
 
 img_window_struct *img_create_window(void);
 void img_iconview_selection_changed (GtkIconView *, img_window_struct *);
@@ -41,18 +40,16 @@
 						img_window_struct *img );
 
 void
-img_font_bgcolor_changed( GtkColorButton    *button,
+img_font_brdr_color_changed( GtkColorButton    *button,
                           img_window_struct *img );
 
-void
-img_text_pos_changed( ImgTableButton    *button,
-					  gint               item,
-					  img_window_struct *img );
+void img_sub_border_color_changed( GtkColorButton    *button,
+                          img_window_struct *img );
 
 void
-img_placing_changed( GtkComboBox   *combo,
-					 img_window_struct *img );
-
+img_font_bg_color_changed( GtkColorButton    *button,
+                          img_window_struct *img );
+                          
 void
 img_disable_videotab (img_window_struct *img);
 
@@ -69,16 +66,26 @@
 img_update_sub_properties( img_window_struct *img,
 						   TextAnimationFunc  anim,
 						   gint               anim_id,
-						   gint               anim_duration,
-						   ImgSubPos          position,
-						   ImgRelPlacing      placing,
+						   gdouble            anim_duration,
 						   const gchar       *desc,
 						   gdouble           *color,
-                           gdouble           *bgcolor );
+                           gdouble           *brdr_color,
+                           gdouble           *bg_color,
+                           gdouble           *border_color,
+                           gboolean			 top_border,
+						   gboolean			 bottom_border,
+                           gint		         border_width );
+
+void img_combo_box_transition_type_changed (GtkComboBox *,
+											img_window_struct *);
 
 void
 img_combo_box_anim_speed_changed( GtkSpinButton       *spinbutton,
 								  img_window_struct *img );
+								  
+void
+img_sub_border_width_changed( GtkSpinButton       *spinbutton,
+								  img_window_struct *img );
 
 void
 img_text_anim_set( GtkComboBox       *combo,

imagination-3.0.tar.bz2/src/new_slideshow.c -> imagination-3.4.tar.bz2/src/new_slideshow.c Changed

@@ -1,6 +1,7 @@
 /*
  *  Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
  *  Copyright (c) 2009 Tadej Borovšak 	<tadeboro@gmail.com>
+ *  Copyright (c) 2011 Robert Chéramy   <robert@cheramy.net>
  * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,6 +20,7 @@
  */
 
 #include "new_slideshow.h"
+#include "video_formats.h"
 
 /* ****************************************************************************
  * Local declarations
@@ -30,6 +32,7 @@
 img_update_current_slide( img_window_struct *img );
 
 static void img_video_format_changed (GtkComboBox *combo, img_window_struct *img);
+static void img_video_size_changed (GtkComboBox *combo, img_window_struct *img);
 
 /* ****************************************************************************
  * Public API
@@ -42,10 +45,6 @@
 	GtkWidget *main_frame;
 	GtkWidget *alignment_main_frame;
 	GtkWidget *vbox_frame1;
-	GtkWidget *hbox_slideshow_options;
-	GtkWidget *frame1;
-	GtkWidget *label_frame1;
-	GtkWidget *alignment_frame1;
 	GtkWidget *ex_vbox;
 	GtkWidget *ex_hbox;
 	GtkWidget *frame3;
@@ -55,11 +54,13 @@
 	GtkWidget *bg_button;
 	GtkWidget *bg_label;
 	GdkColor   color;
-	GtkWidget *hbox_video_format;
-	GtkWidget *hbox_video_size;
-	GtkWidget *label1;
+	GtkWidget *label;
 	gint       response;
+    gint       i;
 	gchar     *string;
+    GtkTreeIter   iter;
+    GtkListStore *store;
+    GtkWidget   *table;
 
 	/* Display propert title depending on the callback that is calling this function. */
 	string = ( flag ? _("Project properties") : _("Create a new slideshow") );
@@ -82,76 +83,80 @@
 	gtk_box_pack_start (GTK_BOX (vbox1), main_frame, TRUE, TRUE, 0);
 	gtk_frame_set_shadow_type (GTK_FRAME (main_frame), GTK_SHADOW_IN);
 
-	label1 = gtk_label_new (_("<b>Slideshow Settings</b>"));
-	gtk_frame_set_label_widget (GTK_FRAME (main_frame), label1);
-	gtk_label_set_use_markup (GTK_LABEL (label1), TRUE);
+	label = gtk_label_new (_("<b>Slideshow Settings</b>"));
+	gtk_frame_set_label_widget (GTK_FRAME (main_frame), label);
+	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
 
 	alignment_main_frame = gtk_alignment_new (0.5, 0.5, 1, 1);
 	gtk_container_add (GTK_CONTAINER (main_frame), alignment_main_frame);
 	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment_main_frame), 5, 15, 10, 10);
 
-	vbox_frame1 = gtk_vbox_new( FALSE, 10 );
-	gtk_container_add( GTK_CONTAINER( alignment_main_frame ), vbox_frame1 );
-
-	hbox_slideshow_options = gtk_hbox_new(TRUE, 10);
-	gtk_box_pack_start(GTK_BOX (vbox_frame1), hbox_slideshow_options, TRUE, TRUE, 10);
-
-	/* Video Format */
-
-	frame1 = gtk_frame_new (NULL);
-	gtk_box_pack_start (GTK_BOX (hbox_slideshow_options), frame1, TRUE, TRUE, 0);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
-
-	alignment_frame1 = gtk_alignment_new (0.5, 0.5, 1, 1);
-	gtk_container_add (GTK_CONTAINER (frame1), alignment_frame1);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment_frame1), 5, 5, 5, 5);
-
-	hbox_video_format = gtk_hbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (alignment_frame1), hbox_video_format);
-
-	img->video_format_combo = _gtk_combo_box_new_text(FALSE);
-	gtk_box_pack_start( GTK_BOX( hbox_video_format ), img->video_format_combo, FALSE, FALSE, 0 );
-	{
-		GtkTreeIter   iter;
-		GtkListStore *store = GTK_LIST_STORE( gtk_combo_box_get_model(GTK_COMBO_BOX( img->video_format_combo ) ) );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "VOB (DVD Video)", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "OGV (Theora Vorbis)", -1 );		
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "FLV (Flash Video)", -1 );
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "3GP (Mobile Phones)", -1 );
-/* Disable MP4 export or 3.0 release
-		gtk_list_store_append( store, &iter );
-		gtk_list_store_set( store, &iter, 0, "MP4 (MPEG-4)", -1 ); */
+    vbox_frame1 = gtk_vbox_new( FALSE, 10 );
+    gtk_container_add( GTK_CONTAINER( alignment_main_frame ), vbox_frame1 );
+
+    table = gtk_table_new(5, 2, FALSE);
+    gtk_box_pack_start(GTK_BOX (vbox_frame1), table, TRUE, TRUE, 10);
+
+    /* Video Format */
+    label = gtk_label_new (_("Video Format:"));
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+
+    img->video_format_combo = _gtk_combo_box_new_text(FALSE);
+    gtk_table_attach(GTK_TABLE(table), img->video_format_combo, 1, 2, 0, 1,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 2);
+    store = GTK_LIST_STORE( gtk_combo_box_get_model(GTK_COMBO_BOX( img->video_format_combo ) ) );
+    i = 0;
+    while (video_format_listi.name != NULL) {
+        gtk_list_store_append( store, &iter );
+        gtk_list_store_set( store, &iter, 0, gettext(video_format_listi.name), -1 );
+        i++;
 	}
-
-	label_frame1 = gtk_label_new (_("<b>Video Format</b>"));
-	gtk_frame_set_label_widget (GTK_FRAME (frame1), label_frame1);
-	gtk_label_set_use_markup (GTK_LABEL (label_frame1), TRUE);
+    /* Fill combobox depending on selected video format */
+    g_signal_connect (G_OBJECT (img->video_format_combo), "changed", G_CALLBACK (img_video_format_changed),img);
 
 	/* Video Size */
-	frame1 = gtk_frame_new (NULL);
-	gtk_box_pack_start (GTK_BOX (hbox_slideshow_options), frame1, TRUE, TRUE, 0);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
-
-	alignment_frame1 = gtk_alignment_new (0.5, 0.5, 1, 1);
-	gtk_container_add (GTK_CONTAINER (frame1), alignment_frame1);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment_frame1), 5, 5, 5, 5);
-
-	hbox_video_size = gtk_hbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (alignment_frame1), hbox_video_size);
-
-	img->video_size_combo = _gtk_combo_box_new_text(FALSE);
-	gtk_box_pack_start( GTK_BOX( hbox_video_size ), img->video_size_combo, FALSE, FALSE, 0 );
-
-	g_signal_connect (G_OBJECT (img->video_format_combo), "changed", G_CALLBACK (img_video_format_changed),img);
-	gtk_combo_box_set_active( GTK_COMBO_BOX( img->video_format_combo ), 0 );
-
-	label_frame1 = gtk_label_new (_("<b>Video Size</b>"));
-	gtk_frame_set_label_widget (GTK_FRAME (frame1), label_frame1);
-	gtk_label_set_use_markup (GTK_LABEL (label_frame1), TRUE);
+    label = gtk_label_new (_("Video Size:"));
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+
+    img->video_size_combo = _gtk_combo_box_new_text(FALSE);
+    gtk_table_attach(GTK_TABLE(table), img->video_size_combo, 1, 2, 1, 2,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 2);
+    /* Preset other parameters depending on selected size */
+    g_signal_connect (G_OBJECT (img->video_size_combo), "changed", G_CALLBACK (img_video_size_changed),img);
+
+    /* FPS */
+    label = gtk_label_new( _("Frames per Second (FPS):") );
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+
+    img->fps_combo = _gtk_combo_box_new_text(FALSE);
+    gtk_table_attach(GTK_TABLE(table), img->fps_combo, 1, 2, 2, 3,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 2);
+
+    /* Aspect Ratio */
+    label = gtk_label_new( _("Television Format:") );
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+
+    img->aspect_ratio_combo = _gtk_combo_box_new_text(FALSE);
+    gtk_table_attach(GTK_TABLE(table), img->aspect_ratio_combo, 1, 2, 3, 4,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 2);
+
+    /* Bitrate */
+    label = gtk_label_new( _("Bitrate:") );
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+
+    img->bitrate_combo = _gtk_combo_box_new_text(FALSE);
+    gtk_table_attach(GTK_TABLE(table), img->bitrate_combo, 1, 2, 4, 5,
+                              GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 2);
 
 	/* Advanced Settings */
 
@@ -176,25 +181,32 @@
 	ex_hbox = gtk_hbox_new( FALSE, 5 );
 	gtk_box_pack_start( GTK_BOX( ex_vbox ), ex_hbox, FALSE, FALSE, 0 );
 
-	bg_label = gtk_label_new( _("Select background color:") );
-	gtk_box_pack_start( GTK_BOX( ex_hbox ), bg_label, FALSE, FALSE, 0 );
+	img->bye_bye_transition_checkbox = gtk_check_button_new_with_label( _("End slideshow with blank slide") );
+	gtk_box_pack_start( GTK_BOX( ex_hbox ), img->bye_bye_transition_checkbox, FALSE, FALSE, 0 );
+	
+	bg_label = gtk_label_new( _("Select blank slide color:") );
+	gtk_box_pack_start( GTK_BOX( ex_hbox ), bg_label, TRUE, FALSE, 0 );
 
 	color.red   = img->background_color0 * 0xffff;
 	color.green = img->background_color1 * 0xffff;
 	color.blue  = img->background_color2 * 0xffff;
 	bg_button = gtk_color_button_new_with_color( &color );
 	gtk_box_pack_start( GTK_BOX( ex_hbox ), bg_button, FALSE, FALSE, 0 );
-
 	gtk_widget_show_all(dialog_vbox1);
 
 	/* Set parameters */
 	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( distort_button ), img->distort_images );
+	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( img->bye_bye_transition_checkbox ), img->bye_bye_transition );
+
 	img_set_format_options(img);
 
 	response = gtk_dialog_run(GTK_DIALOG(dialog1));
 
 	if (response == GTK_RESPONSE_ACCEPT)
 	{
+		if (! flag)
+			img_close_slideshow(NULL, img);
+
 		gboolean dist = img->distort_images;
 		GdkColor new;
 		gboolean c_dist,
@@ -205,11 +217,20 @@
 			gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( distort_button ) );
 		c_dist = ( dist ? ! img->distort_images : img->distort_images );
 
+		/* Get bye bye transition settings */
+		img->bye_bye_transition = 
+			gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( img->bye_bye_transition_checkbox) );
+
 		/* Get format settings */
 		img_get_format_options(img);
 
 		img->video_ratio = (gdouble)img->video_size0 / img->video_size1;
 
+		/* Set the max value of slide subtitles hrange scale
+		* according to the new video size */
+		gtk_adjustment_set_upper( img->sub_posX_adj, (gdouble)img->video_size0);
+		gtk_adjustment_set_upper( img->sub_posY_adj, (gdouble)img->video_size1);
+	
 		/* Get color settings */
 		gtk_color_button_get_color( GTK_COLOR_BUTTON( bg_button ), &new );
 		img->background_color0 = (gdouble)new.red   / 0xffff;
@@ -286,375 +307,156 @@
 static void img_video_format_changed (GtkComboBox *combo, img_window_struct *img)
 {
 	GtkTreeIter   iter;
-	GtkListStore *store = GTK_LIST_STORE( gtk_combo_box_get_model(GTK_COMBO_BOX( img->video_size_combo ) ) );
-
-	gtk_list_store_clear(store);
-	switch (gtk_combo_box_get_active(combo))
-	{
-		case 0:
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "720 x 480 NTSC", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "720 x 576 PAL", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "1280 x 720 HD", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "1920 x 1080 HD", -1 );
-		break;
-
-		case 1:
-		case 2:
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "320 x 240 4:3", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "400 x 300", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "512 x 384", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "640 x 480", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "800 x 600", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "320 x 180 16:9", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "400 x 225", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "512 x 288", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "640 x 360", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "854 x 480", -1 );
-		break;
-
-		case 3:
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "128 x 96", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "176 x 144", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "352 x 288", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "704 x 576", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "1408 x 1152", -1 );
-		break;
-
-		case 4:
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "480 x 360", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "1280 x 720", -1 );
-			gtk_list_store_append( store, &iter );
-			gtk_list_store_set( store, &iter, 0, "1920 x 1080", -1 );
-		break;
+	GtkListStore *store;
+    gint          video_format, i;
+
+	video_format = gtk_combo_box_get_active(combo);
+
+    /* Video size */
+    store = GTK_LIST_STORE( gtk_combo_box_get_model(GTK_COMBO_BOX( img->video_size_combo ) ) );
+    gtk_list_store_clear(store);
+    i = 0;
+    while (video_format_listvideo_format.sizelisti.name != NULL) {
+        gtk_list_store_append (store, &iter );
+		gtk_list_store_set (store, &iter, 0,
+                            video_format_listvideo_format.sizelisti.name, -1 );
+        i++;
 	}
-	gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo),0);
+	/* Combo is set to default size at the end because it triggers img_video_size_changed */
+
+    /* Aspect Ratio */
+    if (video_format_listvideo_format.aspect_ratio_list == NULL)
+    {
+        gtk_widget_set_sensitive(img->aspect_ratio_combo, FALSE);
+        gtk_combo_box_set_active(GTK_COMBO_BOX(img->aspect_ratio_combo), -1);
+    }
+    else
+    {
+        gtk_widget_set_sensitive(img->aspect_ratio_combo, TRUE);
+        store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(img->aspect_ratio_combo)));
+        gtk_list_store_clear(store);
+        i = 0;
+        while (video_format_listvideo_format.aspect_ratio_listi.name != NULL) {
+            gtk_list_store_append( store, &iter );
+            gtk_list_store_set( store, &iter, 0,
+                          video_format_listvideo_format.aspect_ratio_listi.name, -1 );
+            i++;
+        }
+        gtk_combo_box_set_active(GTK_COMBO_BOX(img->aspect_ratio_combo), 0);
+    }
+
+    /* FPS */
+    store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(img->fps_combo)));
+    gtk_list_store_clear(store);
+    i = 0;
+    while (video_format_listvideo_format.fps_listi.name != NULL) {
+        gtk_list_store_append( store, &iter );
+        gtk_list_store_set( store, &iter, 0, video_format_listvideo_format.fps_listi.name, -1 );
+        i++;
+    }
+    gtk_combo_box_set_active(GTK_COMBO_BOX(img->fps_combo),0);
+
+
+    /* Bitrate */
+    if (video_format_listvideo_format.bitratelist == NULL)
+    {
+        gtk_widget_set_sensitive(img->bitrate_combo, FALSE);
+        gtk_combo_box_set_active(GTK_COMBO_BOX(img->bitrate_combo),-1);
+    }
+    else
+    {
+        gtk_widget_set_sensitive(img->bitrate_combo, TRUE);
+        store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(img->bitrate_combo)));
+        gtk_list_store_clear(store);
+        i = 0;
+        while (video_format_listvideo_format.bitratelisti.name != NULL) {
+            gtk_list_store_append( store, &iter );
+            gtk_list_store_set( store, &iter, 0, gettext(video_format_listvideo_format.bitratelisti.name), -1 );
+            i++;
+        }
+        gtk_combo_box_set_active(GTK_COMBO_BOX(img->bitrate_combo),0);
+    }
+
+    /* This triggers img_video_size_changed and presets other combo boxes to default parameters */
+    gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 0);
+}
+
+static void img_video_size_changed (GtkComboBox *combo, img_window_struct *img)
+{
+    gint size_idx, format_idx, index;
+
+    size_idx = gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_size_combo));
+    if (size_idx == -1)
+        return;
+    format_idx = gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_format_combo));
+
+    index = video_format_listformat_idx.sizelistsize_idx.default_fps_idx;
+    if (index != -1)
+        gtk_combo_box_set_active(GTK_COMBO_BOX(img->fps_combo), index);
+
+    index = video_format_listformat_idx.sizelistsize_idx.default_aspect_ratio_idx;
+    if (index != -1)
+        gtk_combo_box_set_active(GTK_COMBO_BOX(img->aspect_ratio_combo), index);
+
+    index = video_format_listformat_idx.sizelistsize_idx.default_bitrate_idx;
+    if (index != -1)
+        gtk_combo_box_set_active(GTK_COMBO_BOX(img->bitrate_combo), index);
 }
 
 void img_get_format_options(img_window_struct *img)
 {
-	switch (gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_format_combo)) )
-	{
-		case 0: /* VOB */
-			img->video_format = 'V';
-			switch (gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_size_combo)) )
-			{
-				case 0:
-				img->video_size0 = 720;
-				img->video_size1 = 480;
-				break;
-
-				case 1:
-				img->video_size0 = 720;
-				img->video_size1 = 576;
-				break;
-
-				case 2:
-				img->video_size0 = 1280;
-				img->video_size1 = 720;
-				break;
-
-				case 3:
-				img->video_size0 = 1920;
-				img->video_size1 = 1080;
-				break;
-			}
-		break;
-		
-		case 1: /* OGV */
-		case 2: /* FLV */
-			if (gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_format_combo)) == 1)
-				img->video_format = 'O';
-			else if (gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_format_combo)) == 2)
-				img->video_format = 'F';
-
-			switch (gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_size_combo)) )
-			{
-				case 0:
-				img->video_size0 = 320;
-				img->video_size1 = 240;
-				break;
-
-				case 1:
-				img->video_size0 = 400;
-				img->video_size1 = 300;
-				break;
-
-				case 2:
-				img->video_size0 = 512;
-				img->video_size1 = 384;
-				break;
-
-				case 3:
-				img->video_size0 = 640;
-				img->video_size1 = 480;
-				break;
-				
-				case 4:
-				img->video_size0 = 800;
-				img->video_size1 = 600;
-				break;
-
-				case 5:
-				img->video_size0 = 320;
-				img->video_size1 = 180;
-				break;
-
-				case 6:
-				img->video_size0 = 400;
-				img->video_size1 = 225;
-				break;
-
-				case 7:
-				img->video_size0 = 512;
-				img->video_size1 = 288;
-				break;
-
-				case 8:
-				img->video_size0 = 640;
-				img->video_size1 = 360;
-				break;
-
-				case 9:
-				img->video_size0 = 854;
-				img->video_size1 = 480;
-				break;
-			}
-		break;
-
-		case 3: /* 3GP */
-			img->video_format = '3';
-			switch (gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_size_combo)) )
-			{
-				case 0:
-				img->video_size0 = 128;
-				img->video_size1 = 96;
-				break;
-
-				case 1:
-				img->video_size0 = 176;
-				img->video_size1 = 144;
-				break;
-
-				case 2:
-				img->video_size0 = 352;
-				img->video_size1 = 288;
-				break;
-
-				case 3:
-				img->video_size0 = 704;
-				img->video_size1 = 576;
-				break;
-
-				case 4:
-				img->video_size0 = 1408;
-				img->video_size1 = 1152;
-				break;
-			}
-		break;
-
-		case 4: /* MP4 */
-			img->video_format = 'M';
-			switch (gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_size_combo)) )
-			{
-				case 0:
-				img->video_size0 = 480;
-				img->video_size1 = 360;
-				break;
-
-				case 1:
-				img->video_size0 = 1280;
-				img->video_size1 = 720;
-				break;
-
-				case 2:
-				img->video_size0 = 1920;
-				img->video_size1 = 1080;
-				break;
-			}
-		break;
-	}
+    gint    video_format_index, video_size_index;
+
+    video_format_index = gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_format_combo));
+    video_size_index = gtk_combo_box_get_active(GTK_COMBO_BOX(img->video_size_combo));
+
+    img->video_format_index = video_format_index;
+    img->video_size0 = video_format_listvideo_format_index.sizelistvideo_size_index.x;
+    img->video_size1 = video_format_listvideo_format_index.sizelistvideo_size_index.y;
+    img->aspect_ratio_index = gtk_combo_box_get_active(GTK_COMBO_BOX(img->aspect_ratio_combo));
+    img->bitrate_index = gtk_combo_box_get_active(GTK_COMBO_BOX(img->bitrate_combo));
+    img->fps_index = gtk_combo_box_get_active(GTK_COMBO_BOX(img->fps_combo));
+    img->export_fps = video_format_listvideo_format_index.fps_listimg->fps_index.value;
+    img->bye_bye_transition = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(img->bye_bye_transition_checkbox));
 }
 
 void img_set_format_options(img_window_struct *img)
 {
-	switch (img->video_format)
-	{
-		case 'V':
-			gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_format_combo), 0);
-			switch (img->video_size1)
-			{
-				case 480:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 0);
-				break;
-
-				case 576:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 1);
-				break;
-
-				case 720:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 2);
-				break;
-
-				case 1080:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 3);
-				break;
-			}
-		break;
-
-		case 'O':
-			gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_format_combo), 1);
-			switch (img->video_size1)
-			{
-				case 240:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 0);
-				break;
-
-				case 300:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 1);
-				break;
-
-				case 384:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 2);
-				break;
-
-				case 480:
-				if (img->video_size0 == 640)
-					gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 3);
-				else
-					gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 9);
-				break;
-				
-				case 600:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 4);
-				break;
-
-				case 180:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 5);
-				break;
-
-				case 225:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 6);
-				break;
-
-				case 288:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 7);
-				break;
-
-				case 360:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 8);
-				break;
-			}
-		break;
-
-		case 'F':
-			gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_format_combo), 2);
-			switch (img->video_size1)
-			{
-				case 240:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 0);
-				break;
-
-				case 300:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 1);
-				break;
-
-				case 384:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 2);
-				break;
-
-				case 480:
-				if (img->video_size0 == 640)
-					gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 3);
-				else
-					gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 9);
-				break;
-				
-				case 600:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 4);
-				break;
-
-				case 180:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 5);
-				break;
-
-				case 225:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 6);
-				break;
-
-				case 288:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 7);
-				break;
-
-				case 360:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 8);
-				break;
-			}
-		break;
-
-		case '3':
-			gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_format_combo), 3);
-			switch (img->video_size1)
-			{
-				case 96:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 0);
-				break;
-
-				case 144:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 1);
-				break;
-
-				case 288:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 2);
-				break;
-
-				case 576:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 3);
-				break;
-				
-				case 1152:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 4);
-				break;
-			}
-		break;
-		
-		case 'M':
-			gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_format_combo), 4);
-			switch (img->video_size1)
-			{
-				case 360:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 0);
-				break;
-
-				case 720:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 1);
-				break;
-
-				case 1080:
-				gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), 2);
-				break;
-			}
-		break;
-	}
+    gint i;
+    struct video_size *size_list;
+
+    /* Video format */
+    gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_format_combo), img->video_format_index);
+
+	/* Bye bye transition */
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(img->bye_bye_transition_checkbox), img->bye_bye_transition);
+
+    /* size list */
+    size_list = video_format_listimg->video_format_index.sizelist;
+    i = 0;
+    while (size_listi.name != NULL)
+    {
+        if (img->video_size0 == size_listi.x
+            && img->video_size1 == size_listi.y)
+        {
+            gtk_combo_box_set_active(GTK_COMBO_BOX(img->video_size_combo), i);
+            break;
+        }
+        i++;
+    }
+    if (size_listi.name == NULL) {
+        img_message(img, FALSE, "No video size found\n"); /* FIXME - add a custom Size option */
+    }
+
+    /* Aspect Ratio */
+    if (video_format_listimg->video_format_index.aspect_ratio_list != NULL)
+        gtk_combo_box_set_active(GTK_COMBO_BOX(img->aspect_ratio_combo), img->aspect_ratio_index);
+
+    /* Bitrate */
+    if (video_format_listimg->video_format_index.bitratelist != NULL)
+        gtk_combo_box_set_active(GTK_COMBO_BOX(img->bitrate_combo), img->bitrate_index);
+    
+    /* FPS */
+    gtk_combo_box_set_active(GTK_COMBO_BOX(img->fps_combo), img->fps_index);
 }

imagination-3.0.tar.bz2/src/new_slideshow.h -> imagination-3.4.tar.bz2/src/new_slideshow.h Changed

imagination-3.0.tar.bz2/src/slideshow_project.c -> imagination-3.4.tar.bz2/src/slideshow_project.c Changed

@@ -1,7 +1,8 @@
 /*
- *  Copyright (C) 2009 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (C) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
  *  Copyright (c) 2009 Tadej Borovšak 	<tadeboro@gmail.com>
- * 
+ *  Copyright (c) 2011 Robert Chéramy   <robert@cheramy.net>
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
@@ -18,12 +19,14 @@
  */
 
 #include "slideshow_project.h"
+#include "video_formats.h"
 
 static gboolean img_populate_hash_table( GtkTreeModel *, GtkTreePath *, GtkTreeIter *, GHashTable ** );
 
 void
 img_save_slideshow( img_window_struct *img,
-					const gchar       *output )
+					const gchar       *output,
+					gboolean		  relative )
 {
 	GKeyFile *img_key_file;
 	gchar *conf, *string, *path, *filename, *file, *font_desc;
@@ -42,8 +45,31 @@
 	/* Slideshow settings */
 	g_key_file_set_comment(img_key_file, NULL, NULL, comment_string, NULL);
 
-	g_key_file_set_integer( img_key_file, "slideshow settings",
-							"video format", img->video_size1 );
+    g_key_file_set_string(img_key_file, "slideshow settings",
+                          "video codec",
+                          video_format_listimg->video_format_index.config_name);
+
+                          g_key_file_set_integer(img_key_file, "slideshow settings",
+                          "video width", img->video_size0);
+    g_key_file_set_integer(img_key_file, "slideshow settings",
+                          "video height", img->video_size1);
+
+    g_key_file_set_string(img_key_file, "slideshow settings",
+                "fps",
+                video_format_listimg->video_format_index.fps_listimg->fps_index.name);
+
+    if (NULL != video_format_listimg->video_format_index.aspect_ratio_list)
+        g_key_file_set_string(img_key_file, "slideshow settings",
+                "aspect ratio",
+                video_format_listimg->video_format_index.aspect_ratio_listimg->aspect_ratio_index.name);
+
+    if (NULL != video_format_listimg->video_format_index.bitratelist)
+		g_key_file_set_string(img_key_file, "slideshow settings", "bitrate",video_format_listimg->video_format_index.bitratelistimg->bitrate_index.value);
+
+	/* Save last slide setting (bye bye transition) */
+	g_key_file_set_boolean( img_key_file, "slideshow settings",
+										 "blank slide", img->bye_bye_transition);
+
 	g_key_file_set_double_list( img_key_file, "slideshow settings",
 								"background color", img->background_color, 3 );
 	g_key_file_set_boolean(img_key_file,"slideshow settings", "distort images", img->distort_images);
@@ -62,6 +88,12 @@
         else
             filename = entry->original_filename;
 
+		if (relative && filename)
+		{
+			gchar *_filename;
+			_filename = g_path_get_basename(filename);
+			filename = _filename;
+		}
         if (filename)
 		{
 			/* Save original filename and rotation */
@@ -85,7 +117,7 @@
 		}
 
 		/* Duration */
-		g_key_file_set_integer(img_key_file,conf, "duration",		entry->duration);
+		g_key_file_set_double(img_key_file,conf, "duration",		entry->duration);
 
 		/* Transition */
 		g_key_file_set_integer(img_key_file,conf, "transition_id",	entry->transition_id);
@@ -112,22 +144,38 @@
 		}
 
 		/* Subtitle */
-		/* EXPLANATION: Only facultative field here is subtitle text, since user
-		 * may have set other text properties on slide and we would let them out
-		 * if we only save slides with text present. */
 		if( entry->subtitle )
+		{
 			g_key_file_set_string (img_key_file, conf,"text",			entry->subtitle);
-
-		font_desc = pango_font_description_to_string(entry->font_desc);
-		g_key_file_set_integer(img_key_file,conf, "anim id",		entry->anim_id);
-		g_key_file_set_integer(img_key_file,conf, "anim duration",	entry->anim_duration);
-		g_key_file_set_integer(img_key_file,conf, "text pos",		entry->position);
-		g_key_file_set_integer(img_key_file,conf, "placing",		entry->placing);
-		g_key_file_set_string (img_key_file, conf,"font",			font_desc);
-		g_key_file_set_double_list(img_key_file, conf,"font color",entry->font_color,4);
-        g_key_file_set_double_list(img_key_file, conf,"font bgcolor",entry->font_bgcolor,4);
-		g_free(font_desc);
-		g_free(conf);
+			if( entry->pattern_filename )
+			{
+				if (relative)
+				{
+					gchar *dummy;
+					dummy = g_path_get_basename(entry->pattern_filename);
+					g_key_file_set_string (img_key_file, conf,"pattern filename", dummy);
+					g_free(dummy);
+				}
+				else
+					g_key_file_set_string (img_key_file, conf,"pattern filename", entry->pattern_filename);
+			}
+			font_desc = pango_font_description_to_string(entry->font_desc);
+			g_key_file_set_integer(img_key_file,conf, "anim id",		entry->anim_id);
+			g_key_file_set_integer(img_key_file,conf, "anim duration",	entry->anim_duration);
+			g_key_file_set_integer(img_key_file,conf, "posX",		entry->posX);
+			g_key_file_set_integer(img_key_file,conf, "posY",		entry->posY);
+			g_key_file_set_integer(img_key_file,conf, "subtitle angle",		entry->subtitle_angle);
+			g_key_file_set_string (img_key_file, conf,"font",			font_desc);
+			g_key_file_set_double_list(img_key_file, conf,"font color",entry->font_color,4);
+			g_key_file_set_double_list(img_key_file, conf,"font bgcolor",entry->font_brdr_color,4);
+			g_key_file_set_double_list(img_key_file, conf,"font bgcolor2",entry->font_bg_color,4);
+			g_key_file_set_double_list(img_key_file, conf,"border color",entry->border_color,4);
+			g_key_file_set_boolean(img_key_file, conf,"top border",entry->top_border);
+			g_key_file_set_boolean(img_key_file, conf,"bottom border",entry->bottom_border);
+			g_key_file_set_integer(img_key_file, conf,"border width",entry->border_width);
+			g_free(font_desc);
+		}
+			g_free(conf);
 	}
 	while (gtk_tree_model_iter_next (model,&iter));
 	count = 0;
@@ -142,9 +190,15 @@
 			count++;
 			gtk_tree_model_get(model, &iter, 0, &path, 1, &filename ,-1);
 			conf = g_strdup_printf("music_%d",count);
-			file = g_build_filename(path, filename, NULL);
-			g_free(path);
-			g_free(filename);
+			if (! relative)
+			{
+				file = g_build_filename(path, filename, NULL);
+				g_free(path);
+				g_free(filename);
+			}
+			else
+				file = filename;
+
 			g_key_file_set_string(img_key_file, "music", conf, file);
 			g_free(file);
 			g_free(conf);
@@ -179,15 +233,16 @@
 	GKeyFile *img_key_file;
 	gchar *dummy, *slide_filename, *time;
 	GtkWidget *dialog;
-	gint number,i,transition_id, duration, no_points, previous_nr_of_slides;
+	gint number,i,transition_id, no_points, previous_nr_of_slides, border_width;
 	guint speed;
 	GtkTreeModel *model;
 	void (*render);
 	GHashTable *table;
 	gchar      *spath, *conf;
-	gdouble    *color, *font_color, *font_bgcolor;
-	gboolean    old_file = FALSE;
-	gboolean    first_slide = TRUE;
+	gdouble    duration, *color, *font_color, *font_brdr_color, *font_bg_color, *border_color;
+	gboolean   first_slide = TRUE;
+    gchar      *video_config_name, *aspect_ratio, *fps;
+    gchar      *bitrate;
 
 	/* Cretate new key file */
 	img_key_file = g_key_file_new();
@@ -203,24 +258,23 @@
 
 	if( strncmp( dummy, comment_string, strlen( comment_string ) ) != 0 )
 	{
-		/* Enable loading of old projects too */
-		if( strncmp( dummy, old_comment_string,
-					 strlen( old_comment_string ) ) != 0 )
-		{
-			dialog = gtk_message_dialog_new(
-						GTK_WINDOW( img->imagination_window ), GTK_DIALOG_MODAL,
-						GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-						_("This is not an Imagination project file!") );
-			gtk_window_set_title( GTK_WINDOW( dialog ), "Imagination" );
-			gtk_dialog_run( GTK_DIALOG( dialog ) );
-			gtk_widget_destroy( GTK_WIDGET( dialog ) );
-			g_free( dummy );
-			return;
-		}
-		old_file = TRUE;
+		dialog = gtk_message_dialog_new(
+				GTK_WINDOW( img->imagination_window ), GTK_DIALOG_MODAL,
+				GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+				_("This is not an Imagination project file!") );
+		gtk_window_set_title( GTK_WINDOW( dialog ), "Imagination" );
+		gtk_dialog_run( GTK_DIALOG( dialog ) );
+		gtk_widget_destroy( GTK_WIDGET( dialog ) );
+		g_free( dummy );
+		return;
 	}
 	g_free( dummy );
 
+	if (img->project_current_dir)
+		g_free(img->project_current_dir);
+
+	img->project_current_dir = g_path_get_dirname(input);
+
 	/* Create hash table for efficient searching */
 	table = g_hash_table_new_full( g_direct_hash, g_direct_equal,
 								   NULL, g_free );
@@ -230,104 +284,117 @@
 							&table );
 
 	/* Set the slideshow options */
-	img->video_size1 = g_key_file_get_integer( img_key_file,
-												 "slideshow settings",
-												 "video format", NULL);
-	gtk_widget_set_size_request( img->image_area,
-								 img->video_size0 * img->image_area_zoom,
-								 img->video_size1 * img->image_area_zoom );
+   /* Video Codec */
+	video_config_name = g_key_file_get_string(img_key_file, "slideshow settings",
+                          "video codec", NULL);
+	i = 0;
+	while (video_config_name != NULL
+          && video_format_listi.name != NULL
+          && strcmp (video_format_listi.config_name, video_config_name) != 0)
+		i++;
+	if (video_config_name == NULL || video_format_listi.name == NULL)
+	{
+		img_message(img, FALSE, "Could not find a video format, guessing VOB\n");
+		img->video_format_index = 0; /* index for VOB format*/
+	}
+	else
+      img->video_format_index = i;
+
+	/* Video Size */
+	img->video_size0 = g_key_file_get_integer(img_key_file, "slideshow settings",
+                          "video width", NULL);
+	img->video_size1 = g_key_file_get_integer(img_key_file, "slideshow settings",
+                          "video height", NULL);
+
+	/* Set the max value of slide subtitles hrange scale
+	 * according to the new video size */
+	gtk_adjustment_set_upper( img->sub_posX_adj, (gdouble)img->video_size0);
+	gtk_adjustment_set_upper( img->sub_posY_adj, (gdouble)img->video_size1);
+
+	/* fps */
+	fps = g_key_file_get_string(img_key_file, "slideshow settings", "fps", NULL);
+	i = 0;
+	while (fps != NULL
+          && strcmp (video_format_listimg->video_format_index.fps_listi.name, fps) != 0)
+      i++;
+
+	if (fps == NULL
+      || video_format_listimg->video_format_index.fps_listi.name == NULL)
+	{
+		img_message(img, FALSE, "Could not find a fps, set to default\n");
+		img->fps_index = 0; /* index for VOB format*/
+	}
+	else
+		img->fps_index = i;
+	img->export_fps = video_format_listimg->video_format_index.fps_listimg->fps_index.value;
+
+  /* Aspect ratio */
+  if (NULL != video_format_listimg->video_format_index.aspect_ratio_list)
+  {
+      aspect_ratio = g_key_file_get_string(img_key_file, "slideshow settings",
+                              "aspect ratio", NULL);
+      i = 0;
+      while (aspect_ratio != NULL
+             && video_format_listimg->video_format_index.aspect_ratio_listi.name != NULL
+             && strcmp (video_format_listimg->video_format_index.aspect_ratio_listi.name, aspect_ratio) != 0)
+          i++;
+
+      if (aspect_ratio == NULL
+          || video_format_listimg->video_format_index.aspect_ratio_listi.name == NULL)
+      {
+          img_message(img, FALSE, "Could not find an aspect ratio, set to default\n");
+          img->aspect_ratio_index = 0; /* index for VOB format*/
+      }
+      else
+        img->aspect_ratio_index = i;
+   }
+        
+   /* Bitrate */
+   if (NULL != video_format_listimg->video_format_index.bitratelist)
+   {
+      bitrate = g_key_file_get_string(img_key_file, "slideshow settings",
+                                    "bitrate", NULL);
+      i = 0;
+      while (bitrate != NULL
+			&& video_format_listimg->video_format_index.bitratelisti.name != NULL
+			&& strcmp (video_format_listimg->video_format_index.bitratelisti.value, bitrate) != 0)
+         i++;
+ 
+      if (video_format_listimg->video_format_index.bitratelisti.name == NULL)
+      {
+           img_message(img, FALSE, "Could not find a bitrate, set to default\n");
+           img->bitrate_index = 0; /* index for VOB format*/
+      }
+      else
+        img->bitrate_index = i;
+    }
+
+	img->video_ratio = (gdouble)img->video_size0 / img->video_size1;
+
+    img_zoom_fit(NULL, img);
 
 	/* Make loading more efficient by removing model from icon view */
 	g_object_ref( G_OBJECT( img->thumbnail_model ) );
 	gtk_icon_view_set_model( GTK_ICON_VIEW( img->thumbnail_iconview ), NULL );
 	gtk_icon_view_set_model( GTK_ICON_VIEW( img->over_icon ), NULL );
 
-	/* Enable loading of old projects too */
-	if( old_file )
-	{
-		guint32 tmp;
-		dummy = g_key_file_get_string( img_key_file, "slideshow settings",
-									   "background color", NULL );
-		tmp = (guint32)strtoul( dummy, NULL, 16 );
-		img->background_color0 = (gdouble)( ( tmp >> 24 ) & 0xff ) / 0xff;
-		img->background_color1 = (gdouble)( ( tmp >> 16 ) & 0xff ) / 0xff;
-		img->background_color2 = (gdouble)( ( tmp >>  8 ) & 0xff ) / 0xff;
-
-		/* Loads the thumbnails and set the slides info */
-		number = g_key_file_get_integer(img_key_file,"images","number", NULL);
 
-		/* Store the previous number of slides and set img->slides_nr so to have the correct number of slides displayed on the status bar */
-		previous_nr_of_slides = img->slides_nr;
-		img->slides_nr = number;
-		gtk_widget_show(img->progress_bar);
-		for (i = 1; i <= number; i++)
-		{
-			dummy = g_strdup_printf("image_%d",i);
-			slide_filename = g_key_file_get_string(img_key_file,"images",dummy, NULL);
-
-			if( img_scale_image( slide_filename, img->video_ratio, 88, 0,
-								 img->distort_images, img->background_color,
-								 &thumb, NULL ) )
-			{
-				GdkPixbuf *pix;
-
-				speed 	=		g_key_file_get_integer(img_key_file, "transition speed",	dummy, NULL);
-				duration= 		g_key_file_get_integer(img_key_file, "slide duration",		dummy, NULL);
-				transition_id = g_key_file_get_integer(img_key_file, "transition type",		dummy, NULL);
-
-				/* Get the mem address of the transition */
-				spath = (gchar *)g_hash_table_lookup( table, GINT_TO_POINTER( transition_id ) );
-				gtk_tree_model_get_iter_from_string( model, &iter, spath );
-				gtk_tree_model_get( model, &iter, 2, &render, 0, &pix, -1 );
-				slide_info = img_create_new_slide();
-				if( slide_info )
-				{
-					img_set_slide_file_info( slide_info, slide_filename );
-					gtk_list_store_append( img->thumbnail_model, &iter );
-					gtk_list_store_set( img->thumbnail_model, &iter, 0, thumb, 1, slide_info, -1 );
-					g_object_unref( G_OBJECT( thumb ) );
-
-					/* Set non-default data */
-					img_set_slide_still_info( slide_info, duration, img );
-					img_set_slide_transition_info( slide_info,
-												   img->thumbnail_model, &iter,
-												   pix, spath, transition_id,
-												   render, speed, img );
-					g_object_unref( G_OBJECT( pix ) );
-
-					/* Increment slide counter */
-					img->slides_nr++;
-
-					/* If we're loading the first slide, apply some of it's
-				 	 * data to final pseudo-slide */
-					if( first_slide )
-					{
-						first_slide = FALSE;
-						img->final_transition.speed  = slide_info->speed;
-						img->final_transition.render = slide_info->render;
-					}
-				}
-			}
-
-			img_increase_progressbar(img, i);
-			g_free(slide_filename);
-			g_free(dummy);
-		}
-	}
-	else
-	{
-		gchar *subtitle = NULL, *font_desc;
-		gdouble *my_points = NULL, *p_start, *p_stop, *c_start, *c_stop;
-		gsize length;
-		gint anim_id,anim_duration, text_pos, placing, gradient;
-		GdkPixbuf *pix = NULL;
-        gboolean      load_ok, img_load_ok;
-        gchar *original_filename = NULL;
-        GtkIconTheme *icon_theme;
-        GtkIconInfo  *icon_info;
-        const gchar  *icon_filename;
-		ImgAngle   angle = 0;
+	gchar *subtitle = NULL, *pattern_name = NULL, *font_desc;
+	gdouble *my_points = NULL, *p_start, *p_stop, *c_start, *c_stop;
+	gsize length;
+	gint anim_id,anim_duration, posx, posy, gradient, subtitle_angle;
+	GdkPixbuf *pix = NULL;
+    gboolean      load_ok, img_load_ok, top_border, bottom_border;
+	gchar *original_filename = NULL;
+	GtkIconTheme *icon_theme;
+	GtkIconInfo  *icon_info;
+	const gchar  *icon_filename;
+	ImgAngle   angle = 0;
 	
+		/* Load last slide setting (bye bye transition) */
+		img->bye_bye_transition = g_key_file_get_boolean( img_key_file, "slideshow settings",
+										 "blank slide", NULL);
+		
 		/* Load project backgroud color */
 		color = g_key_file_get_double_list( img_key_file, "slideshow settings",
 											"background color", NULL, NULL );
@@ -348,13 +415,17 @@
 		{
 			conf = g_strdup_printf("slide %d", i);
 			slide_filename = g_key_file_get_string(img_key_file,conf,"filename", NULL);
-            original_filename = g_strdup (slide_filename);
 
 			if( slide_filename )
 			{
+				if ( g_path_is_absolute(slide_filename) == FALSE)
+					original_filename = g_strconcat(img->project_current_dir, "/", slide_filename, NULL);
+				else
+					original_filename = g_strdup (slide_filename);
+
 				angle = (ImgAngle)g_key_file_get_integer( img_key_file, conf,
 														  "angle", NULL );
-				load_ok = img_scale_image( slide_filename, img->video_ratio,
+				load_ok = img_scale_image( original_filename, img->video_ratio,
 										   88, 0, img->distort_images,
 										   img->background_color, &thumb, NULL );
                 img_load_ok = load_ok;
@@ -380,6 +451,7 @@
 			}
 			else
 			{
+				angle = 0;
 				/* We are loading an empty slide */
 				gradient = g_key_file_get_integer(img_key_file, conf, "gradient", NULL);
 				c_start = g_key_file_get_double_list(img_key_file, conf, "start_color", NULL, NULL);
@@ -389,14 +461,16 @@
 
 				/* Create thumbnail */
 				load_ok = img_scale_gradient( gradient, p_start, p_stop,
-											  c_start, c_stop, 88, 72,
+											  c_start, c_stop, 88, 49,
 											  &thumb, NULL );
+                /* No image is loaded, so img_load_ok is OK if load_ok is */
+                img_load_ok = load_ok;
 			}
 
 			/* Try to load image. If this fails, skip this slide */
 			if( load_ok )
 			{
-				duration	  = g_key_file_get_integer(img_key_file, conf, "duration", NULL);
+				duration	  = g_key_file_get_double(img_key_file, conf, "duration", NULL);
 				transition_id = g_key_file_get_integer(img_key_file, conf, "transition_id", NULL);
 				speed 		  =	g_key_file_get_integer(img_key_file, conf, "speed",	NULL);
 
@@ -407,13 +481,20 @@
 
 				/* Load the slide text related data */
 				subtitle	  =	g_key_file_get_string (img_key_file, conf, "text",	NULL);
+				pattern_name  =	g_key_file_get_string (img_key_file, conf, "pattern filename",	NULL);
 				anim_id 	  = g_key_file_get_integer(img_key_file, conf, "anim id", 		NULL);
 				anim_duration = g_key_file_get_integer(img_key_file, conf, "anim duration",	NULL);
-				text_pos      = g_key_file_get_integer(img_key_file, conf, "text pos",		NULL);
-				placing 	  = g_key_file_get_integer(img_key_file, conf, "placing",		NULL);
+				posx     	  = g_key_file_get_integer(img_key_file, conf, "posX",		NULL);
+				posy       	  = g_key_file_get_integer(img_key_file, conf, "posY",		NULL);
+				subtitle_angle= g_key_file_get_integer(img_key_file, conf, "subtitle angle",		NULL);
 				font_desc     = g_key_file_get_string (img_key_file, conf, "font", 			NULL);
 				font_color 	  = g_key_file_get_double_list(img_key_file, conf, "font color", NULL, NULL );
-                font_bgcolor  = g_key_file_get_double_list(img_key_file, conf, "font bgcolor", NULL, NULL );
+                font_brdr_color  = g_key_file_get_double_list(img_key_file, conf, "font bgcolor", NULL, NULL );
+                font_bg_color = g_key_file_get_double_list(img_key_file, conf, "font bgcolor2", NULL, NULL );
+                border_color = g_key_file_get_double_list(img_key_file, conf, "border color", NULL, NULL );
+                top_border = g_key_file_get_boolean(img_key_file, conf, "top border", NULL);
+                bottom_border = g_key_file_get_boolean(img_key_file, conf, "bottom border", NULL);
+                border_width = g_key_file_get_integer(img_key_file, conf, "border width", NULL);
 
 				/* Get the mem address of the transition */
 				spath = (gchar *)g_hash_table_lookup( table, GINT_TO_POINTER( transition_id ) );
@@ -424,13 +505,13 @@
 				if( slide_info )
 				{
 					if( slide_filename )
-						img_set_slide_file_info( slide_info, slide_filename );
+						img_set_slide_file_info( slide_info, original_filename );
 					else
 						img_set_slide_gradient_info( slide_info, gradient,
 													 c_start, c_stop,
 													 p_start, p_stop );
 
-                    /* Handle lod errors */
+                    /* Handle load errors */
                     slide_info->load_ok = img_load_ok;
                     slide_info->original_filename = original_filename;
 
@@ -469,14 +550,24 @@
 					}
 
 					/* Set subtitle */
-					img_set_slide_text_info( slide_info, img->thumbnail_model,
-											 &iter, subtitle, anim_id,
-											 anim_duration, text_pos, placing,
-											 font_desc, font_color, font_bgcolor, img );
-
+					if (subtitle)
+					{
+						if ( pattern_name && g_path_is_absolute(pattern_name) == FALSE)
+						{
+							gchar *_pattern_filename;
+							_pattern_filename = g_strconcat(img->project_current_dir, "/", pattern_name, NULL);
+							g_free(pattern_name);
+							pattern_name = _pattern_filename;
+						}
+						img_set_slide_text_info( slide_info, img->thumbnail_model,
+												 &iter, subtitle, pattern_name, anim_id,
+												 anim_duration, posx, posy, subtitle_angle,
+												 font_desc, font_color, font_brdr_color, font_bg_color, border_color, 
+												 top_border, bottom_border, border_width, img );
+					}
 					/* If we're loading the first slide, apply some of it's
 				 	 * data to final pseudo-slide */
-					if( first_slide )
+					if( first_slide && img->bye_bye_transition)
 					{
 						first_slide = FALSE;
 						img->final_transition.speed  = slide_info->speed;
@@ -495,11 +586,9 @@
 
 			img_increase_progressbar(img, i);
 			g_free(slide_filename);
-			if (subtitle)
-				g_free(subtitle);
 			g_free(conf);
 		}
-	}
+	
 	img->slides_nr += previous_nr_of_slides;
 	img->distort_images = g_key_file_get_boolean( img_key_file,
 												  "slideshow settings",
@@ -518,6 +607,13 @@
 	{
 		dummy = g_strdup_printf("music_%d", i);
 		slide_filename = g_key_file_get_string(img_key_file, "music", dummy, NULL);
+		if ( g_path_is_absolute(slide_filename) == FALSE)
+		{
+			gchar *_slide_filename;
+			_slide_filename = g_strconcat(img->project_current_dir, "/", slide_filename, NULL);
+			g_free(slide_filename);
+			slide_filename = _slide_filename;
+		}
 		img_add_audio_files(slide_filename, img);
 
 		/* slide_filename is freed in img_add_audio_files */

imagination-3.0.tar.bz2/src/slideshow_project.h -> imagination-3.4.tar.bz2/src/slideshow_project.h Changed

imagination-3.0.tar.bz2/src/subtitles.c -> imagination-3.4.tar.bz2/src/subtitles.c Changed

@@ -1,4 +1,5 @@
 /*
+** Copyright (C) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
 ** Copyright (C) 2009 Tadej Borovšak <tadeboro@gmail.com>
 ** Copyright (C) 2010 Robert Chéramy <robert@cheramy.net>
 **  
@@ -20,9 +21,6 @@
 #include "subtitles.h"
 #include "support.h"
 
-/* Border width around image (no text is placed there) */
-#define BORDER 20
-
 /* Wrap width for subtitles (fraction of image size) */
 #define WRAP_WIDTH 0.75
 
@@ -30,15 +28,6 @@
  * Local declarations
  * ************************************************************************* */
 static void
-img_calc_text_pos( gint      surface_w,
-				   gint      surface_h,
-				   gint      layout_w,
-				   gint      layout_h,
-				   ImgSubPos position,
-				   gint     *posx,
-				   gint     *posy );
-
-static void
 img_text_ani_fade( cairo_t     *cr,
 				   PangoLayout *layout,
 				   gint         sw,
@@ -47,17 +36,31 @@
 				   gint         lh,
 				   gint         posx,
 				   gint         posy,
+				   gint         angle,
+				   gchar		*pattern_filename,
 				   gdouble      progress,
 				   gdouble     *font_color,
-				   gdouble     *font_bgcolor);
+				   gdouble     *font_brdr_color,
+				   gdouble     *font_bgcolor,
+				   gdouble     *border_color,
+				   gboolean		top_border,
+                   gboolean		bottom_border,
+                   gint			border_width);
 
 static void
 img_text_draw_layout( cairo_t     *cr,
                       PangoLayout *layout,
-                      gint posx,
-                      gint posy,
+                      gint			posx,
+                      gint 			posy,
+                      gint 			angle,
+                      gchar	  	  *pattern_filename,
                       gdouble     *font_color,
-                      gdouble     *font_bgcolor);
+                      gdouble     *font_brdr_color,
+                      gdouble     *font_bg_color,
+                      gdouble     *border_color,
+                      gboolean		top_border,
+                      gboolean		bottom_border,
+                      gint	      border_width);
 
 static void
 img_text_from_left( cairo_t     *cr,
@@ -68,9 +71,16 @@
  					gint         lh,
  					gint         posx,
  					gint         posy,
+ 					gint         angle,
+ 					gchar		*pattern_filename,
  					gdouble      progress,
                     gdouble     *font_color,
-                    gdouble     *font_bgcolor);
+                    gdouble     *font_brdr_color,
+                    gdouble     *font_bgcolor,
+                    gdouble     *border_color,
+                    gboolean	top_border,
+                    gboolean	bottom_border,
+                    gint	     border_width);
 
 static void
 img_text_from_right( cairo_t     *cr,
@@ -81,9 +91,16 @@
  					 gint         lh,
  					 gint         posx,
  					 gint         posy,
+ 					 gint         angle,
+ 					 gchar		*pattern_filename,
  					 gdouble      progress,
                      gdouble     *font_color,
-                     gdouble     *font_bgcolor);
+                     gdouble     *font_brdr_color,
+                     gdouble     *font_bgcolor,
+                     gdouble     *border_color,
+                     gboolean	top_border,
+                     gboolean	bottom_border,
+                     gint	      border_width);
 
 static void
 img_text_from_top( cairo_t     *cr,
@@ -94,10 +111,17 @@
 				   gint         lh,
 				   gint         posx,
 				   gint         posy,
+				   gint         angle,
+				   gchar		*pattern_filename,
 				   gdouble      progress,
                    gdouble     *font_color,
-                   gdouble     *font_bgcolor);
-
+                   gdouble     *font_brdr_color,
+                   gdouble     *font_bgcolor,
+                   gdouble     *border_color,
+                   gboolean		top_border,
+                   gboolean		bottom_border,
+                   gint	      border_width);
+                
 static void
 img_text_from_bottom( cairo_t     *cr,
 					  PangoLayout *layout,
@@ -107,9 +131,16 @@
   					  gint         lh,
   					  gint         posx,
   					  gint         posy,
+  					  gint         angle,
+  					  gchar			*pattern_filename,
   					  gdouble      progress,
                       gdouble     *font_color,
-                      gdouble     *font_bgcolor);
+                      gdouble     *font_brdr_color,
+                      gdouble     *font_bgcolor,
+                      gdouble     *border_color,
+                      gboolean		top_border,
+                      gboolean		bottom_border,
+                      gint	      border_width);
 
 static void
 img_text_grow( cairo_t     *cr,
@@ -120,11 +151,57 @@
 			   gint         lh,
 			   gint         posx,
 			   gint         posy,
-			   gdouble      progress,
-               gdouble     *font_color,
-               gdouble     *font_bgcolor);
+			   gint         angle,
+			   gchar		*pattern_filename,
+               gdouble      progress,
+			   gdouble     *font_color,
+               gdouble     *font_brdr_color,
+               gdouble     *font_bgcolor,
+               gdouble     *border_color,
+			   gboolean		top_border,
+               gboolean		bottom_border,
+               gint	      border_width);
+
+static void
+img_text_bottom_to_top( cairo_t     *cr,
+					PangoLayout *layout,
+ 					gint         sw,
+ 					gint         sh,
+ 					gint         lw,
+ 					gint         lh,
+ 					gint         posx,
+ 					gint         posy,
+ 					gint         angle,
+ 					gchar		*pattern_filename,
+ 					gdouble      progress,
+                    gdouble     *font_color,
+                    gdouble     *font_brdr_color,
+                    gdouble     *font_bgcolor,
+                    gdouble     *border_color,
+                    gboolean		top_border,
+                    gboolean		bottom_border,
+                    gint	      border_width);
 
-               
+static void
+img_text_right_to_left( cairo_t     *cr,
+					PangoLayout *layout,
+ 					gint         sw,
+ 					gint         sh,
+ 					gint         lw,
+ 					gint         lh,
+ 					gint         posx,
+ 					gint         posy,
+ 					gint         angle,
+ 					gchar		*pattern_filename,
+ 					gdouble      progress,
+                    gdouble     *font_color,
+                    gdouble     *font_brdr_color,
+                    gdouble     *font_bgcolor,
+                    gdouble     *border_color,
+                    gboolean		top_border,
+                    gboolean		bottom_border,
+                    gint	    border_width);
+                      
 /* ****************************************************************************
  * Function definitions
  * ************************************************************************* */
@@ -148,7 +225,7 @@
 img_get_text_animation_list( TextAnimation **animations )
 {
 	TextAnimation *list;              /* List of all animations */
-	gint           no_animations = 7; /* Number of animations */
+	gint           no_animations = 9; /* Number of animations */
 	gint           i = 0;
 
 	if( animations )
@@ -187,6 +264,14 @@
 		listi.id     = i;
 		listi++.func = img_text_grow;
 
+        listi.name   = g_strdup( _("Slide bottom to top") );
+        listi.id     = i;
+        listi++.func = img_text_bottom_to_top;
+
+        listi.name   = g_strdup( _("Slide right to left") );
+        listi.id     = i;
+        listi++.func = img_text_right_to_left;
+
 		/* FIXME: Add more animations here.
 		 *
 		 * DO NOT FORGET TO UPDATE no_animations VARIABLE AT THE TOP OF THIS
@@ -219,70 +304,54 @@
 }
 
 void
-img_render_subtitle( cairo_t              *cr,
+img_render_subtitle( img_window_struct 	  *img,
+					 cairo_t              *cr,
 					 gint                  width,
 					 gint                  height,
 					 gdouble               zoom,
-					 ImgSubPos             position,
-					 ImgRelPlacing         placing,
+					 gint				   posx,
+					 gint				   posy,
+					 gint				   angle,
 					 gdouble               factor,
 					 gdouble               offx,
 					 gdouble               offy,
 					 gchar                *subtitle,
+					 gchar                *pattern_filename,
 					 PangoFontDescription *font_desc,
 					 gdouble              *font_color,
-                     gdouble              *font_bgcolor,
+                     gdouble              *font_brdr_color,
+                     gdouble              *font_bg_color,
+                     gdouble              *border_color,
+                     gboolean				top_border,
+                     gboolean				bottom_border,
+                     gint	              border_width,
                      TextAnimationFunc     func,
+                     gboolean				centerX,
+                     gboolean				centerY,
 					 gdouble               progress )
 {
 	gint		 lw,     /* Layout width */
-				 lh,     /* Layout height */
-				 posx,   /* Final subtitle position */
-				 posy;
+				 lh;     /* Layout height */
+
 	PangoLayout *layout;
 
 	/* Save cairo state */
 	cairo_save( cr );
 
-	/* Transform cairo context to get proper text measurements */
-	if( placing == IMG_REL_PLACING_ORIGINAL_IMAGE )
-	{
-		cairo_scale( cr, factor * zoom, factor * zoom );
-		cairo_translate( cr, offx / factor, offy / factor );
-	}
-	else
-		cairo_scale( cr, zoom, zoom );
+	cairo_scale( cr, zoom, zoom );
 
 	/* Create pango layout and measure it */
 	layout = pango_cairo_create_layout( cr );
 	pango_layout_set_font_description( layout, font_desc );
+	
 	/* Disable wrapping
 	pango_layout_set_wrap( layout, PANGO_WRAP_WORD );
 	*/
-	switch( position )
-	{
-		case IMG_SUB_POS_TOP_LEFT:
-		case IMG_SUB_POS_MIDDLE_LEFT:
-		case IMG_SUB_POS_BOTTOM_LEFT:
-			pango_layout_set_alignment( layout, PANGO_ALIGN_LEFT );
-			break;
-			
-		case IMG_SUB_POS_TOP_CENTER:
-		case IMG_SUB_POS_MIDDLE_CENTER:
-		case IMG_SUB_POS_BOTTOM_CENTER:
-			pango_layout_set_alignment( layout, PANGO_ALIGN_CENTER );
-			break;
-			
-		case IMG_SUB_POS_TOP_RIGHT:
-		case IMG_SUB_POS_MIDDLE_RIGHT:
-		case IMG_SUB_POS_BOTTOM_RIGHT:
-			pango_layout_set_alignment( layout, PANGO_ALIGN_RIGHT );
-			break;
-	}
 	pango_layout_set_text( layout, subtitle, -1 );
 	pango_layout_get_size( layout, &lw, &lh );
 	lw /= PANGO_SCALE;
-
+	lh /= PANGO_SCALE;
+	
 	/* Disable wrapping
 	if( lw > ( width * WRAP_WIDTH ) )
 	{
@@ -291,18 +360,28 @@
 		lw /= PANGO_SCALE;
 	}
 	*/
-	lh /= PANGO_SCALE;
-
-	/* Calculate relative dimensions and final position of this subtitle */
-	img_calc_text_pos( width, height, lw, lh, position, &posx, &posy );
+	if (centerX)
+	{
+		posx = (img->video_size0 - lw) /2;
+		img->current_slide->posX = posx;
+		gtk_range_set_value( GTK_RANGE(img->sub_posX), (gdouble) img->current_slide->posX);
+	}
+	if (centerY)
+	{
+		posy = (img->video_size1 - lh) /2;
+		img->current_slide->posY = posy;
+		gtk_range_set_value( GTK_RANGE(img->sub_posY), (gdouble) img->current_slide->posY);
+	}
 
 	/* Do animation */
 	if( func )
-		(*func)( cr, layout, width, height, lw, lh, posx, posy, progress, font_color, font_bgcolor );
+		(*func)( cr, layout, width, height, lw, lh, posx, posy, angle, pattern_filename, progress, font_color, font_brdr_color, font_bg_color, border_color,
+				top_border, bottom_border, border_width );
 	else
 	{
 		/* No animation renderer */
-        img_text_draw_layout(cr, layout, posx, posy, font_color, font_bgcolor);
+        img_text_draw_layout(cr, layout, posx, posy, angle, pattern_filename, font_color, font_brdr_color, font_bg_color, border_color,
+        top_border, bottom_border, border_width);
 	}
 
 	/* Destroy layout */
@@ -312,65 +391,6 @@
 	cairo_restore( cr );
 }
 
-static void
-img_calc_text_pos( gint      surface_w,
-				   gint      surface_h,
-				   gint      layout_w,
-				   gint      layout_h,
-				   ImgSubPos position,
-				   gint     *posx,
-				   gint     *posy )
-{
-	switch( position )
-	{
-		case IMG_SUB_POS_TOP_LEFT:
-			*posx = BORDER;
-			*posy = BORDER;
-			break;
-
-		case IMG_SUB_POS_TOP_CENTER:
-			*posx = ( surface_w - layout_w ) / 2;
-			*posy = BORDER;
-			break;
-
-		case IMG_SUB_POS_TOP_RIGHT:
-			*posx = surface_w - BORDER - layout_w;
-			*posy = BORDER;
-			break;
-
-		case IMG_SUB_POS_MIDDLE_LEFT:
-			*posx = BORDER;
-			*posy = ( surface_h - layout_h ) / 2;
-			break;
-
-		case IMG_SUB_POS_MIDDLE_CENTER:
-			*posx = ( surface_w - layout_w ) / 2;
-			*posy = ( surface_h - layout_h ) / 2;
-			break;
-
-		case IMG_SUB_POS_MIDDLE_RIGHT:
-			*posx = surface_w - BORDER - layout_w;
-			*posy = ( surface_h - layout_h ) / 2;
-			break;
-
-		case IMG_SUB_POS_BOTTOM_LEFT:
-			*posx = BORDER;
-			*posy = surface_h - BORDER - layout_h;
-			break;
-
-		case IMG_SUB_POS_BOTTOM_CENTER:
-			*posx = ( surface_w - layout_w ) / 2;
-			*posy = surface_h - BORDER - layout_h;
-			break;
-
-		case IMG_SUB_POS_BOTTOM_RIGHT:
-			*posx = surface_w - BORDER - layout_w;
-			*posy = surface_h - BORDER - layout_h;
-			break;
-	}
-}
-
-
 /* ****************************************************************************
  * Text animation renderers
  * ************************************************************************* */
@@ -383,11 +403,18 @@
 				   gint         lh,
 				   gint         posx,
 				   gint         posy,
+				   gint         angle,
+				   gchar		*filename,
 				   gdouble      progress,
                    gdouble     *font_color,
-                   gdouble     *font_bgcolor)
+                   gdouble     *font_brdr_color,
+                   gdouble     *font_bgcolor,
+                   gdouble     *border_color,
+                   gboolean		top_border,
+                   gboolean		bottom_border,
+                   gint			border_width)
 {
-    gdouble  progress_font_color4, progress_font_bgcolor4;
+    gdouble  progress_font_color4, progress_font_brdr_color4, progress_font_bgcolor4, progress_border_color4;
 
 	/* Calculate colors */
     progress_font_color0 = font_color0;
@@ -395,49 +422,259 @@
     progress_font_color2 = font_color2;
     progress_font_color3 = font_color3 * progress;
 
+	progress_font_brdr_color0 = font_brdr_color0;
+    progress_font_brdr_color1 = font_brdr_color1;
+    progress_font_brdr_color2 = font_brdr_color2;
+    progress_font_brdr_color3 = font_brdr_color3 * pow(progress, 6);
+
     progress_font_bgcolor0 = font_bgcolor0;
     progress_font_bgcolor1 = font_bgcolor1;
     progress_font_bgcolor2 = font_bgcolor2;
     progress_font_bgcolor3 = font_bgcolor3 * pow(progress, 6);
+    
+    progress_border_color0 = border_color0;
+    progress_border_color1 = border_color1;
+    progress_border_color2 = border_color2;
+    progress_border_color3 = border_color3 * pow(progress, 6);
 
     /* Paint text */
-    img_text_draw_layout(cr, layout, posx, posy, progress_font_color, progress_font_bgcolor);
+    img_text_draw_layout(cr, layout, posx, posy, angle, filename, progress_font_color, progress_font_brdr_color, progress_font_bgcolor, progress_border_color, top_border, bottom_border, border_width);
 }
 
+void
+img_set_slide_text_info( slide_struct      *slide,
+						 GtkListStore      *store,
+						 GtkTreeIter       *iter,
+						 const gchar       *subtitle,
+						 gchar				*pattern_filename,
+						 gint	            anim_id,
+						 gint               anim_duration,
+						 gint               posx,
+						 gint               posy,
+						 gint               angle,
+						 const gchar       *font_desc,
+						 gdouble           *font_color,
+                         gdouble           *font_brdr_color,
+                         gdouble           *font_bg_color,
+                         gdouble           *border_color,
+                         gboolean			top_border,
+						 gboolean			bottom_border,
+                         gint	           border_width,
+						 img_window_struct *img )
+{
+	/* Set the slide text info parameters */
+	if( store && iter )
+	{
+		gboolean flag;
+
+		if( slide->subtitle )
+			g_free( slide->subtitle );
+		slide->subtitle = g_strdup( subtitle );
+		
+		if( slide->pattern_filename )
+			g_free( slide->pattern_filename );
+		slide->pattern_filename = g_strdup( pattern_filename );
+
+		flag = ( subtitle ? TRUE : FALSE );
+		gtk_list_store_set( store, iter, 3, flag, -1 );
+	}
+
+	if( ( anim_id > -1 ) && ( anim_id != slide->anim_id ) )
+	{
+		GtkTreeModel *model;
+		gchar        *path;
+		GtkTreeIter   iter;
+
+		path = g_strdup_printf( "%d", anim_id );
+		model = gtk_combo_box_get_model( GTK_COMBO_BOX( img->sub_anim ) );
+		gtk_tree_model_get_iter_from_string( model, &iter, path );
+		g_free( path );
+
+		slide->anim_id = anim_id;
+		gtk_tree_model_get( model, &iter, 1, &slide->anim, -1 );
+
+		/* Sync timings */
+		img_sync_timings( slide, img );
+	}
+
+	if( ( anim_duration > 0 ) && ( anim_duration != slide->anim_duration ) )
+	{
+		slide->anim_duration = anim_duration;
+
+		/* Synchronize timings */
+		img_sync_timings( slide, img );
+	}
+
+	if (posx > -1 || posy > -1)
+	{
+		slide->posX = posx;
+		slide->posY = posy;
+	}
+	
+	slide->subtitle_angle = angle;
+
+	if( font_desc )
+	{
+		if( slide->font_desc )
+			pango_font_description_free( slide->font_desc );
+		slide->font_desc = pango_font_description_from_string( font_desc );
+	}
+
+	if( font_color )
+	{
+		slide->font_color0 = font_color0;
+		slide->font_color1 = font_color1;
+		slide->font_color2 = font_color2;
+		slide->font_color3 = font_color3;
+	}
+
+    if( font_brdr_color )
+    {
+        slide->font_brdr_color0 = font_brdr_color0;
+        slide->font_brdr_color1 = font_brdr_color1;
+        slide->font_brdr_color2 = font_brdr_color2;
+        slide->font_brdr_color3 = font_brdr_color3;
+    }
+    
+    if( font_bg_color )
+    {
+        slide->font_bg_color0 = font_bg_color0;
+        slide->font_bg_color1 = font_bg_color1;
+        slide->font_bg_color2 = font_bg_color2;
+        slide->font_bg_color3 = font_bg_color3;
+    }
+    
+    if( border_color )
+    {
+        slide->border_color0 = border_color0;
+        slide->border_color1 = border_color1;
+        slide->border_color2 = border_color2;
+        slide->border_color3 = border_color3;
+    }
+    
+    slide->top_border = top_border;
+    slide->bottom_border = bottom_border;
+    
+	if( border_width > 0)
+		slide->border_width = border_width;
+}								
+
 static void
 img_text_draw_layout( cairo_t     *cr,
                       PangoLayout *layout,
                       gint         posx,
                       gint         posy,
+                      gint         angle,
+                      gchar	  	  *pattern_filename,
                       gdouble     *font_color,
-                      gdouble     *font_bgcolor)
+                      gdouble     *font_brdr_color,
+                      gdouble     *font_bg_color,
+                      gdouble     *border_color,
+                      gboolean		top_border,
+                      gboolean		bottom_border,
+                      gint			border_width)
 {
-    gint x,y;
-
-    /* Draw the background border */
-    cairo_set_source_rgba(cr, font_bgcolor0,
-                              font_bgcolor1,
-                              font_bgcolor2,
-                              font_bgcolor3 );
-    for (x=-1; x <=1; x++)
-    {
-        for (y=-1; y<=1; y++)
-        {
-            cairo_move_to( cr, posx + x, posy + y );
-            pango_cairo_show_layout( cr, layout );
-        }
-    }
+	cairo_pattern_t  *font_pattern = NULL;
+    gint x,y,w,h;
+	gdouble cairo_factor;
+
+	pango_layout_get_pixel_size (layout, &w, &h );
+	pango_layout_set_alignment( layout, PANGO_ALIGN_CENTER );
+
+	/* Subtitle angle */
+	cairo_translate (cr, posx + (w / 2), posy + (h / 2) );
+	cairo_rotate (cr, angle * G_PI / 180.0);
+	cairo_translate (cr, -(posx + (w / 2)), -(posy + (h / 2)) );
+	pango_cairo_update_layout (cr, layout);
+	
+	/* Paint the background only if the user
+	 * chose an alpha value greater than 0 */
+	if (font_bg_color3 > 0)
+	{
+		pango_layout_get_pixel_size (layout, &w, &h );
+		cairo_set_source_rgba(cr, font_bg_color0,
+							  font_bg_color1,
+                              font_bg_color2,
+                              font_bg_color3 );
+                              
+        cairo_rectangle(cr, posx - 5, posy, w + 12, h + 5);
+		cairo_fill(cr);
+	}
+	
+	if (top_border || bottom_border)
+	{
+		cairo_set_line_width(cr, (gdouble) border_width);
+		cairo_set_source_rgba(cr, border_color0,
+							  border_color1,
+                              border_color2,
+                              border_color3 );
+        
+        if (border_width % 2 == 0)
+			cairo_factor = 0;
+		else
+			cairo_factor = 0.5;
+
+        
+        if (top_border)
+		{
+			cairo_move_to(cr, posx - 5, posy + cairo_factor);  
+			cairo_line_to(cr, (posx + 3) + w + 4, posy + cairo_factor);
+		}
+		if (bottom_border)
+		{
+			cairo_move_to(cr, posx - 5, posy + h + 5 + cairo_factor);  
+			cairo_line_to(cr, (posx + 3) + w + 4, posy + h + 5 + cairo_factor);
+		}
+		cairo_stroke(cr);
+	}
+
+	/* Draw the border only if the user
+	 * chose an alpha value greater than 0 */
+	if (font_brdr_color3 > 0)
+	{
+		cairo_set_source_rgba(cr, font_brdr_color0,
+								  font_brdr_color1,
+								  font_brdr_color2,
+								  font_brdr_color3 );
+		for (x=-1; x <=1; x++)
+		{
+			for (y=-1; y<=1; y++)
+			{
+				cairo_move_to( cr, posx + x, posy + y );
+				pango_cairo_show_layout( cr, layout );
+			}
+		}
+	}
+	/* Set the user chosen pattern
+	 * to draw the subtitle */
+	if (pattern_filename)
+	{
+		cairo_surface_t  *tmp_surf;
+		cairo_matrix_t	matrix;
 
-    /* Draw the subtitle */
-    /* Set source color */
-    cairo_set_source_rgba( cr, font_color0,
-                               font_color1,
-                               font_color2,
-                               font_color3 );
+		tmp_surf = cairo_image_surface_create_from_png(pattern_filename);
+		font_pattern = cairo_pattern_create_for_surface(tmp_surf);
+		cairo_set_source(cr, font_pattern);
+		cairo_pattern_set_extend (font_pattern, CAIRO_EXTEND_REPEAT);
 
+		cairo_matrix_init_translate(&matrix, -posx, -posy);
+		cairo_pattern_set_matrix (font_pattern, &matrix);
+	}
+	else
+	{
+		/* Draw the subtitle */
+		/* Set source color */
+		cairo_set_source_rgba( cr, font_color0,
+								font_color1,
+								font_color2,
+								font_color3 );
+	}
     /* Move to proper place and paint text */
-    cairo_move_to( cr, posx, posy );
-    pango_cairo_show_layout( cr, layout );
+	cairo_move_to( cr, posx, posy );
+	pango_cairo_show_layout( cr, layout );
+	
+	if (pattern_filename)
+		cairo_pattern_destroy(font_pattern);
 }
 
 static void
@@ -449,14 +686,24 @@
  					gint         lh,
  					gint         posx,
  					gint         posy,
+ 					gint         angle,
+ 					gchar	  	*filename,
  					gdouble      progress,
                     gdouble     *font_color,
-                    gdouble     *font_bgcolor)
+                    gdouble     *font_brdr_color,
+                    gdouble     *font_bgcolor,
+                    gdouble     *border_color,
+                    gboolean	top_border,
+                    gboolean	bottom_border,
+                    gint		border_width)
 {
     img_text_draw_layout(cr, layout,
                          posx * progress - lw * ( 1 - progress ),
                          posy,
-                         font_color, font_bgcolor);
+                         angle,
+                         filename,
+                         font_color, font_brdr_color, font_bgcolor,
+                         border_color, top_border, bottom_border, border_width);
 }
 
 static void
@@ -468,14 +715,24 @@
  					 gint         lh,
  					 gint         posx,
  					 gint         posy,
+ 					 gint         angle,
+ 					 gchar	  	  *filename,
  					 gdouble      progress,
                      gdouble     *font_color,
-                     gdouble     *font_bgcolor)
+                     gdouble     *font_brdr_color,
+                     gdouble     *font_bgcolor,
+                     gdouble     *border_color,
+                     gboolean	top_border,
+                     gboolean	bottom_border,
+                    gint		border_width)
 {
     img_text_draw_layout(cr, layout,
                          posx * progress + sw * ( 1 - progress ),
                          posy,
-                         font_color, font_bgcolor);
+                         angle,
+                         filename,
+                         font_color, font_brdr_color, font_bgcolor,
+                         border_color, top_border, bottom_border, border_width);
 }
 
 static void
@@ -487,14 +744,24 @@
 				   gint         lh,
 				   gint         posx,
 				   gint         posy,
+				   gint         angle,
+				   gchar	    *filename,
 				   gdouble      progress,
                    gdouble     *font_color,
-                   gdouble     *font_bgcolor)
+                   gdouble     *font_brdr_color,
+                   gdouble     *font_bgcolor,
+                   gdouble     *border_color,
+                   gboolean	top_border,
+                   gboolean	bottom_border,
+                    gint		border_width)
 {
     img_text_draw_layout(cr, layout,
                          posx,
                          posy * progress - lh * ( 1 - progress ),
-                         font_color, font_bgcolor);
+                         angle,
+                         filename,
+                         font_color, font_brdr_color, font_bgcolor,
+                         border_color, top_border, bottom_border, border_width);
 }
 
 static void
@@ -506,14 +773,24 @@
   					  gint         lh,
   					  gint         posx,
   					  gint         posy,
+  					  gint         angle,
+  					  gchar	  	  *filename,
   					  gdouble      progress,
                       gdouble     *font_color,
-                      gdouble     *font_bgcolor)
+                      gdouble     *font_brdr_color,
+                      gdouble     *font_bgcolor,
+                      gdouble     *border_color,
+                      gboolean	top_border,
+                      gboolean	bottom_border,
+					  gint		border_width)
 {
     img_text_draw_layout(cr, layout,
                          posx,
                          posy * progress + sh * ( 1 - progress ),
-                         font_color, font_bgcolor);
+                         angle,
+                         filename,
+                         font_color, font_brdr_color, font_bgcolor,
+                        border_color, top_border, bottom_border, border_width);
 }
 
 static void
@@ -525,9 +802,16 @@
 			   gint         lh,
 			   gint         posx,
 			   gint         posy,
+			   gint         angle,
+			   gchar	    *filename,
 			   gdouble      progress,
                gdouble     *font_color,
-               gdouble     *font_bgcolor)
+               gdouble     *font_brdr_color,
+               gdouble     *font_bgcolor,
+               gdouble     *border_color,
+			   gboolean	top_border,
+               gboolean	bottom_border,
+			   gint		border_width)
 {
 	cairo_translate( cr, posx + lw * 0.5, posy + lh * 0.5 );
 	cairo_scale( cr, progress, progress );
@@ -535,6 +819,65 @@
     img_text_draw_layout(cr, layout,
                          - lw * 0.5,
                          - lh * 0.5,
-                         font_color, font_bgcolor);
+                         angle,
+                         filename,
+                         font_color, font_brdr_color, font_bgcolor,
+                         border_color, top_border, bottom_border, border_width);
 }
 
+static void
+img_text_bottom_to_top( cairo_t     *cr,
+				   PangoLayout *layout,
+				   gint         sw,
+				   gint         sh,
+				   gint         lw,
+				   gint         lh,
+				   gint         posx,
+				   gint         posy,
+				   gint         angle,
+				   gchar	   *filename,
+				   gdouble      progress,
+                   gdouble     *font_color,
+                   gdouble     *font_brdr_color,
+                   gdouble     *font_bgcolor,
+                   gdouble     *border_color,
+                    gboolean	top_border,
+                    gboolean	bottom_border,
+					gint		border_width)
+{
+    img_text_draw_layout(cr, layout,
+                         posx,
+                         sh * (1 - progress) - lh * progress,
+                         angle,
+                         filename,
+                         font_color, font_brdr_color, font_bgcolor,
+                         border_color, top_border, bottom_border, border_width);
+}
+
+static void
+img_text_right_to_left( cairo_t     *cr,
+				   PangoLayout *layout,
+				   gint         sw,
+				   gint         sh,
+				   gint         lw,
+				   gint         lh,
+				   gint         posx,
+				   gint         posy,
+				   gint         angle,
+				   gchar	  *filename,
+				   gdouble      progress,
+                   gdouble     *font_color,
+                   gdouble     *font_brdr_color,
+                   gdouble     *font_bgcolor,
+                   gdouble     *border_color,
+                   gboolean	top_border,
+                   gboolean	bottom_border,
+				   gint		border_width)
+{
+    img_text_draw_layout(cr, layout,
+                         sw * (1 - progress) - lw * progress,
+                         posy, angle,
+                         filename,
+                         font_color, font_brdr_color, font_bgcolor,
+                         border_color, top_border, bottom_border, border_width);
+}

imagination-3.0.tar.bz2/src/subtitles.h -> imagination-3.4.tar.bz2/src/subtitles.h Changed

@@ -40,19 +40,51 @@
 							  TextAnimation *animations );
 
 void
-img_render_subtitle( cairo_t              *cr,
+img_render_subtitle( img_window_struct	  *img,
+					 cairo_t              *cr,
 					 gint                  width,
 					 gint                  height,
 					 gdouble               zoom,
-					 ImgSubPos             position,
-					 ImgRelPlacing         placing,
+					 gint					posx,
+					 gint					posy,
+					 gint					angle,
 					 gdouble               factor,
 					 gdouble               offx,
 					 gdouble               offy,
 					 gchar                *subtitle,
+					 gchar                *pattern_filename,
 					 PangoFontDescription *font_desc,
 					 gdouble              *font_color,
-                     gdouble              *font_bgcolor,
+					 gdouble              *font_brdr_color,
+                     gdouble              *font_bg_color,
+                     gdouble              *border_color,
+                     gboolean				top_border,
+                     gboolean				bottom_border,
+                     gint	              border_width,
 					 TextAnimationFunc     func,
+					 gboolean				centerX,
+					 gboolean				centerY,
 					 gdouble               progress );
+
+void
+img_set_slide_text_info( slide_struct      *slide,
+						 GtkListStore      *store,
+						 GtkTreeIter       *iter,
+						 const gchar       *subtitle,
+						 gchar		       *pattern_filename,
+						 gint	            anim_id,
+						 gint               anim_duration,
+						 gint               posx,
+						 gint               posy,
+						 gint               angle,
+						 const gchar       *font_desc,
+						 gdouble           *font_color,
+                         gdouble           *font_brdr_color,
+                         gdouble           *font_bgcolor,
+                         gdouble           *border_color,
+                         gboolean			top_border,
+						 gboolean			bottom_border,
+                         gint	           border_width,
+						 img_window_struct *img );
+
 #endif

imagination-3.0.tar.bz2/src/support.c -> imagination-3.4.tar.bz2/src/support.c Changed

@@ -1,5 +1,6 @@
 /*
- *  Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (c) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (c) 2011 Robert Chéramy   <robert@cheramy.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,8 +19,11 @@
  */
 
 #include "support.h"
+#include "audio.h"
+#include "video_formats.h"
 #include <glib/gstdio.h>
 
+extern gchar *img_get_audio_filetype(gchar *);
 static gboolean img_plugin_is_loaded(img_window_struct *, GModule *);
 
 GtkWidget *img_load_icon(gchar *filename, GtkIconSize size)
@@ -311,13 +315,14 @@
 	return (g_slist_find(img->plugin_list,module) != NULL);
 }
 
-void img_show_file_chooser(SexyIconEntry *entry, SexyIconEntryPosition icon_pos,int button,img_window_struct *img)
+void img_show_file_chooser(GtkWidget *entry, GtkEntryIconPosition icon_pos,int button,img_window_struct *img)
 {
 	GtkWidget *file_selector;
 	gchar *dest_dir;
 	gint response;
     GtkFileFilter *video_filter, *all_files_filter;
     gchar *file_extention, *dot_position, *proposed_filename, *file_basename, *stripped_filename;
+    gint i;
 
 	file_selector = gtk_file_chooser_dialog_new (_("Please choose the slideshow project filename"),
 							GTK_WINDOW (img->imagination_window),
@@ -330,39 +335,22 @@
 
     /* only video files filter */
     video_filter = gtk_file_filter_new ();
-    switch (img->video_format)
+
+    gtk_file_filter_set_name (video_filter,
+                video_format_listimg->video_format_index.name);
+
+    i = 0;
+    while (video_format_listimg->video_format_index.file_extensionsi != NULL)
     {
-        default:
-        case 'V':
-        gtk_file_filter_set_name (video_filter, _("VOB (DVD video)") );
-        gtk_file_filter_add_pattern (video_filter, "*.vob");
-        file_extention = ".vob";
-        break;
-
-        case 'M':
-        gtk_file_filter_set_name (video_filter, _("MP4 (MPEG-4)") );
-        gtk_file_filter_add_pattern (video_filter, "*.mp4");
-        file_extention = ".mp4";
-        break;
-
-        case 'O':
-        gtk_file_filter_set_name (video_filter, _("OGV (Theora/Vorbis)") );
-        gtk_file_filter_add_pattern (video_filter, "*.ogv");
-        file_extention = ".ogv";
-        break;
-
-        case 'F':
-        gtk_file_filter_set_name (video_filter, _("FLV (Flash video)") );
-        gtk_file_filter_add_pattern (video_filter, "*.flv");
-        file_extention = ".flv";
-        break;
-
-        case '3':
-        gtk_file_filter_set_name (video_filter, _("3GP (Mobile Phones)") );
-        gtk_file_filter_add_pattern (video_filter, "*.3gp");
-        file_extention = ".3gp";
-        break;
+        file_extention = g_strconcat("*",
+                video_format_listimg->video_format_index.file_extensionsi,
+                                     NULL);
+        gtk_file_filter_add_pattern (video_filter, file_extention);
+        g_free(file_extention);
+        i++;
     }
+    file_extention = video_format_listimg->video_format_index.file_extensions0;
+
     gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_selector), video_filter);
 
     /* All files filter */
@@ -389,15 +377,14 @@
         g_free(stripped_filename);
     }
     else
-    {
         proposed_filename = g_strjoin(NULL, "unknown", file_extention, NULL);
-    }
+ 
     gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (file_selector), proposed_filename);
     g_free(proposed_filename);
 
     /* set current dir to the project current dir */
     if (img->project_current_dir)
-        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_selector),img->project_current_dir);
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_selector),img->project_current_dir);
 
 	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (file_selector),TRUE);
 	response = gtk_dialog_run (GTK_DIALOG(file_selector));
@@ -419,7 +406,7 @@
 	if( slide )
 	{
 		/* Still part */
-		slide->duration = 1;
+		slide->duration = 1.0;
 
 		/* Transition */
 		slide->path = g_strdup( "0" );
@@ -431,19 +418,31 @@
 
 		/* Subtitles */
 		slide->anim_duration = 1;
-		slide->position = IMG_SUB_POS_MIDDLE_CENTER;
-		slide->placing = IMG_REL_PLACING_EXPORTED_VIDEO;
+		slide->posX = 0;
+		slide->posY = 1;
 		slide->font_desc = pango_font_description_from_string( "Sans 12" );
 		slide->font_color0 = 0; /* R */
 		slide->font_color1 = 0; /* G */
 		slide->font_color2 = 0; /* B */
 		slide->font_color3 = 1; /* A */
-		/* default: no font color background */
-        slide->font_bgcolor0 = 1; /* R */
-        slide->font_bgcolor1 = 1; /* G */
-        slide->font_bgcolor2 = 1; /* B */
-        slide->font_bgcolor3 = 1; /* A */
-        
+		/* default: no font color border */
+        slide->font_brdr_color0 = 1; /* R */
+        slide->font_brdr_color1 = 1; /* G */
+        slide->font_brdr_color2 = 1; /* B */
+        slide->font_brdr_color3 = 1; /* A */
+        /* default: no font background color */
+        slide->font_bg_color0 = 1; /* R */
+        slide->font_bg_color1 = 1; /* G */
+        slide->font_bg_color2 = 1; /* B */
+        slide->font_bg_color3 = 0; /* A */
+        /* default: no font border color */
+        slide->border_color0 = 1; /* R */
+        slide->border_color1 = 1; /* G */
+        slide->border_color2 = 1; /* B */
+        slide->border_color3 = 0; /* A */
+
+		slide->border_width = 1;
+
         /* Load error handling */
         slide->load_ok = TRUE;
         slide->original_filename = NULL;
@@ -493,9 +492,45 @@
 	}
 }
 
+GdkPixbuf *img_set_fade_gradient(img_window_struct *img, gint gradient, slide_struct *slide_info)
+{
+	GdkPixbuf		*pix = NULL;
+	GtkTreeIter 	iter;
+	GtkTreeModel 	*model;
+	gpointer     	address;
+
+	if (gradient == 3)
+	{
+		model = gtk_combo_box_get_model( GTK_COMBO_BOX( img->transition_type ) );
+		/* 10:0 is the path string pointing to the Cross Fade transition */
+		gtk_tree_model_get_iter_from_string( model, &iter, "10:0" );
+		gtk_tree_model_get( model, &iter, 0, &pix,
+										  2, &address,
+										 -1 );
+		slide_info->transition_id = 19;
+		slide_info->render = address;
+		if (slide_info->path)
+		{
+			g_free(slide_info->path);
+			slide_info->path = g_strdup("10:0");
+		}
+	}
+	else
+	{
+		if (slide_info->path)
+		{
+			g_free(slide_info->path);
+			slide_info->path = g_strdup("0");
+		}
+		slide_info->transition_id = -1;
+		slide_info->render = NULL;
+	}
+	return pix;
+}
+
 void
 img_set_slide_still_info( slide_struct      *slide,
-						  gint               duration,
+						  gdouble           duration,
 						  img_window_struct *img )
 {
 	if( slide->duration != duration )
@@ -581,101 +616,24 @@
 }
 
 void
-img_set_slide_text_info( slide_struct      *slide,
-						 GtkListStore      *store,
-						 GtkTreeIter       *iter,
-						 const gchar       *subtitle,
-						 gint	            anim_id,
-						 gint               anim_duration,
-						 gint               position,
-						 gint               placing,
-						 const gchar       *font_desc,
-						 gdouble           *font_color,
-                         gdouble           *font_bgcolor,
-						 img_window_struct *img )
-{
-	/* Set the slide text info parameters */
-	if( store && iter )
-	{
-		gboolean flag;
-
-		if( slide->subtitle )
-			g_free( slide->subtitle );
-		slide->subtitle = g_strdup( subtitle );
-
-		flag = ( subtitle ? TRUE : FALSE );
-		gtk_list_store_set( store, iter, 3, flag, -1 );
-	}
-
-	if( ( anim_id > -1 ) && ( anim_id != slide->anim_id ) )
-	{
-		GtkTreeModel *model;
-		gchar        *path;
-		GtkTreeIter   iter;
-
-		path = g_strdup_printf( "%d", anim_id );
-		model = gtk_combo_box_get_model( GTK_COMBO_BOX( img->sub_anim ) );
-		gtk_tree_model_get_iter_from_string( model, &iter, path );
-		g_free( path );
-
-		slide->anim_id = anim_id;
-		gtk_tree_model_get( model, &iter, 1, &slide->anim, -1 );
-
-		/* Sync timings */
-		img_sync_timings( slide, img );
-	}
-
-	if( ( anim_duration > 0 ) && ( anim_duration != slide->anim_duration ) )
-	{
-		slide->anim_duration = anim_duration;
-
-		/* Synchronize timings */
-		img_sync_timings( slide, img );
-	}
-
-	if( ( position > -1 ) && ( position != slide->position ) )
-		slide->position = position;
-
-	if( ( placing > -1 ) && ( placing != slide->placing ) )
-		slide->placing = placing;
-
-	if( font_desc )
-	{
-		if( slide->font_desc )
-			pango_font_description_free( slide->font_desc );
-		slide->font_desc = pango_font_description_from_string( font_desc );
-	}
-
-	if( font_color )
-	{
-		slide->font_color0 = font_color0;
-		slide->font_color1 = font_color1;
-		slide->font_color2 = font_color2;
-		slide->font_color3 = font_color3;
-	}
-
-    if( font_bgcolor )
-    {
-        slide->font_bgcolor0 = font_bgcolor0;
-        slide->font_bgcolor1 = font_bgcolor1;
-        slide->font_bgcolor2 = font_bgcolor2;
-        slide->font_bgcolor3 = font_bgcolor3;
-    }
-}								
-
-void
 img_free_slide_struct( slide_struct *entry )
 {
 	GList *tmp;
 
 	if( entry->angle != ANGLE_0 )
 		g_unlink( entry->r_filename );
+
 	g_free(entry->o_filename);
 	g_free(entry->r_filename);
     g_free(entry->original_filename);
 	g_free(entry->resolution);
 	g_free(entry->type);
 	
+	if (entry->subtitle)
+		g_free(entry->subtitle);
+	if (entry->pattern_filename)
+		g_free(entry->pattern_filename);
+	
 	/* Free stop point list */
 	for( tmp = entry->points; tmp; tmp = g_list_next( tmp ) )
 		g_slice_free( ImgStopPoint, tmp->data );
@@ -708,11 +666,11 @@
 		while( gtk_tree_model_iter_next( model, &iter ) );
 
 		/* Add time of last pseudo slide */
-		if( img->final_transition.render )
+		if( img->final_transition.render && img->bye_bye_transition)
 			img->total_secs += img->final_transition.speed;
 	}
-		
-	time = img_convert_seconds_to_time(img->total_secs);
+	img->total_secs = ceil(img->total_secs);
+	time = img_convert_seconds_to_time((gint)img->total_secs);
 	gtk_label_set_text(GTK_LABEL (img->total_time_data),time);
 	g_free(time);
 
@@ -784,8 +742,10 @@
 	gdouble min_skew = ( 1 - max_stretch ) * max_crop;
 
 	/* Obtain information about image being loaded */
-	if( ! gdk_pixbuf_get_file_info( filename, &i_width, &i_height ) )
-		return( FALSE );
+	if (filename)
+		gdk_pixbuf_get_file_info( filename, &i_width, &i_height );
+	else
+		return FALSE;
 
 	/* How distorted images would be if we scaled them */
 	i_ratio = (gdouble)i_width / i_height;
@@ -1008,10 +968,6 @@
 		gtk_spin_button_set_value( GTK_SPIN_BUTTON( img->ken_duration ),
 								   point->time );
 	}
-
-	/* Update display */
-	gtk_spin_button_set_value( GTK_SPIN_BUTTON( img->duration ),
-							   slide->anim_duration );
 }
 
 void img_select_nth_slide(img_window_struct *img, gint slide_to_select)
@@ -1086,7 +1042,7 @@
 
 	switch( gradient )
 	{
-		case 0: /* Solid color */
+		case 0: case 3: /* Solid and gradient fade */
 			cairo_set_source_rgb( cr, c_start0, c_start1, c_start2 );
 			cairo_paint( cr );
 			break;
@@ -1164,6 +1120,8 @@
         gtk_text_buffer_insert(img->message_buffer, &message_end,
                                parsed_message, -1);
 
+        printf ("%s",parsed_message);
+
         free(parsed_message);
 
         if (alert_user)
@@ -1176,3 +1134,183 @@
         }
 
 }
+
+void
+img_check_for_encoder(img_window_struct *img)
+{
+	gchar *name = NULL;
+
+	name = g_find_program_in_path("ffmpeg");
+	if (name == NULL)
+	{
+		img_message(img, TRUE, "Using avconv for encoding.\n");
+		img->encoder_name = g_strdup("avconv");
+	}
+	else
+	{
+		img_message(img, TRUE, "Using ffmpeg for encoding.\n");
+		img->encoder_name = name;
+	} 
+}
+
+void img_delete_subtitle_pattern(GtkButton *button, img_window_struct *img)
+{
+	slide_struct 	*slide = img->current_slide;
+	GdkPixbuf 		*pixbuf;
+	GtkWidget		*tmp_image,*fc;
+	GtkIconTheme	*icon_theme;
+
+	if (slide->pattern_filename)
+	{
+		g_free(slide->pattern_filename);
+		slide->pattern_filename = NULL;
+	}
+	icon_theme = gtk_icon_theme_get_default();
+	pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 20, 0, NULL);
+	tmp_image = gtk_image_new_from_pixbuf(pixbuf);
+	gtk_widget_show(tmp_image);
+	g_object_unref(pixbuf);
+	
+	gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(img->pattern_image), tmp_image);
+	gtk_widget_set_sensitive(img->sub_color, TRUE);
+	gtk_widget_set_tooltip_text(img->sub_color, _("Click to choose the font color"));
+
+	fc = gtk_widget_get_toplevel(GTK_WIDGET(button));
+	gtk_widget_destroy(fc);
+	gtk_widget_queue_draw( img->image_area );
+}
+
+void img_preview_with_music(img_window_struct *img, gint offset)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	gchar	*cmd_line, *path, *filename, *file, *time;
+	gchar 	**argv;
+	gint argc, selected_slide_number, count = 0;
+	gboolean ret;
+
+	model = gtk_tree_view_get_model( GTK_TREE_VIEW( img->music_file_treeview ) );
+	if( ! gtk_tree_model_get_iter_first( model, &iter ) )
+		return;
+
+	gtk_tree_model_get(GTK_TREE_MODEL(img->music_file_liststore), &iter, 0, &path, 1, &filename, -1);
+
+	file = g_build_filename(path, filename, NULL);
+	g_free(path);
+	g_free(filename);
+
+	path = g_shell_quote( file );
+
+	if (offset > 0)
+	{
+		/* User started the preview NOT from
+		 * first slide, let's calculate the
+		 * total time from the first slide
+		 * up the one before the selected one */
+		 
+		GList *selected;
+		GtkTreeIter iter;
+		GtkTreeIter next_iter;
+		GtkTreeModel *model;
+		slide_struct *info_slide;
+
+		offset = 0;
+		model = GTK_TREE_MODEL( img->thumbnail_model );
+		selected = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(img->active_icon));
+
+		if (selected == NULL)
+			return;
+
+		selected_slide_number = gtk_tree_path_get_indices(selected->data)0;
+
+		gtk_tree_model_get_iter_first(model, &iter);
+		gtk_tree_model_get(model, &iter,1,&info_slide,-1);
+		
+		offset = (gint) (info_slide->speed + info_slide->duration); 
+		gtk_tree_model_get_iter_first(model, &next_iter);
+		
+		while( count < selected_slide_number - 1)
+		{
+			gtk_tree_model_iter_next( model, &next_iter);
+			gtk_tree_model_get(model, &next_iter, 1 , &info_slide, -1);
+			offset += (gint) (info_slide->speed + info_slide->duration);
+			count++;
+		}
+
+		time = img_convert_seconds_to_time(offset);
+		cmd_line = g_strdup_printf("play -t %s %s trim %s", img_get_audio_filetype(file), path, time);
+		g_free(time);
+	}
+	else
+		cmd_line = g_strdup_printf("play -t %s %s", img_get_audio_filetype(file), path);
+	g_free( path );
+	g_free( file );
+
+	g_shell_parse_argv (cmd_line, &argc, &argv, NULL);
+
+	ret = g_spawn_async_with_pipes( NULL, argv, NULL,
+									G_SPAWN_SEARCH_PATH | 
+									G_SPAWN_DO_NOT_REAP_CHILD |
+									G_SPAWN_STDOUT_TO_DEV_NULL |
+									G_SPAWN_STDERR_TO_DEV_NULL,
+									NULL, NULL, &img->play_child_pid, NULL, NULL, NULL, NULL );
+
+	/* Free argument vector */
+	g_strfreev( argv );
+	
+	/* Let's connect a callback when the first audio file playing ends
+	 * and if there is another audio to be reproduced */
+	if ( ret && gtk_tree_model_iter_next( model, &iter) )
+    {
+		img->next_audio_iter = iter;
+		img->audio_source_id = g_child_watch_add(img->play_child_pid, (GChildWatchFunc) img_play_next_audio_during_preview, img);
+	}
+
+}
+
+void img_play_next_audio_during_preview (GPid pid, gint status, img_window_struct *img)
+{
+	GtkTreeModel *model;
+	gchar	*cmd_line, *path, *filename, *file;
+	gchar 	**argv;
+	gint argc;
+	gboolean ret;
+
+	g_spawn_close_pid( img->play_child_pid );
+	kill (img->play_child_pid, SIGINT);
+
+	gtk_tree_model_get(GTK_TREE_MODEL(img->music_file_liststore), &img->next_audio_iter, 0, &path, 1, &filename, -1);
+
+	file = g_build_filename(path, filename, NULL);
+	g_free(path);
+	g_free(filename);
+
+	path = g_shell_quote( file );
+
+	cmd_line = g_strdup_printf("play -t %s %s", img_get_audio_filetype(file), path);
+	g_free( path );
+	g_free( file );
+
+	g_shell_parse_argv (cmd_line, &argc, &argv, NULL);
+
+	ret = g_spawn_async_with_pipes( NULL, argv, NULL,
+									G_SPAWN_SEARCH_PATH | 
+									G_SPAWN_DO_NOT_REAP_CHILD |
+									G_SPAWN_STDOUT_TO_DEV_NULL |
+									G_SPAWN_STDERR_TO_DEV_NULL,
+									NULL, NULL, &img->play_child_pid, NULL, NULL, NULL, NULL );
+	
+	model = gtk_tree_view_get_model( GTK_TREE_VIEW( img->music_file_treeview ) );
+	
+	if (ret && img->music_preview &&
+			gtk_tree_model_iter_next( model, &img->next_audio_iter ) )
+		img->audio_source_id = g_child_watch_add(img->play_child_pid, (GChildWatchFunc) img_play_next_audio_during_preview, img);
+}
+
+void img_save_relative_filenames(GtkCheckButton *togglebutton, img_window_struct *img)
+{
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(togglebutton)))
+		img->relative_filenames = TRUE;
+	else
+		img->relative_filenames = FALSE;
+}

imagination-3.0.tar.bz2/src/support.h -> imagination-3.4.tar.bz2/src/support.h Changed

@@ -1,5 +1,6 @@
 /*
- *  Copyright (c) 2009 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (c) 2009-2018 Giuseppe Torelli <colossus73@gmail.com>
+ *  Copyright (c) 2011 Robert Chéramy   <robert@cheramy.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
 #ifndef __IMAGINATION_SUPPORT_H
 #define __IMAGINATION_SUPPORT_H
 
-#define PLUGINS_INSTALLED 0
+#define PLUGINS_INSTALLED 1
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -31,7 +32,6 @@
 #include <unistd.h>
 #include <math.h>
 #include "imagination.h"
-#include "sexy-icon-entry.h"
 #include "imgcellrendereranim.h"
 
 #ifdef ENABLE_NLS
@@ -52,8 +52,11 @@
 GtkWidget *_gtk_combo_box_new_text(gint);
 void img_set_statusbar_message(img_window_struct *, gint);
 void img_load_available_transitions(img_window_struct *);
-void img_show_file_chooser(SexyIconEntry *, SexyIconEntryPosition, int, img_window_struct *);
+void img_show_file_chooser(GtkWidget *, GtkEntryIconPosition, int, img_window_struct *);
 void img_select_nth_slide(img_window_struct *, gint);
+void img_delete_subtitle_pattern(GtkButton *button, img_window_struct *img);
+void img_preview_with_music(img_window_struct *img, gint offset);
+void img_play_next_audio_during_preview (GPid pid, gint status, img_window_struct *img);
 
 slide_struct *
 img_create_new_slide( void );
@@ -70,9 +73,12 @@
 							 gdouble      *start_point,
 							 gdouble      *stop_point );
 
+GdkPixbuf *img_set_fade_gradient(	img_window_struct *img,
+							gint gradient,
+							slide_struct *slide_info);
 void
 img_set_slide_still_info( slide_struct      *slide,
-						  gint               duration,
+						  gdouble           duration,
 						  img_window_struct *img );
 
 void
@@ -92,22 +98,9 @@
 							  gsize         length,
 							  gdouble      *points );
 
-void
-img_set_slide_text_info( slide_struct      *slide,
-						 GtkListStore      *store,
-						 GtkTreeIter       *iter,
-						 const gchar       *subtitle,
-						 gint	            anim_id,
-						 gint               anim_duration,
-						 gint               position,
-						 gint               placing,
-						 const gchar       *font_desc,
-						 gdouble           *font_color,
-                         gdouble           *font_bgcolor,
-						 img_window_struct *img );
-
 void img_free_slide_struct( slide_struct * );
 
+void img_save_relative_filenames(GtkCheckButton *togglebutton, img_window_struct *img);
 
 gboolean
 img_set_total_slideshow_duration( img_window_struct *img );
@@ -153,4 +146,7 @@
              gboolean alert_user,
              gchar *message, ...);
 
+void
+img_check_for_encoder(img_window_struct *img);
+
 #endif

imagination-3.4.tar.bz2/src/video_formats.c Added

@@ -0,0 +1,234 @@
+/*
+ *  Copyright (c) 2011 Robert Chéramy   <robert@cheramy.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License,or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not,write to the Free Software
+ *  Foundation,Inc.,59 Temple Place - Suite 330,Boston,MA 02111-1307,USA.
+ *
+ */
+
+/**** How to add a new video format ***
+Adding a new video format is quite easy: you have to add an entry to video_format_lists.
+This entry includes:
+gchar *name;                The name of the video format. As it will be
+                            displayed in the UI, wrap it with gettext_noop
+gchar *config_name;         The name to use to store it in the project file.
+gchar *ffmpeg_option;       The options (NOT Size/Aspect Ratio/Bitrate/FPS)
+                            you have to give ffmpeg to produce a video in this format.
+struct video_size *sizelist;                A list of Available video sizes for this
+                                            format (mandatory).
+struct aspect_ratio *aspect_ratio_list;     A list of Available aspect ratios for
+                                            this format or NULL if not needed.
+struct video_bitrate *bitratelist;          A list of Bitrates available for this
+                                            format or NULL if not needed.
+struct video_fps *fps_list;                 A list of Frames per second available
+                                            for this format (mandatory)
+gchar **file_extensions;                    A list of file extensions used by this format,
+                                            the first one is the default one.
+
+Lists must be defined separatly and end with the attribute name = NULL.
+
+Have fun !
+*/
+
+#include "video_formats.h"
+#include "support.h"
+/* As you cant use gettext in the video format declaration,
+    we use gettext_noop to mark them,
+    and explicitly call gettext when using the strings. */
+#define gettext_noop(string) string
+
+/* Define video formats */
+struct aspect_ratio aspect_ratio_list = {
+    {"Old TV 4:3", "4/3"},
+    {"New TV 16:9", "16/9"},
+    {NULL}
+};
+
+struct video_size VOB_size_list = {
+    /* name, x, y, fps, ratio. bitrate, */
+    {"720 x 576 PAL",   720,  576,   0, -1, -1},
+    {"720 x 480 NTSC",  720,  480,   1, -1, -1},
+    {"1280 x 720 HD",  1280,  720,  -1, -1, -1},
+    {"1920 x 1080 HD", 1920, 1080,  -1, -1, -1},
+    {NULL}
+};
+
+struct video_fps VOB_fps_list = {
+    {"25 (PAL)", "25 -target pal-dvd", 25},
+    {"30 (NTSC)", "30000/1001 -target ntsc-dvd", 30000/1001},
+    {NULL}
+};
+
+gchar *VOB_extensions = {
+    ".vob",
+    ".mpg",
+    NULL
+};
+
+struct video_size OGV_size_list = {
+    {"320 x 240 4:3",   320, 240, -1,  0, 1},
+    {"400 x 300",       400, 300, -1, -1, 1},
+    {"512 x 384",       512, 384, -1, -1, 1},
+    {"640 x 480",       640, 480, -1, -1, 1},
+    {"800 x 600",       800, 600, -1, -1, 1},
+    {"320 x 180 16:9",  320, 180, -1,  1, 1},
+    {"400 x 225",       400, 225, -1, -1, 1},
+    {"512 x 288",       512, 288, -1, -1, 1},
+    {"640 x 360",       640, 360, -1, -1, 1},
+    {"854 x 480",       854, 480, -1, -1, 1},
+    {NULL}
+};
+
+struct video_bitrate OGV_bitrate_list = {
+    {gettext_noop("512 kbps (low)"), "512k"},
+    {gettext_noop("1024 kbps (medium)"), "1024k"},
+    {gettext_noop("2048 kbps (high)"), "2048k"},
+    {NULL}
+};
+
+struct video_fps OGV_fps_list = {
+    {"30", "30", 30},
+    {NULL}
+};
+
+gchar *OGV_extensions = {
+    ".ogv",
+    NULL
+};
+
+struct video_size FLV_size_list = {
+    {"320 x 240 4:3",   320, 240, -1,  0, 1},
+    {"400 x 300",       400, 300, -1, -1, 1},
+    {"512 x 384",       512, 384, -1, -1, 1},
+    {"640 x 480",       640, 480, -1, -1, 1},
+    {"800 x 600",       800, 600, -1, -1, 1},
+    {"320 x 180 16:9",  320, 180, -1,  1, 1},
+    {"400 x 225",       400, 225, -1, -1, 1},
+    {"512 x 288",       512, 288, -1, -1, 1},
+    {"640 x 360",       640, 360, -1, -1, 1},
+    {"854 x 480",       854, 480, -1, -1, 1},
+    {NULL}
+};
+
+struct video_bitrate FLV_bitrate_list = {
+    {gettext_noop("384 kbps (low)"), "384k"},
+    {gettext_noop("768 kbps (medium)"), "768k"},
+    {gettext_noop("1536 kbps (high)"), "1536k"},
+    {NULL}
+};
+
+gchar *FLV_extensions = {
+    ".flv",
+    NULL
+};
+
+struct video_size x3GP_size_list = {
+    {"128 x 96",     128,   96, -1, -1, -1},
+    {"176 x 144",    176,  144, -1, -1, -1},
+    {"352 x 288",    352,  288, -1, -1, -1},
+    {"704 x 576",    704,  576, -1, -1, -1},
+    {"1408 x 1152", 1408, 1153, -1, -1, -1},
+    {NULL}
+};
+
+struct video_fps x3GP_fps_list = {
+    {"25", "25", 25},
+    {NULL}
+};
+
+gchar *x3GP_extensions = {
+    ".3gp",
+    NULL
+};
+
+/* x264 */
+struct video_size x264_size_list = {
+    {"HD 852x480",      852,    480, -1, -1, -1},
+    {"HD 1280x720",    1280,    720, -1, -1, -1},
+    {"HD 1440x1080",   1440,   1080, -1, -1, -1},
+    {"HD 1920x1080",   1920,   1080, -1, -1, -1},
+    {NULL}
+};
+
+struct video_fps x264_fps_list = {
+    {"25 (PAL)", "25", 25},
+    {"30 (NTSC)", "30000/1001", 30000/1001},
+    {NULL}
+};
+
+struct video_bitrate x264_bitrate_list = {
+    {"1500 kbps", "1500k"},
+    {"3000 kbps", "3000k"},
+    {"5000 kbps", "5000k"},
+    {"7000 kbps", "7000k"},
+    {"9000 kbps", "9000k"},
+    {"10000 kbps", "10000k"},
+    {"12000 kbps", "12000k"},
+    {NULL}
+};
+
+gchar *x264_extensions = {
+    ".mp4",
+    ".mkv",
+    NULL
+};
+
+struct video_format video_format_list = {
+    /* name, config_name, video_format, ffmpeg_option, sizelist,
+            aspect_ratio_list, bitratelist, fps_list, file_extensions */
+    {gettext_noop("VOB (DVD Video)"), "VOB",
+        "-loglevel debug "
+        "-bf 2 " /* use 2 B-Frames */
+        /* target is set with aspect ratio: pal-dvd or ntsc-dvd */
+        , VOB_size_list, aspect_ratio_list, NULL, VOB_fps_list,
+        VOB_extensions
+    },
+
+    {gettext_noop("OGV (Theora Vorbis)"), "OGV",
+        "-f ogg "
+        "-vcodec libtheora -acodec libvorbis"
+        , OGV_size_list, aspect_ratio_list, OGV_bitrate_list, OGV_fps_list,
+        OGV_extensions
+    },
+
+    {gettext_noop("FLV (Flash Video)"), "FLV",
+        "-f flv -vcodec flv -acodec libmp3lame"
+        "-ab 56000"     /* audio bitrate */
+        "-ar 22050"     /* audio sampling frequency*/
+        "-ac 1 "        /* number of audio channels */
+        , FLV_size_list, aspect_ratio_list, FLV_bitrate_list, OGV_fps_list,
+        FLV_extensions
+    },
+
+    {gettext_noop("3GP (Mobile Phones)"), "3GP",
+        "-f 3gp -vcodec h263 -acodec libfaac"
+        "-b:v 192k "                  /* bitrate */
+        "-ab 32k -ar 8000 -ac 1"    /* audio bitrate, sampling frequency and number of channels */
+        , x3GP_size_list, NULL, NULL, x3GP_fps_list,
+        x3GP_extensions
+    },
+    /* ffmpeg options for x264 thanks to David Gnedt */
+    {gettext_noop("H.264/MPEG-4 AVC"), "x264",
+        "-vcodec libx264 -crf 21 " /* FIXME -crf should be in a "Quality" option that also includes bitrate */
+        "-pix_fmt yuv420p "
+		"-movflags +faststart "
+        "-acodec libmp3lame -ac 2 -ar 44100 -b:a 128k ",
+        x264_size_list,
+        aspect_ratio_list,
+        x264_bitrate_list,
+        x264_fps_list,
+        x264_extensions
+    },
+    {NULL}
+};

imagination-3.4.tar.bz2/src/video_formats.h Added

@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2011 Robert Chéramy   <robert@cheramy.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License,or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not,write to the Free Software
+ *  Foundation,Inc.,59 Temple Place - Suite 330,Boston,MA 02111-1307,USA.
+ *
+ */
+
+#ifndef __VIDEO_FORMAT_H__
+#define __VIDEO_FORMAT_H__
+
+#include <gtk/gtk.h>
+
+struct video_size {
+    gchar  *name;
+    gint    x;
+    gint    y;
+    gint    default_fps_idx, default_aspect_ratio_idx, default_bitrate_idx;
+};
+
+struct video_bitrate {
+    gchar  *name;
+    gchar   *value;
+};
+
+struct aspect_ratio {
+    gchar   *name;
+    gchar   *ffmpeg_option;
+};
+
+struct video_fps {
+    gchar   *name;
+    gchar   *ffmpeg_option;
+    gdouble value;
+};
+
+struct video_format {
+    gchar *name;
+    gchar *config_name;
+    gchar *ffmpeg_option;
+    struct video_size *sizelist;
+    struct aspect_ratio *aspect_ratio_list;
+    struct video_bitrate *bitratelist;
+    struct video_fps *fps_list;
+    gchar **file_extensions;
+};
+
+extern struct video_format video_format_list;
+
+#endif

imagination-3.0.tar.bz2/transitions/Makefile.in -> imagination-3.4.tar.bz2/transitions/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,61 @@
 # Adapted from Geany's plugins/Makefile.am, thanks
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,12 +91,12 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = transitions
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -66,15 +120,22 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 bar_wipe_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_bar_wipe_la_OBJECTS = bar_wipe.lo
 bar_wipe_la_OBJECTS = $(am_bar_wipe_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 bar_wipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(bar_wipe_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -169,6 +230,18 @@
 wave_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(wave_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -179,22 +252,18 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(bar_wipe_la_SOURCES) $(barn_door_wipe_la_SOURCES) \
 	$(bow_tie_wipe_la_SOURCES) $(box_wipe_la_SOURCES) \
 	$(clock_wipe_la_SOURCES) $(diagonal_wipe_la_SOURCES) \
@@ -211,8 +280,31 @@
 	$(misc_diagonal_wipe_la_SOURCES) $(misc_shape_wipe_la_SOURCES) \
 	$(push_wipe_la_SOURCES) $(rochade_la_SOURCES) \
 	$(wave_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -234,6 +326,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -257,6 +350,11 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -265,8 +363,10 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -312,6 +412,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -340,11 +441,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -352,6 +454,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -449,7 +552,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu transitions/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu transitions/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -467,9 +569,9 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -477,6 +579,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -492,41 +596,58 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-bar_wipe.la: $(bar_wipe_la_OBJECTS) $(bar_wipe_la_DEPENDENCIES) 
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+bar_wipe.la: $(bar_wipe_la_OBJECTS) $(bar_wipe_la_DEPENDENCIES) $(EXTRA_bar_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(bar_wipe_la_LINK) -rpath $(plugindir) $(bar_wipe_la_OBJECTS) $(bar_wipe_la_LIBADD) $(LIBS)
-barn_door_wipe.la: $(barn_door_wipe_la_OBJECTS) $(barn_door_wipe_la_DEPENDENCIES) 
+
+barn_door_wipe.la: $(barn_door_wipe_la_OBJECTS) $(barn_door_wipe_la_DEPENDENCIES) $(EXTRA_barn_door_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(barn_door_wipe_la_LINK) -rpath $(plugindir) $(barn_door_wipe_la_OBJECTS) $(barn_door_wipe_la_LIBADD) $(LIBS)
-bow_tie_wipe.la: $(bow_tie_wipe_la_OBJECTS) $(bow_tie_wipe_la_DEPENDENCIES) 
+
+bow_tie_wipe.la: $(bow_tie_wipe_la_OBJECTS) $(bow_tie_wipe_la_DEPENDENCIES) $(EXTRA_bow_tie_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(bow_tie_wipe_la_LINK) -rpath $(plugindir) $(bow_tie_wipe_la_OBJECTS) $(bow_tie_wipe_la_LIBADD) $(LIBS)
-box_wipe.la: $(box_wipe_la_OBJECTS) $(box_wipe_la_DEPENDENCIES) 
+
+box_wipe.la: $(box_wipe_la_OBJECTS) $(box_wipe_la_DEPENDENCIES) $(EXTRA_box_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(box_wipe_la_LINK) -rpath $(plugindir) $(box_wipe_la_OBJECTS) $(box_wipe_la_LIBADD) $(LIBS)
-clock_wipe.la: $(clock_wipe_la_OBJECTS) $(clock_wipe_la_DEPENDENCIES) 
+
+clock_wipe.la: $(clock_wipe_la_OBJECTS) $(clock_wipe_la_DEPENDENCIES) $(EXTRA_clock_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(clock_wipe_la_LINK) -rpath $(plugindir) $(clock_wipe_la_OBJECTS) $(clock_wipe_la_LIBADD) $(LIBS)
-diagonal_wipe.la: $(diagonal_wipe_la_OBJECTS) $(diagonal_wipe_la_DEPENDENCIES) 
+
+diagonal_wipe.la: $(diagonal_wipe_la_OBJECTS) $(diagonal_wipe_la_DEPENDENCIES) $(EXTRA_diagonal_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(diagonal_wipe_la_LINK) -rpath $(plugindir) $(diagonal_wipe_la_OBJECTS) $(diagonal_wipe_la_LIBADD) $(LIBS)
-ellipse_wipe.la: $(ellipse_wipe_la_OBJECTS) $(ellipse_wipe_la_DEPENDENCIES) 
+
+ellipse_wipe.la: $(ellipse_wipe_la_OBJECTS) $(ellipse_wipe_la_DEPENDENCIES) $(EXTRA_ellipse_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(ellipse_wipe_la_LINK) -rpath $(plugindir) $(ellipse_wipe_la_OBJECTS) $(ellipse_wipe_la_LIBADD) $(LIBS)
-four_box_wipe.la: $(four_box_wipe_la_OBJECTS) $(four_box_wipe_la_DEPENDENCIES) 
+
+four_box_wipe.la: $(four_box_wipe_la_OBJECTS) $(four_box_wipe_la_DEPENDENCIES) $(EXTRA_four_box_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(four_box_wipe_la_LINK) -rpath $(plugindir) $(four_box_wipe_la_OBJECTS) $(four_box_wipe_la_LIBADD) $(LIBS)
-insert.la: $(insert_la_OBJECTS) $(insert_la_DEPENDENCIES) 
+
+insert.la: $(insert_la_OBJECTS) $(insert_la_DEPENDENCIES) $(EXTRA_insert_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(insert_la_LINK) -rpath $(plugindir) $(insert_la_OBJECTS) $(insert_la_LIBADD) $(LIBS)
-misc.la: $(misc_la_OBJECTS) $(misc_la_DEPENDENCIES) 
+
+misc.la: $(misc_la_OBJECTS) $(misc_la_DEPENDENCIES) $(EXTRA_misc_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(misc_la_LINK) -rpath $(plugindir) $(misc_la_OBJECTS) $(misc_la_LIBADD) $(LIBS)
-misc_diagonal_wipe.la: $(misc_diagonal_wipe_la_OBJECTS) $(misc_diagonal_wipe_la_DEPENDENCIES) 
+
+misc_diagonal_wipe.la: $(misc_diagonal_wipe_la_OBJECTS) $(misc_diagonal_wipe_la_DEPENDENCIES) $(EXTRA_misc_diagonal_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(misc_diagonal_wipe_la_LINK) -rpath $(plugindir) $(misc_diagonal_wipe_la_OBJECTS) $(misc_diagonal_wipe_la_LIBADD) $(LIBS)
-misc_shape_wipe.la: $(misc_shape_wipe_la_OBJECTS) $(misc_shape_wipe_la_DEPENDENCIES) 
+
+misc_shape_wipe.la: $(misc_shape_wipe_la_OBJECTS) $(misc_shape_wipe_la_DEPENDENCIES) $(EXTRA_misc_shape_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(misc_shape_wipe_la_LINK) -rpath $(plugindir) $(misc_shape_wipe_la_OBJECTS) $(misc_shape_wipe_la_LIBADD) $(LIBS)
-push_wipe.la: $(push_wipe_la_OBJECTS) $(push_wipe_la_DEPENDENCIES) 
+
+push_wipe.la: $(push_wipe_la_OBJECTS) $(push_wipe_la_DEPENDENCIES) $(EXTRA_push_wipe_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(push_wipe_la_LINK) -rpath $(plugindir) $(push_wipe_la_OBJECTS) $(push_wipe_la_LIBADD) $(LIBS)
-rochade.la: $(rochade_la_OBJECTS) $(rochade_la_DEPENDENCIES) 
+
+rochade.la: $(rochade_la_OBJECTS) $(rochade_la_DEPENDENCIES) $(EXTRA_rochade_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(rochade_la_LINK) -rpath $(plugindir) $(rochade_la_OBJECTS) $(rochade_la_LIBADD) $(LIBS)
-wave.la: $(wave_la_OBJECTS) $(wave_la_DEPENDENCIES) 
+
+wave.la: $(wave_la_OBJECTS) $(wave_la_DEPENDENCIES) $(EXTRA_wave_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(wave_la_LINK) -rpath $(plugindir) $(wave_la_OBJECTS) $(wave_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -554,26 +675,23 @@
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -581,26 +699,15 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -612,15 +719,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -629,6 +732,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -680,10 +798,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -768,19 +891,22 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pluginLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

imagination-3.0.tar.bz2/transitions/misc.c -> imagination-3.4.tar.bz2/transitions/misc.c Changed

Overview

Request 4498 (accepted)

Request History