r25176 - in /desktop/experimental/anjuta: ./ debian/ debian/patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Sep 22 18:06:08 UTC 2010
Author: joss
Date: Wed Sep 22 18:05:58 2010
New Revision: 25176
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25176
Log:
* New upstream release candidate.
* 21_glib_2.24.patch: revert upstream patch that introduces Glib 2.25
requirement.
* 22_no_gdbus.patch: ditto for the one that introduces GDBus.
* 23_libgda_4.0.patch: revert the changes that require libgda 4.1.
* 24_libdevhelp_1.0.patch: revert the patch that introduces devhelp
2.32 requirement.
* 90_autotools.patch: run autoreconf on top of that.
* Update build-dependencies.
* Drop vala and introspection support.
* Bump shlibs.
* Break anjuta-extras < 2.31.92.
Added:
desktop/experimental/anjuta/
- copied from r25175, desktop/unstable/anjuta/
desktop/experimental/anjuta/debian/patches/21_glib_2.24.patch
desktop/experimental/anjuta/debian/patches/22_no_gdbus.patch
desktop/experimental/anjuta/debian/patches/23_libgda_4.0.patch
desktop/experimental/anjuta/debian/patches/24_libdevhelp_1.0.patch
desktop/experimental/anjuta/debian/patches/90_autotools.patch
Modified:
desktop/experimental/anjuta/debian/changelog
desktop/experimental/anjuta/debian/control
desktop/experimental/anjuta/debian/control.in
desktop/experimental/anjuta/debian/patches/series
desktop/experimental/anjuta/debian/rules
Modified: desktop/experimental/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/changelog?rev=25176&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/changelog [utf-8] (original)
+++ desktop/experimental/anjuta/debian/changelog [utf-8] Wed Sep 22 18:05:58 2010
@@ -1,3 +1,20 @@
+anjuta (2:2.31.92.0-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * 21_glib_2.24.patch: revert upstream patch that introduces Glib 2.25
+ requirement.
+ * 22_no_gdbus.patch: ditto for the one that introduces GDBus.
+ * 23_libgda_4.0.patch: revert the changes that require libgda 4.1.
+ * 24_libdevhelp_1.0.patch: revert the patch that introduces devhelp
+ 2.32 requirement.
+ * 90_autotools.patch: run autoreconf on top of that.
+ * Update build-dependencies.
+ * Drop vala and introspection support.
+ * Bump shlibs.
+ * Break anjuta-extras < 2.31.92.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 22 Sep 2010 18:08:58 +0200
+
anjuta (2:2.30.2.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/experimental/anjuta/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/control?rev=25176&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/control [utf-8] (original)
+++ desktop/experimental/anjuta/debian/control [utf-8] Wed Sep 22 18:05:58 2010
@@ -7,15 +7,14 @@
Section: gnome
Priority: optional
Maintainer: Rob Bradford <robster at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.0),
cdbs,
gnome-common,
gnome-doc-utils,
gconf2,
- libglib2.0-dev (>= 2.18.0),
- libgtk2.0-dev (>= 2.17.10),
- liborbit2-dev (>= 1:2.6.0),
+ libglib2.0-dev (>= 2.22.0),
+ libgtk2.0-dev (>= 2.20.0),
libgconf2-dev (>= 2.12.0),
libgda-4.0-dev (>= 4.0.0),
libvte-dev (>= 1:0.13.1),
@@ -30,11 +29,8 @@
libunique-dev (>= 1.0.0),
libwebkit-dev,
libxslt1-dev,
- libvala-dev (>= 0.7.8),
- valac (>= 0.7.8),
libdbus-glib-1-dev,
- libgjs-dev,
- libgirepository1.0-dev,
+ libgraphviz-dev (>= 1.0),
pkg-config,
liblocale-gettext-perl,
intltool (>= 0.40.1),
@@ -63,8 +59,7 @@
liblocale-gettext-perl
Suggests: libgtk2.0-dev,
libgtkmm2.0-dev,
- glade-gnome,
- valac
+ glade-gnome
Conflicts: libgbf-1-2,
libgbf-1-1,
libgbf-1-0
@@ -95,10 +90,10 @@
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends},
- anjuta-common
+ anjuta-common (= ${source:Version})
Conflicts: anjuta (<< 2:2.28.1.0-2)
Replaces: anjuta (<< 2:2.28.1.0-2)
-Breaks: anjuta-extras (<< 2.30.0)
+Breaks: anjuta-extras (<< 2:2.31.92)
Description: A GNOME development IDE, for C/C++ - shared libraries
This IDE for C/C++ and GNOME/Gtk+ applications has features that enable easy
debugging and management of code. It also integrates with glade and CVS.
Modified: desktop/experimental/anjuta/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/control.in?rev=25176&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/control.in [utf-8] (original)
+++ desktop/experimental/anjuta/debian/control.in [utf-8] Wed Sep 22 18:05:58 2010
@@ -8,9 +8,8 @@
gnome-common,
gnome-doc-utils,
gconf2,
- libglib2.0-dev (>= 2.18.0),
- libgtk2.0-dev (>= 2.17.10),
- liborbit2-dev (>= 1:2.6.0),
+ libglib2.0-dev (>= 2.22.0),
+ libgtk2.0-dev (>= 2.20.0),
libgconf2-dev (>= 2.12.0),
libgda-4.0-dev (>= 4.0.0),
libvte-dev (>= 1:0.13.1),
@@ -25,11 +24,8 @@
libunique-dev (>= 1.0.0),
libwebkit-dev,
libxslt1-dev,
- libvala-dev (>= 0.7.8),
- valac (>= 0.7.8),
libdbus-glib-1-dev,
- libgjs-dev,
- libgirepository1.0-dev,
+ libgraphviz-dev (>= 1.0),
pkg-config,
liblocale-gettext-perl,
intltool (>= 0.40.1),
@@ -58,8 +54,7 @@
liblocale-gettext-perl
Suggests: libgtk2.0-dev,
libgtkmm2.0-dev,
- glade-gnome,
- valac
+ glade-gnome
Conflicts: libgbf-1-2,
libgbf-1-1,
libgbf-1-0
@@ -90,10 +85,10 @@
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends},
- anjuta-common
+ anjuta-common (= ${source:Version})
Conflicts: anjuta (<< 2:2.28.1.0-2)
Replaces: anjuta (<< 2:2.28.1.0-2)
-Breaks: anjuta-extras (<< 2.30.0)
+Breaks: anjuta-extras (<< 2:2.31.92)
Description: A GNOME development IDE, for C/C++ - shared libraries
This IDE for C/C++ and GNOME/Gtk+ applications has features that enable easy
debugging and management of code. It also integrates with glade and CVS.
Added: desktop/experimental/anjuta/debian/patches/21_glib_2.24.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/patches/21_glib_2.24.patch?rev=25176&op=file
==============================================================================
--- desktop/experimental/anjuta/debian/patches/21_glib_2.24.patch (added)
+++ desktop/experimental/anjuta/debian/patches/21_glib_2.24.patch [utf-8] Wed Sep 22 18:05:58 2010
@@ -1,0 +1,154 @@
+Reverts upstream commit 466189a96b6e0f70091723544a1c25c02fdf53d6
+
+Index: anjuta-2.31.92.0/configure.in
+===================================================================
+--- anjuta-2.31.92.0.orig/configure.in 2010-09-22 18:16:45.798419524 +0200
++++ anjuta-2.31.92.0/configure.in 2010-09-22 18:13:31.014418320 +0200
+@@ -24,7 +24,6 @@ ANJUTA_VERSION=anjuta_version
+ AC_SUBST(ANJUTA_VERSION)
+
+ dnl Anjuta core
+-GLIB_REQUIRED=2.25.15
+ GTK_REQUIRED=2.20.0
+ GTHREAD_REQUIRED=2.22.0
+ GDK_PIXBUF_REQUIRED=2.0.0
+@@ -146,8 +145,6 @@ dnl Check base modules
+ PKG_CHECK_MODULES([ANJUTA],
+ [gthread-2.0 >= $GTHREAD_REQUIRED
+ unique-1.0 >= $UNIQUE_REQUIRED
+- glib-2.0 >= $GLIB_REQUIRED
+- gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+Index: anjuta-2.31.92.0/libanjuta/Makefile.am
+===================================================================
+--- anjuta-2.31.92.0.orig/libanjuta/Makefile.am 2010-09-22 18:16:45.902417453 +0200
++++ anjuta-2.31.92.0/libanjuta/Makefile.am 2010-09-22 18:13:31.014418320 +0200
+@@ -72,6 +72,8 @@ libanjuta_la_SOURCES= \
+ cell-renderer-captioned-image.h \
+ e-splash.h \
+ e-splash.c \
++ anjuta-error.c \
++ anjuta-error.h \
+ anjuta-vcs-status.h \
+ anjuta-vcs-status-tree-view.c \
+ anjuta-vcs-status-tree-view.h \
+@@ -142,6 +144,7 @@ libanjuta_include = \
+ anjuta-session.h \
+ anjuta-save-prompt.h \
+ anjuta-serializer.h \
++ anjuta-error.h \
+ resources.h \
+ anjuta-vcs-status-tree-view.h \
+ anjuta-vcs-status.h \
+Index: anjuta-2.31.92.0/libanjuta/anjuta-error.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ anjuta-2.31.92.0/libanjuta/anjuta-error.c 2010-09-22 18:18:08.058918877 +0200
+@@ -0,0 +1,40 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
++/*
++ * anjuta-error.c
++ * Copyright (C) 2007 Sebastien Granjoux <seb.sfo at free.fr>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library 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
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the Free
++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++#include "anjuta-error.h"
++
++#ifdef NEED_G_ERROR_GET_TYPE
++
++GType
++g_error_get_type (void)
++{
++ static GType type = G_TYPE_INVALID;
++
++ if (type == G_TYPE_INVALID)
++ {
++ type = g_boxed_type_register_static ("GError",
++ (GBoxedCopyFunc) g_error_copy,
++ (GBoxedFreeFunc) g_error_free);
++ }
++
++ return type;
++}
++
++#endif
+Index: anjuta-2.31.92.0/libanjuta/anjuta-error.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ anjuta-2.31.92.0/libanjuta/anjuta-error.h 2010-09-22 18:18:51.474419113 +0200
+@@ -0,0 +1,37 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
++/*
++ * anjuta-error.h
++ * Copyright (C) 2007 Sebastien Granjoux <seb.sfo at free.fr>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library 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
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the Free
++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++#ifndef __ANJUTA_ERROR_H__
++#define __ANJUTA_ERROR_H__
++
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++/* Boxed type for GError will not be done in GLib see bug #300610 */
++
++#ifndef G_TYPE_ERROR
++#define G_TYPE_ERROR (g_error_get_type())
++#define NEED_G_ERROR_GET_TYPE
++GType g_error_get_type (void) G_GNUC_CONST;
++#endif
++
++G_END_DECLS
++
++#endif /* __ANJUTA_ERROR_H__ */
+Index: anjuta-2.31.92.0/libanjuta/interfaces/libanjuta.idl
+===================================================================
+--- anjuta-2.31.92.0.orig/libanjuta/interfaces/libanjuta.idl 2010-09-22 18:16:45.986417859 +0200
++++ anjuta-2.31.92.0/libanjuta/interfaces/libanjuta.idl 2010-09-22 18:13:31.018418899 +0200
+@@ -631,7 +631,9 @@ interface IAnjutaIterable
+ */
+ interface IAnjutaBuilder
+ {
+- /**
++ #include <libanjuta/anjuta-error.h>
++
++ /**
+ * IAnjutaBuilderError:
+ * @IANJUTA_BUILDER_SUCCEED: Build succeeded
+ * @IANJUTA_BUILDER_FAILED: Build failed
+@@ -3642,6 +3644,7 @@ interface IAnjutaWizard
+ interface IAnjutaDebugger
+ {
+ #include "ianjuta-message-view.h"
++ #include <libanjuta/anjuta-error.h>
+ #include <sys/types.h>
+ #include <gio/gio.h>
+
Added: desktop/experimental/anjuta/debian/patches/22_no_gdbus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/patches/22_no_gdbus.patch?rev=25176&op=file
==============================================================================
--- desktop/experimental/anjuta/debian/patches/22_no_gdbus.patch (added)
+++ desktop/experimental/anjuta/debian/patches/22_no_gdbus.patch [utf-8] Wed Sep 22 18:05:58 2010
@@ -1,0 +1,117 @@
+Revert upstream commit 2bdaf30206c330e20474b5e313438c926bda653e
+
+Index: anjuta-2.31.92.0/configure.in
+===================================================================
+--- anjuta-2.31.92.0.orig/configure.in 2010-09-22 18:21:08.422419846 +0200
++++ anjuta-2.31.92.0/configure.in 2010-09-22 18:21:14.334420460 +0200
+@@ -145,7 +145,7 @@ dnl Check base modules
+ PKG_CHECK_MODULES([ANJUTA],
+ [gthread-2.0 >= $GTHREAD_REQUIRED
+ unique-1.0 >= $UNIQUE_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= $GTK_REQUIRED
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ vte >= $VTE_REQUIRED
+Index: anjuta-2.31.92.0/libanjuta/anjuta-utils.c
+===================================================================
+--- anjuta-2.31.92.0.orig/libanjuta/anjuta-utils.c 2010-09-22 18:21:08.474416606 +0200
++++ anjuta-2.31.92.0/libanjuta/anjuta-utils.c 2010-09-22 18:21:14.334420460 +0200
+@@ -49,7 +49,7 @@
+ #include <pwd.h>
+ #endif
+
+-#include <gio/gio.h>
++#include <dbus/dbus-glib.h>
+ #include <glib/gi18n.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+@@ -484,28 +484,29 @@ anjuta_util_dialog_input (GtkWindow *par
+ }
+
+ static void
+-on_install_files_done (GObject *proxy, GAsyncResult *result,
++on_install_files_done (DBusGProxy *proxy, DBusGProxyCall *call_id,
+ gpointer user_data)
+ {
+ GError *error = NULL;
+- g_dbus_proxy_call_finish ((GDBusProxy *) proxy, result, &error);
++ dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID);
+ if (error)
+ {
+ /*
+ Only dbus error is handled. Rest of the errors are from packagekit
+ which have already been notified to user by packagekit.
+ */
+- if (error->domain == G_DBUS_ERROR)
++ if (error->domain == DBUS_GERROR)
+ {
+ const gchar *error_message = NULL;
+
+ /* Service error which implies packagekit is missing */
+- if (error->code == G_DBUS_ERROR_SERVICE_UNKNOWN)
++ if (error->code == DBUS_GERROR_SERVICE_UNKNOWN)
+ {
+ error_message = _("You do not seem to have PackageKit installed. PackageKit is required for installing missing packages. Please install \"packagekit-gnome\" package from your distribution, or install the missing packages manually.");
+ }
+ /* General dbus error implies failure to call dbus method */
+- else if (error->code != G_DBUS_ERROR_NO_REPLY)
++ else if (error->code != DBUS_GERROR_REMOTE_EXCEPTION &&
++ error->code != DBUS_GERROR_NO_REPLY)
+ {
+ error_message = error->message;
+ }
+@@ -521,40 +522,32 @@ on_install_files_done (GObject *proxy, G
+ gboolean
+ anjuta_util_install_files (const gchar * const names)
+ {
+- GDBusConnection * connection;
+- GDBusProxy * proxy;
++ DBusGConnection * connection;
++ DBusGProxy * proxy;
+ guint32 xid = 0;
+ gchar ** pkgv;
+
+ if (!names)
+ return FALSE;
+
+- connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
++ connection = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
+ if (!connection)
+ return FALSE;
+
+- proxy = g_dbus_proxy_new_sync (connection,
+- G_DBUS_PROXY_FLAGS_NONE,
+- NULL,
+- "org.freedesktop.PackageKit",
+- "/org/freedesktop/PackageKit",
+- "org.freedesktop.PackageKit.Modify",
+- NULL,
+- NULL);
++ proxy = dbus_g_proxy_new_for_name (connection,
++ "org.freedesktop.PackageKit",
++ "/org/freedesktop/PackageKit",
++ "org.freedesktop.PackageKit.Modify");
+ if (!proxy)
+ return FALSE;
+
+ pkgv = g_strsplit (names, ", ", 0);
+- g_dbus_proxy_call (proxy, "InstallProvideFiles",
+- g_variant_new ("(u^ass)",
+- xid,
+- pkgv,
+- ""),
+- G_DBUS_CALL_FLAGS_NONE,
+- -1,
+- NULL,
+- on_install_files_done,
+- NULL);
++ dbus_g_proxy_begin_call (proxy, "InstallProvideFiles",
++ on_install_files_done, NULL, NULL,
++ G_TYPE_UINT, xid,
++ G_TYPE_STRV, pkgv,
++ G_TYPE_STRING, "",
++ G_TYPE_INVALID, G_TYPE_INVALID);
+ g_strfreev (pkgv);
+ return TRUE;
+ }
Added: desktop/experimental/anjuta/debian/patches/23_libgda_4.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/patches/23_libgda_4.0.patch?rev=25176&op=file
==============================================================================
--- desktop/experimental/anjuta/debian/patches/23_libgda_4.0.patch (added)
+++ desktop/experimental/anjuta/debian/patches/23_libgda_4.0.patch [utf-8] Wed Sep 22 18:05:58 2010
@@ -1,0 +1,39 @@
+Index: anjuta-2.31.92.0/configure.in
+===================================================================
+--- anjuta-2.31.92.0.orig/configure.in 2010-09-22 19:15:39.474421218 +0200
++++ anjuta-2.31.92.0/configure.in 2010-09-22 19:15:43.994422004 +0200
+@@ -28,7 +28,7 @@ GTK_REQUIRED=2.20.0
+ GTHREAD_REQUIRED=2.22.0
+ GDK_PIXBUF_REQUIRED=2.0.0
+ GCONF_REQUIRED=2.12.0
+-GDA_REQUIRED=4.1.6
++GDA_REQUIRED=4.0.0
+ VTE_REQUIRED=0.13.1
+ LIBXML_REQUIRED=2.4.23
+ GDL_REQUIRED=2.27.1
+Index: anjuta-2.31.92.0/plugins/symbol-db/benchmark/libgda/libgda.c
+===================================================================
+--- anjuta-2.31.92.0.orig/plugins/symbol-db/benchmark/libgda/libgda.c 2010-09-22 19:16:10.466423548 +0200
++++ anjuta-2.31.92.0/plugins/symbol-db/benchmark/libgda/libgda.c 2010-09-22 19:16:21.530920633 +0200
+@@ -174,7 +174,7 @@ open_connection ()
+
+ /* open connection */
+ cnc = gda_connection_open_from_string ("SQLite", "DB_DIR=.;DB_NAME="DB_FILE, NULL,
+- GDA_CONNECTION_OPTIONS_THREAD_SAFE,
++ GDA_CONNECTION_OPTIONS_NONE,
+ &error);
+ if (!cnc) {
+ g_print ("Could not open connection to SQLite database in example_db.db file: %s\n",
+Index: anjuta-2.31.92.0/plugins/symbol-db/symbol-db-engine-core.c
+===================================================================
+--- anjuta-2.31.92.0.orig/plugins/symbol-db/symbol-db-engine-core.c 2010-09-22 19:15:53.998919861 +0200
++++ anjuta-2.31.92.0/plugins/symbol-db/symbol-db-engine-core.c 2010-09-22 19:16:01.318423453 +0200
+@@ -2191,7 +2191,7 @@ sdb_engine_connect_to_db (SymbolDBEngine
+ * be created
+ */
+ priv->db_connection = gda_connection_open_from_string ("SQLite", cnc_string, NULL,
+- GDA_CONNECTION_OPTIONS_THREAD_SAFE, NULL);
++ GDA_CONNECTION_OPTIONS_NONE, NULL);
+
+ if (!GDA_IS_CONNECTION (priv->db_connection))
+ {
Added: desktop/experimental/anjuta/debian/patches/24_libdevhelp_1.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/patches/24_libdevhelp_1.0.patch?rev=25176&op=file
==============================================================================
--- desktop/experimental/anjuta/debian/patches/24_libdevhelp_1.0.patch (added)
+++ desktop/experimental/anjuta/debian/patches/24_libdevhelp_1.0.patch [utf-8] Wed Sep 22 18:05:58 2010
@@ -1,0 +1,51 @@
+Revert upstream commit fbc5e7733696c613fdf1d5a16d835af84668c3cd
+
+Index: anjuta-2.31.92.0/configure.in
+===================================================================
+--- anjuta-2.31.92.0.orig/configure.in 2010-09-22 19:24:27.374421012 +0200
++++ anjuta-2.31.92.0/configure.in 2010-09-22 19:24:50.138419351 +0200
+@@ -201,7 +201,7 @@ if test "$user_disabled_devhelp" = 1; th
+ else
+ AC_MSG_RESULT(no)
+ PKG_CHECK_MODULES(PLUGIN_DEVHELP,
+- [libdevhelp-2.0 >= $LIBDEVHELP_REQUIRED webkit-1.0],
++ [libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0],
+ [
+ devhelp_enabled=yes
+ ], [
+Index: anjuta-2.31.92.0/plugins/devhelp/plugin.c
+===================================================================
+--- anjuta-2.31.92.0.orig/plugins/devhelp/plugin.c 2010-09-22 19:24:37.546419537 +0200
++++ anjuta-2.31.92.0/plugins/devhelp/plugin.c 2010-09-22 19:24:50.138419351 +0200
+@@ -305,7 +305,8 @@ devhelp_activate (AnjutaPlugin *plugin)
+
+ #ifndef DISABLE_EMBEDDED_DEVHELP
+ static gboolean init = FALSE;
+- DhBookManager *book_manager;
++ GNode *books;
++ GList *keywords;
+ GtkWidget *label;
+ GtkWidget *books_sw;
+
+@@ -409,7 +410,8 @@ devhelp_activate (AnjutaPlugin *plugin)
+ /*
+ * Notebook
+ */
+- book_manager = dh_base_get_book_manager (devhelp->base);
++ books = dh_base_get_book_tree (devhelp->base);
++ keywords = dh_base_get_keywords (devhelp->base);
+
+ books_sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (books_sw),
+@@ -419,9 +421,9 @@ devhelp_activate (AnjutaPlugin *plugin)
+ GTK_SHADOW_NONE);
+ gtk_container_set_border_width (GTK_CONTAINER (books_sw), 2);
+
+- devhelp->book_tree = dh_book_tree_new (book_manager);
++ devhelp->book_tree = dh_book_tree_new (books);
+
+- devhelp->search = dh_search_new (book_manager);
++ devhelp->search = dh_search_new (keywords);
+ gtk_widget_set_size_request (devhelp->search, 0, 0);
+
+ g_signal_connect (devhelp->book_tree,
Added: desktop/experimental/anjuta/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/patches/90_autotools.patch?rev=25176&op=file
==============================================================================
--- desktop/experimental/anjuta/debian/patches/90_autotools.patch (added)
+++ desktop/experimental/anjuta/debian/patches/90_autotools.patch [utf-8] Wed Sep 22 18:05:58 2010
@@ -1,0 +1,2318 @@
+autoreconf -f
+rm -rf autom4te.cache config.h.in~
+
+Index: anjuta-2.31.92.0/aclocal.m4
+===================================================================
+--- anjuta-2.31.92.0.orig/aclocal.m4 2010-09-22 19:24:00.382921190 +0200
++++ anjuta-2.31.92.0/aclocal.m4 2010-09-22 19:26:23.798421127 +0200
+@@ -13,8 +13,8 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+-[m4_warning([this file was generated for autoconf 2.65.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
++[m4_warning([this file was generated for autoconf 2.67.
+ 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'.])])
+@@ -346,7 +346,7 @@ msgstr ""
+
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+- dnl in configure.ac.
++ dnl in configure.in.
+ for lang in $ALL_LINGUAS; do
+ GMOFILES="$GMOFILES $lang.gmo"
+ POFILES="$POFILES $lang.po"
+@@ -475,7 +475,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir",
+ dnl
+ dnl Now the definitions that aclocal will find
+ dnl
+-ifdef(glib_configure_ac,[],[
++ifdef(glib_configure_in,[],[
+ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+ AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+ ])dnl
+@@ -3488,7 +3488,7 @@ linux*oldld* | linux*aout* | linux*coff*
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -3513,13 +3513,10 @@ linux* | k*bsd*-gnu)
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -3531,6 +3528,18 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -4118,11 +4127,11 @@ irix5* | irix6* | nonstopux*)
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -4739,7 +4748,7 @@ m4_if([$1], [CXX], [
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -4803,7 +4812,7 @@ m4_if([$1], [CXX], [
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -5023,7 +5032,7 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -5228,6 +5237,9 @@ m4_if([$1], [CXX], [
+ cygwin* | mingw* | cegcc*)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -5292,6 +5304,9 @@ dnl Note also adjust exclude_expsyms for
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -5313,6 +5328,7 @@ dnl Note also adjust exclude_expsyms for
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 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 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -5404,7 +5420,7 @@ _LT_EOF
+ _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)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -5474,7 +5490,7 @@ _LT_EOF
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -5649,6 +5665,7 @@ _LT_EOF
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
++ _LT_TAGVAR(link_all_deplibs, $1)=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -5887,7 +5904,7 @@ _LT_EOF
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ 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
+ else
+@@ -6883,7 +6900,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+Index: anjuta-2.31.92.0/configure
+===================================================================
+--- anjuta-2.31.92.0.orig/configure 2010-09-22 19:24:00.350917540 +0200
++++ anjuta-2.31.92.0/configure 2010-09-22 19:26:29.526914350 +0200
+@@ -1,13 +1,13 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.65 for anjuta 2.31.92.0.
++# Generated by GNU Autoconf 2.67 for anjuta 2.31.92.0.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta>.
+ #
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -320,7 +320,7 @@ $as_echo X"$as_dir" |
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -360,19 +360,19 @@ else
+ fi # as_fn_arith
+
+
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+- $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -683,7 +683,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
+ exec 6>&1
+
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+@@ -1168,8 +1168,9 @@ do
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1214,7 +1215,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1240,7 +1241,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1444,7 +1445,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1460,7 +1461,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1490,8 +1491,8 @@ do
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) as_fn_error "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information."
++ -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+ ;;
+
+ *=*)
+@@ -1499,7 +1500,7 @@ Try \`$0 --help' for more information."
+ # Reject names that are not valid shell variable names.
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+@@ -1517,13 +1518,13 @@ done
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- as_fn_error "missing argument to $ac_option"
++ as_fn_error $? "missing argument to $ac_option"
+ fi
+
+ if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+ fi
+@@ -1546,7 +1547,7 @@ do
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1560,8 +1561,8 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+- If a cross compiler is detected then cross compile mode will be used." >&2
++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++ If a cross compiler is detected then cross compile mode will be used" >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+@@ -1576,9 +1577,9 @@ test "$silent" = yes && exec 6>/dev/null
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- as_fn_error "working directory cannot be determined"
++ as_fn_error $? "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- as_fn_error "pwd does not report name of working directory"
++ as_fn_error $? "pwd does not report name of working directory"
+
+
+ # Find the source files, if location was not specified.
+@@ -1617,11 +1618,11 @@ else
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1661,7 +1662,7 @@ Configuration:
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+- -q, --quiet, --silent do not print \`checking...' messages
++ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+@@ -1902,9 +1903,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ anjuta configure 2.31.92.0
+-generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.67
+
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1974,7 +1975,7 @@ $as_echo "$ac_try_echo"; } >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2083,7 +2084,7 @@ ac_fn_c_check_header_compile ()
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2155,7 +2156,7 @@ ac_fn_c_check_func ()
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2235,7 +2236,7 @@ $as_echo "$ac_try_echo"; } >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2305,10 +2306,10 @@ fi
+ ac_fn_c_check_header_mongrel ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++ if eval "test \"\${$3+set}\"" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -2344,7 +2345,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+ ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -2367,17 +2368,15 @@ $as_echo "$as_me: WARNING: $2: see the A
+ $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;}
+-( cat <<\_ASBOX
+-## --------------------------------------------------------------------- ##
++( $as_echo "## --------------------------------------------------------------------- ##
+ ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta ##
+-## --------------------------------------------------------------------- ##
+-_ASBOX
++## --------------------------------------------------------------------- ##"
+ ) | 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=\$ac_header_compiler"
+@@ -2399,7 +2398,7 @@ ac_fn_c_check_type ()
+ 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=no"
+@@ -2444,15 +2443,18 @@ $as_echo "$ac_res" >&6; }
+
+ } # ac_fn_c_check_type
+
+-# ac_fn_c_check_decl LINENO SYMBOL VAR
+-# ------------------------------------
+-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
++# ---------------------------------------------
++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
++# accordingly.
+ ac_fn_c_check_decl ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+-$as_echo_n "checking whether $2 is declared... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++ as_decl_name=`echo $2|sed 's/ *(.*//'`
++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
++$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2461,8 +2463,12 @@ $4
+ int
+ main ()
+ {
+-#ifndef $2
+- (void) $2;
++#ifndef $as_decl_name
++#ifdef __cplusplus
++ (void) $as_decl_use;
++#else
++ (void) $as_decl_name;
++#endif
+ #endif
+
+ ;
+@@ -2487,7 +2493,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by anjuta $as_me 2.31.92.0, which was
+-generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ $ $0 $@
+
+@@ -2597,11 +2603,9 @@ trap 'exit_status=$?
+ {
+ echo
+
+- cat <<\_ASBOX
+-## ---------------- ##
++ $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -2635,11 +2639,9 @@ $as_echo "$as_me: WARNING: cache variabl
+ )
+ echo
+
+- cat <<\_ASBOX
+-## ----------------- ##
++ $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+@@ -2652,11 +2654,9 @@ _ASBOX
+ echo
+
+ if test -n "$ac_subst_files"; then
+- cat <<\_ASBOX
+-## ------------------- ##
++ $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+@@ -2670,11 +2670,9 @@ _ASBOX
+ fi
+
+ if test -s confdefs.h; then
+- cat <<\_ASBOX
+-## ----------- ##
++ $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+ echo
+ cat confdefs.h
+ echo
+@@ -2729,7 +2727,12 @@ _ACEOF
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+- ac_site_file1=$CONFIG_SITE
++ # We do not want a PATH search for config.site.
++ case $CONFIG_SITE in #((
++ -*) ac_site_file1=./$CONFIG_SITE;;
++ */*) ac_site_file1=$CONFIG_SITE;;
++ *) ac_site_file1=./$CONFIG_SITE;;
++ esac
+ elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+@@ -2744,7 +2747,11 @@ do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+- . "$ac_site_file"
++ . "$ac_site_file" \
++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ done
+
+@@ -2820,7 +2827,7 @@ if $ac_cache_corrupted; then
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -2858,12 +2865,11 @@ $as_echo "#define ANJUTA_VERSION 2.31.92
+ ANJUTA_VERSION=2.31.92.0
+
+
+-GLIB_REQUIRED=2.25.15
+ GTK_REQUIRED=2.20.0
+ GTHREAD_REQUIRED=2.22.0
+ GDK_PIXBUF_REQUIRED=2.0.0
+ GCONF_REQUIRED=2.12.0
+-GDA_REQUIRED=4.1.6
++GDA_REQUIRED=4.0.0
+ VTE_REQUIRED=0.13.1
+ LIBXML_REQUIRED=2.4.23
+ GDL_REQUIRED=2.27.1
+@@ -2892,16 +2898,22 @@ am__api_version='1.11'
+
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+- for ac_t in install-sh install.sh shtool; do
+- if test -f "$ac_dir/$ac_t"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/$ac_t -c"
+- break 2
+- fi
+- done
++ if test -f "$ac_dir/install-sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install-sh -c"
++ break
++ elif test -f "$ac_dir/install.sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install.sh -c"
++ break
++ elif test -f "$ac_dir/shtool"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/shtool install -c"
++ break
++ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ fi
+
+ # These three variables are undocumented and unsupported,
+@@ -3017,11 +3029,11 @@ am_lf='
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -3043,7 +3055,7 @@ if (
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+- as_fn_error "ls -t appears to fail. Make sure there is not a broken
++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+
+@@ -3053,7 +3065,7 @@ then
+ # Ok.
+ :
+ else
+- as_fn_error "newly created file is older than distributed files!
++ as_fn_error $? "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -3291,7 +3303,7 @@ done
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -3299,7 +3311,7 @@ SHELL = /bin/sh
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -3333,7 +3345,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ fi
+ fi
+
+@@ -3610,7 +3622,7 @@ $as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
++ as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+ fi
+
+
+@@ -3977,8 +3989,8 @@ fi
+
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -4092,9 +4104,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "C compiler cannot create executables
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -4136,8 +4147,8 @@ done
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -4194,9 +4205,9 @@ $as_echo "$ac_try_echo"; } >&5
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
++as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+ fi
+@@ -4247,8 +4258,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -4699,7 +4710,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -4715,11 +4726,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -4758,7 +4769,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -4774,18 +4785,18 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+
+ ac_ext=c
+@@ -5193,7 +5204,7 @@ $as_echo_n "checking whether cc understa
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5380,7 +5391,7 @@ $as_echo "$has_option" >&6; }
+ fi
+ ;;
+ *)
+- as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
++ as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
+ ;;
+ esac
+ CFLAGS="$realsave_CFLAGS"
+@@ -5507,7 +5518,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+@@ -5518,16 +5529,16 @@ else
+ test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -5552,7 +5563,7 @@ else
+ ac_cv_host=$ac_cv_build
+ else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+
+ fi
+@@ -5560,7 +5571,7 @@ fi
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -5633,7 +5644,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_SED=$SED
+@@ -5709,7 +5720,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_GREP=$GREP
+@@ -5775,7 +5786,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_EGREP=$EGREP
+@@ -5842,7 +5853,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_FGREP"; then
+- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_FGREP=$FGREP
+@@ -5958,7 +5969,7 @@ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+@@ -6160,13 +6171,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:6163: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6174: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6166: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6177: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6169: output\"" >&5)
++ (eval echo "\"\$as_me:6180: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -6621,11 +6632,11 @@ irix5* | irix6* | nonstopux*)
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -7360,7 +7371,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7363 "configure"' > conftest.$ac_ext
++ echo '#line 7374 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -8227,8 +8238,7 @@ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -8678,7 +8688,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -8694,11 +8704,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -8737,7 +8747,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -8753,11 +8763,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+@@ -9246,11 +9256,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9249: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9259: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9253: \$? = $ac_status" >&5
++ echo "$as_me:9263: \$? = $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.
+@@ -9415,7 +9425,7 @@ $as_echo_n "checking for $compiler optio
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -9585,11 +9595,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9588: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9598: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9592: \$? = $ac_status" >&5
++ echo "$as_me:9602: \$? = $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.
+@@ -9690,11 +9700,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9693: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9703: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9697: \$? = $ac_status" >&5
++ echo "$as_me:9707: \$? = $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
+@@ -9745,11 +9755,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9748: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9758: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9752: \$? = $ac_status" >&5
++ echo "$as_me:9762: \$? = $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
+@@ -9864,6 +9874,9 @@ $as_echo_n "checking whether the $compil
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs=no
++ ;;
+ esac
+
+ ld_shlibs=yes
+@@ -9885,6 +9898,7 @@ $as_echo_n "checking whether the $compil
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 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 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -9976,7 +9990,7 @@ _LT_EOF
+ 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)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -10046,7 +10060,7 @@ _LT_EOF
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -10221,6 +10235,7 @@ _LT_EOF
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
++ link_all_deplibs=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -10547,7 +10562,7 @@ rm -f core conftest.err conftest.$ac_obj
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -11437,7 +11452,7 @@ linux*oldld* | linux*aout* | linux*coff*
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -11477,13 +11492,10 @@ rm -f core conftest.err conftest.$ac_obj
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -11495,6 +11507,18 @@ rm -f core conftest.err conftest.$ac_obj
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -12115,7 +12139,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 12118 "configure"
++#line 12142 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12211,7 +12235,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 12214 "configure"
++#line 12238 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12626,7 +12650,7 @@ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+@@ -13151,7 +13175,7 @@ if test -z "$aix_libpath"; then aix_libp
+ inherit_rpath_CXX=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -13979,7 +14003,7 @@ $as_echo_n "checking for $compiler optio
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -14043,7 +14067,7 @@ $as_echo_n "checking for $compiler optio
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -14167,11 +14191,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14170: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14194: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14174: \$? = $ac_status" >&5
++ echo "$as_me:14198: \$? = $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.
+@@ -14266,11 +14290,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14269: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14293: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14273: \$? = $ac_status" >&5
++ echo "$as_me:14297: \$? = $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
+@@ -14318,11 +14342,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14321: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14345: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14325: \$? = $ac_status" >&5
++ echo "$as_me:14349: \$? = $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
+@@ -14394,6 +14418,9 @@ $as_echo_n "checking whether the $compil
+ cygwin* | mingw* | cegcc*)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs_CXX=no
++ ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -14893,7 +14920,7 @@ linux*oldld* | linux*aout* | linux*coff*
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -14933,13 +14960,10 @@ rm -f core conftest.err conftest.$ac_obj
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -14951,6 +14975,18 @@ rm -f core conftest.err conftest.$ac_obj
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -15385,7 +15421,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR a
+ if test "${enable_schemas_install+set}" = set; then :
+ enableval=$enable_schemas_install; case ${enableval} in
+ yes|no) ;;
+- *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+ esac
+ fi
+
+@@ -15426,7 +15462,7 @@ $as_echo_n "checking for gobject-introsp
+ test $ac_status = 0; }; then
+ :
+ else
+- as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5
++ as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
+ fi
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
+@@ -15436,7 +15472,7 @@ fi
+ test $ac_status = 0; }; then
+ found_introspection=yes
+ else
+- as_fn_error "You need to have gobject-introspection >= 0.6.7 installed to build anjuta" "$LINENO" 5
++ as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build anjuta" "$LINENO" 5
+ fi
+ ;; #(
+ auto) :
+@@ -15452,7 +15488,7 @@ else
+ fi
+ ;; #(
+ *) :
+- as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
++ as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
+@@ -15538,7 +15574,7 @@ fi
+
+
+ if test x$PKG_CONFIG = xno; then
+- as_fn_error "Please install the pkg-config package from http://www.freedesktop.org/software/pkgconfig/" "$LINENO" 5
++ as_fn_error $? "Please install the pkg-config package from http://www.freedesktop.org/software/pkgconfig/" "$LINENO" 5
+ fi
+
+
+@@ -15553,9 +15589,7 @@ if test -n "$ANJUTA_CFLAGS"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= \$GTHREAD_REQUIRED
+ unique-1.0 >= \$UNIQUE_REQUIRED
+- glib-2.0 >= \$GLIB_REQUIRED
+- gio-2.0 >= \$GLIB_REQUIRED
+- gtk+-2.0 >= \$GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= \$GTK_REQUIRED
+ gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= \$GCONF_REQUIRED
+ vte >= \$VTE_REQUIRED
+@@ -15565,9 +15599,7 @@ if test -n "$ANJUTA_CFLAGS"; then
+ libxslt\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= $GTHREAD_REQUIRED
+ unique-1.0 >= $UNIQUE_REQUIRED
+- glib-2.0 >= $GLIB_REQUIRED
+- gio-2.0 >= $GLIB_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= $GTK_REQUIRED
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ vte >= $VTE_REQUIRED
+@@ -15580,9 +15612,7 @@ if test -n "$ANJUTA_CFLAGS"; then
+ test $ac_status = 0; }; then
+ pkg_cv_ANJUTA_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= $GTHREAD_REQUIRED
+ unique-1.0 >= $UNIQUE_REQUIRED
+- glib-2.0 >= $GLIB_REQUIRED
+- gio-2.0 >= $GLIB_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= $GTK_REQUIRED
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ vte >= $VTE_REQUIRED
+@@ -15602,9 +15632,7 @@ if test -n "$ANJUTA_LIBS"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= \$GTHREAD_REQUIRED
+ unique-1.0 >= \$UNIQUE_REQUIRED
+- glib-2.0 >= \$GLIB_REQUIRED
+- gio-2.0 >= \$GLIB_REQUIRED
+- gtk+-2.0 >= \$GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= \$GTK_REQUIRED
+ gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= \$GCONF_REQUIRED
+ vte >= \$VTE_REQUIRED
+@@ -15614,9 +15642,7 @@ if test -n "$ANJUTA_LIBS"; then
+ libxslt\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= $GTHREAD_REQUIRED
+ unique-1.0 >= $UNIQUE_REQUIRED
+- glib-2.0 >= $GLIB_REQUIRED
+- gio-2.0 >= $GLIB_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= $GTK_REQUIRED
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ vte >= $VTE_REQUIRED
+@@ -15629,9 +15655,7 @@ if test -n "$ANJUTA_LIBS"; then
+ test $ac_status = 0; }; then
+ pkg_cv_ANJUTA_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= $GTHREAD_REQUIRED
+ unique-1.0 >= $UNIQUE_REQUIRED
+- glib-2.0 >= $GLIB_REQUIRED
+- gio-2.0 >= $GLIB_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= $GTK_REQUIRED
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ vte >= $VTE_REQUIRED
+@@ -15660,9 +15684,7 @@ fi
+ if test $_pkg_short_errors_supported = yes; then
+ ANJUTA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0 >= $GTHREAD_REQUIRED
+ unique-1.0 >= $UNIQUE_REQUIRED
+- glib-2.0 >= $GLIB_REQUIRED
+- gio-2.0 >= $GLIB_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= $GTK_REQUIRED
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ vte >= $VTE_REQUIRED
+@@ -15673,9 +15695,7 @@ fi
+ else
+ ANJUTA_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0 >= $GTHREAD_REQUIRED
+ unique-1.0 >= $UNIQUE_REQUIRED
+- glib-2.0 >= $GLIB_REQUIRED
+- gio-2.0 >= $GLIB_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= $GTK_REQUIRED
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ vte >= $VTE_REQUIRED
+@@ -15687,11 +15707,9 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ANJUTA_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (gthread-2.0 >= $GTHREAD_REQUIRED
++ as_fn_error $? "Package requirements (gthread-2.0 >= $GTHREAD_REQUIRED
+ unique-1.0 >= $UNIQUE_REQUIRED
+- glib-2.0 >= $GLIB_REQUIRED
+- gio-2.0 >= $GLIB_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
++ dbus-glib-1 gtk+-2.0 >= $GTK_REQUIRED
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ vte >= $VTE_REQUIRED
+@@ -15713,7 +15731,7 @@ elif test $pkg_failed = untried; then
+ $as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -15722,7 +15740,7 @@ and ANJUTA_LIBS to avoid the need to cal
+ 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
+ ANJUTA_CFLAGS=$pkg_cv_ANJUTA_CFLAGS
+ ANJUTA_LIBS=$pkg_cv_ANJUTA_LIBS
+@@ -15773,7 +15791,7 @@ fi
+
+
+ if test x$AUTOGEN_PATH = xno; then
+- as_fn_error "Couldn't find autogen, please install the autogen package. You can get it from http://autogen.sourceforge.net/" "$LINENO" 5
++ as_fn_error $? "Couldn't find autogen, please install the autogen package. You can get it from http://autogen.sourceforge.net/" "$LINENO" 5
+ fi
+
+ # Automake backend requirements
+@@ -15819,10 +15837,10 @@ fi
+
+
+ if test -z "$PERL"; then
+- as_fn_error "perl not found" "$LINENO" 5
++ as_fn_error $? "perl not found" "$LINENO" 5
+ fi
+ $PERL -e 'require 5.005;' || {
+- as_fn_error "perl 5.005 or better is required" "$LINENO" 5
++ as_fn_error $? "perl 5.005 or better is required" "$LINENO" 5
+ }
+
+ # Check for perl Locale::gettext module
+@@ -15831,7 +15849,7 @@ if test "x$PERL" != x; then
+ $as_echo_n "checking for perl module Locale::gettext... " >&6; }
+ $PERL "-MLocale::gettext" -e exit > /dev/null 2>&1
+ if test $? -ne 0; then
+- as_fn_error "not found, you should installed perl-gettext package for your distribution" "$LINENO" 5;
++ as_fn_error $? "not found, you should installed perl-gettext package for your distribution" "$LINENO" 5 ;
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; };
+@@ -15867,12 +15885,12 @@ if test -n "$PLUGIN_DEVHELP_CFLAGS"; the
+ pkg_cv_PLUGIN_DEVHELP_CFLAGS="$PLUGIN_DEVHELP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevhelp-2.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libdevhelp-2.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-2.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
++ pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -15883,12 +15901,12 @@ if test -n "$PLUGIN_DEVHELP_LIBS"; then
+ pkg_cv_PLUGIN_DEVHELP_LIBS="$PLUGIN_DEVHELP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevhelp-2.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libdevhelp-2.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-2.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
++ pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -15908,9 +15926,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdevhelp-2.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>&1`
++ PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>&1`
+ else
+- PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdevhelp-2.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>&1`
++ PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PLUGIN_DEVHELP_PKG_ERRORS" >&5
+@@ -16129,7 +16147,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PLUGIN_SOURCEVIEW_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (gtksourceview-2.0 >= $GTKSOURCEVIEW_REQUIRED) were not met:
++ as_fn_error $? "Package requirements (gtksourceview-2.0 >= $GTKSOURCEVIEW_REQUIRED) were not met:
+
+ $PLUGIN_SOURCEVIEW_PKG_ERRORS
+
+@@ -16144,7 +16162,7 @@ elif test $pkg_failed = untried; then
+ $as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -16153,7 +16171,7 @@ and PLUGIN_SOURCEVIEW_LIBS to avoid the
+ 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
+ PLUGIN_SOURCEVIEW_CFLAGS=$pkg_cv_PLUGIN_SOURCEVIEW_CFLAGS
+ PLUGIN_SOURCEVIEW_LIBS=$pkg_cv_PLUGIN_SOURCEVIEW_LIBS
+@@ -16550,7 +16568,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PLUGIN_SYMBOL_DB_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (libgda-4.0 >= $GDA_REQUIRED) were not met:
++ as_fn_error $? "Package requirements (libgda-4.0 >= $GDA_REQUIRED) were not met:
+
+ $PLUGIN_SYMBOL_DB_PKG_ERRORS
+
+@@ -16565,7 +16583,7 @@ elif test $pkg_failed = untried; then
+ $as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -16574,7 +16592,7 @@ and PLUGIN_SYMBOL_DB_LIBS to avoid the n
+ 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
+ PLUGIN_SYMBOL_DB_CFLAGS=$pkg_cv_PLUGIN_SYMBOL_DB_CFLAGS
+ PLUGIN_SYMBOL_DB_LIBS=$pkg_cv_PLUGIN_SYMBOL_DB_LIBS
+@@ -16709,7 +16727,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$VTE_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (vte >= $VTE_REQUIRED) were not met:
++ as_fn_error $? "Package requirements (vte >= $VTE_REQUIRED) were not met:
+
+ $VTE_PKG_ERRORS
+
+@@ -16724,7 +16742,7 @@ elif test $pkg_failed = untried; then
+ $as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -16733,7 +16751,7 @@ and VTE_LIBS to avoid the need to call p
+ 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
+ VTE_CFLAGS=$pkg_cv_VTE_CFLAGS
+ VTE_LIBS=$pkg_cv_VTE_LIBS
+@@ -17481,7 +17499,7 @@ $as_echo "$USE_NLS" >&6; }
+
+ case "$am__api_version" in
+ 1.01234)
+- as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
++ as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ ;;
+ *)
+ ;;
+@@ -17498,7 +17516,7 @@ $as_echo_n "checking for intltool >= 0.4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+- as_fn_error "Your intltool is too old. You need intltool 0.40.1 or later." "$LINENO" 5
++ as_fn_error $? "Your intltool is too old. You need intltool 0.40.1 or later." "$LINENO" 5
+ fi
+
+ # Extract the first word of "intltool-update", so it can be a program name with args.
+@@ -17622,7 +17640,7 @@ fi
+
+
+ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+- as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
++ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -17904,13 +17922,13 @@ fi
+
+
+ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
++ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+ xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+ mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+ mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
++ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+
+ # Extract the first word of "perl", so it can be a program name with args.
+@@ -17954,13 +17972,13 @@ fi
+
+
+ if test -z "$INTLTOOL_PERL"; then
+- as_fn_error "perl not found" "$LINENO" 5
++ as_fn_error $? "perl not found" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+- as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
++ as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+@@ -17973,7 +17991,7 @@ $as_echo_n "checking for XML::Parser...
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+ else
+- as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
++ as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
+ fi
+ fi
+
+@@ -18179,7 +18197,7 @@ fi
+ test $ac_status = 0; }; then
+ :
+ else
+- as_fn_error "You need to have gtk-doc >= 1.4 installed to build $PACKAGE_NAME" "$LINENO" 5
++ as_fn_error $? "You need to have gtk-doc >= 1.4 installed to build $PACKAGE_NAME" "$LINENO" 5
+ fi
+ fi
+
+@@ -18256,8 +18274,7 @@ for ac_header in dirent.h fcntl.h fnmatc
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18270,8 +18287,7 @@ for ac_header in time.h types.h unistd.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18284,8 +18300,7 @@ for ac_header in sys/dir.h sys/stat.h sy
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18680,8 +18695,7 @@ for ac_header in libutil.h util.h pty.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18892,8 +18906,7 @@ for ac_func in strerror opendir
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18905,8 +18918,7 @@ for ac_func in clock times
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -19106,7 +19118,7 @@ fi
+
+
+ if test "x$GMAKE" = "xno"; then
+- as_fn_error "You need gmake installed to build Anjuta!" "$LINENO" 5
++ as_fn_error $? "You need gmake installed to build Anjuta!" "$LINENO" 5
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -19909,6 +19921,7 @@ DEFS=-DHAVE_CONFIG_H
+
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -19932,59 +19945,59 @@ else
+ fi
+
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
++ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
+- as_fn_error "conditional \"ENABLE_SK\" was never defined.
++ as_fn_error $? "conditional \"ENABLE_SK\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
+- as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
++ as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- as_fn_error "conditional \"AMDEP\" was never defined.
++ as_fn_error $? "conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- as_fn_error "conditional \"am__fastdepCC\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+- as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++ as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
+- as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
++ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_PLUGIN_DEVHELP_TRUE}" && test -z "${HAVE_PLUGIN_DEVHELP_FALSE}"; then
+- as_fn_error "conditional \"HAVE_PLUGIN_DEVHELP\" was never defined.
++ as_fn_error $? "conditional \"HAVE_PLUGIN_DEVHELP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_PLUGIN_GLADE_TRUE}" && test -z "${HAVE_PLUGIN_GLADE_FALSE}"; then
+- as_fn_error "conditional \"HAVE_PLUGIN_GLADE\" was never defined.
++ as_fn_error $? "conditional \"HAVE_PLUGIN_GLADE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_PLUGIN_SOURCEVIEW_TRUE}" && test -z "${HAVE_PLUGIN_SOURCEVIEW_FALSE}"; then
+- as_fn_error "conditional \"HAVE_PLUGIN_SOURCEVIEW\" was never defined.
++ as_fn_error $? "conditional \"HAVE_PLUGIN_SOURCEVIEW\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_VALA_TRUE}" && test -z "${ENABLE_VALA_FALSE}"; then
+- as_fn_error "conditional \"ENABLE_VALA\" was never defined.
++ as_fn_error $? "conditional \"ENABLE_VALA\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then
+- as_fn_error "conditional \"HAVE_PYTHON\" was never defined.
++ as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+@@ -19992,31 +20005,31 @@ fi
+
+
+ if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
+- as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
++ as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+- as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
++ as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+- as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
++ as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+- as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++ as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
+- as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
++ as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_SVN_TRUE}" && test -z "${BUILD_SVN_FALSE}"; then
+- as_fn_error "conditional \"BUILD_SVN\" was never defined.
++ as_fn_error $? "conditional \"BUILD_SVN\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_GRAPHVIZ_TRUE}" && test -z "${HAVE_GRAPHVIZ_FALSE}"; then
+- as_fn_error "conditional \"HAVE_GRAPHVIZ\" was never defined.
++ as_fn_error $? "conditional \"HAVE_GRAPHVIZ\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+@@ -20166,19 +20179,19 @@ export LANGUAGE
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+- $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -20374,7 +20387,7 @@ $as_echo X"$as_dir" |
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -20428,7 +20441,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by anjuta $as_me 2.31.92.0, which was
+-generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -20494,10 +20507,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ anjuta config.status 2.31.92.0
+-configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.67,
+ with options \\"\$ac_cs_config\\"
+
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+
+@@ -20515,11 +20528,16 @@ ac_need_defaults=:
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -20541,6 +20559,7 @@ do
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+@@ -20553,7 +20572,7 @@ do
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+- as_fn_error "ambiguous option: \`$1'
++ as_fn_error $? "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+@@ -20562,7 +20581,7 @@ Try \`$0 --help' for more information.";
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) as_fn_error "unrecognized option: \`$1'
++ -*) as_fn_error $? "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+
+ *) as_fn_append ac_config_targets " $1"
+@@ -21112,7 +21131,7 @@ do
+ "mime/Makefile") CONFIG_FILES="$CONFIG_FILES mime/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
+
+@@ -21150,7 +21169,7 @@ $debug ||
+ {
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -21167,7 +21186,7 @@ if test "x$ac_cr" = x; then
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+- ac_cs_awk_cr='\r'
++ ac_cs_awk_cr='\\r'
+ else
+ ac_cs_awk_cr=$ac_cr
+ fi
+@@ -21181,18 +21200,18 @@ _ACEOF
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+ } >conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -21281,20 +21300,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+ else
+ cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+- || as_fn_error "could not setup config files machinery" "$LINENO" 5
++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[ ]*\):*/\1/
++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
++h
++s///
++s/^/:/
++s/[ ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[ ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[ ]*$//
+ }'
+ fi
+@@ -21322,7 +21349,7 @@ for ac_last_try in false false :; do
+ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -21407,7 +21434,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+- as_fn_error "could not setup config headers machinery" "$LINENO" 5
++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+
+
+@@ -21420,7 +21447,7 @@ do
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -21448,7 +21475,7 @@ do
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error "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'"
+@@ -21475,7 +21502,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+@@ -21612,22 +21639,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined." >&5
++which seems to be undefined. Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined." >&2;}
++which seems to be undefined. Please make sure it is defined" >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+ :H)
+ #
+@@ -21638,19 +21665,19 @@ which seems to be undefined. Please mak
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+- || as_fn_error "could not create -" "$LINENO" 5
++ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -22597,7 +22624,7 @@ _LT_EOF
+ esac ;;
+ "po/stamp-it":C)
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
+- as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
++ as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+ fi
+ rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+ >"po/stamp-it.tmp"
+@@ -22625,7 +22652,7 @@ _ACEOF
+ ac_clean_files=$ac_clean_files_save
+
+ test $ac_write_fail = 0 ||
+- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+ # configure is writing to config.log, and then calls config.status.
+@@ -22646,7 +22673,7 @@ if test "$no_create" != yes; then
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+- $ac_cs_success || as_fn_exit $?
++ $ac_cs_success || as_fn_exit 1
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+Index: anjuta-2.31.92.0/libanjuta/Makefile.in
+===================================================================
+--- anjuta-2.31.92.0.orig/libanjuta/Makefile.in 2010-09-22 19:24:00.318922690 +0200
++++ anjuta-2.31.92.0/libanjuta/Makefile.in 2010-09-22 19:26:23.818422554 +0200
+@@ -88,7 +88,7 @@ am_libanjuta_la_OBJECTS = anjuta-enum-ty
+ anjuta-launcher.lo anjuta-utils.lo anjuta-session.lo \
+ anjuta-save-prompt.lo anjuta-serializer.lo resources.lo \
+ anjuta-c-plugin-factory.lo anjuta-c-module.lo \
+- cell-renderer-captioned-image.lo e-splash.lo \
++ cell-renderer-captioned-image.lo e-splash.lo anjuta-error.lo \
+ anjuta-vcs-status-tree-view.lo anjuta-command.lo \
+ anjuta-async-command.lo anjuta-sync-command.lo \
+ anjuta-async-notify.lo anjuta-debug.lo gbf-project.lo \
+@@ -487,6 +487,8 @@ libanjuta_la_SOURCES = \
+ cell-renderer-captioned-image.h \
+ e-splash.h \
+ e-splash.c \
++ anjuta-error.c \
++ anjuta-error.h \
+ anjuta-vcs-status.h \
+ anjuta-vcs-status-tree-view.c \
+ anjuta-vcs-status-tree-view.h \
+@@ -549,6 +551,7 @@ libanjuta_include = \
+ anjuta-session.h \
+ anjuta-save-prompt.h \
+ anjuta-serializer.h \
++ anjuta-error.h \
+ resources.h \
+ anjuta-vcs-status-tree-view.h \
+ anjuta-vcs-status.h \
+@@ -722,6 +725,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-debug.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-encodings.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-enum-types.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-error.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-glade-catalog.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-launcher.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-marshal.Plo at am__quote@
Modified: desktop/experimental/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/patches/series?rev=25176&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/patches/series [utf-8] (original)
+++ desktop/experimental/anjuta/debian/patches/series [utf-8] Wed Sep 22 18:05:58 2010
@@ -1,1 +1,6 @@
+21_glib_2.24.patch
+22_no_gdbus.patch
+23_libgda_4.0.patch
+24_libdevhelp_1.0.patch
+90_autotools.patch
99_ltmain_as-needed.patch
Modified: desktop/experimental/anjuta/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/rules?rev=25176&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/rules [utf-8] (original)
+++ desktop/experimental/anjuta/debian/rules [utf-8] Wed Sep 22 18:05:58 2010
@@ -16,7 +16,7 @@
DEB_DH_MAKESHLIBS_ARGS_anjuta += --no-act
LIB_PKG := $(shell sed -nr 's/^Package:[[:space:]]*(libanjuta[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-SHVER = 2:2.30.0
+SHVER = 2:2.31.92
DEB_DH_MAKESHLIBS_ARGS_$(LIB_PKG) = -V '$(LIB_PKG) (>= $(SHVER))'
install/anjuta::
More information about the pkg-gnome-commits
mailing list