r25544 - in /desktop/unstable/anjuta/debian: changelog patches/90_autotools.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Nov 13 09:46:17 UTC 2010
Author: joss
Date: Sat Nov 13 09:46:16 2010
New Revision: 25544
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25544
Log:
* New upstream translation and bugfix release.
* 90_autotools.patch: refreshed for the new release.
Modified:
desktop/unstable/anjuta/debian/changelog
desktop/unstable/anjuta/debian/patches/90_autotools.patch
Modified: desktop/unstable/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/changelog?rev=25544&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/changelog [utf-8] (original)
+++ desktop/unstable/anjuta/debian/changelog [utf-8] Sat Nov 13 09:46:16 2010
@@ -1,3 +1,10 @@
+anjuta (2:2.32.1.0-1) unstable; urgency=low
+
+ * New upstream translation and bugfix release.
+ * 90_autotools.patch: refreshed for the new release.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 13 Nov 2010 10:46:24 +0100
+
anjuta (2:2.32.0.0-3) unstable; urgency=low
* 01_python_plugin_ldflags.patch: new patch. Fix Python plugin by
Modified: desktop/unstable/anjuta/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/90_autotools.patch?rev=25544&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/90_autotools.patch [utf-8] Sat Nov 13 09:46:16 2010
@@ -1,16 +1,16 @@
autoreconf -f
rm -rf autom4te.cache config.h.in~
-Index: anjuta-2.32.0.0/aclocal.m4
-===================================================================
---- anjuta-2.32.0.0.orig/aclocal.m4 2010-10-03 11:11:00.971564865 +0200
-+++ anjuta-2.32.0.0/aclocal.m4 2010-10-03 11:29:43.523567643 +0200
+Index: anjuta-2.32.1.0/aclocal.m4
+===================================================================
+--- anjuta-2.32.1.0.orig/aclocal.m4 2010-11-12 14:54:45.000000000 +0100
++++ anjuta-2.32.1.0/aclocal.m4 2010-11-13 10:44:48.938336084 +0100
@@ -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.66],,
+-[m4_warning([this file was generated for autoconf 2.66.
+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.
@@ -34,16 +34,977 @@
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*
+@@ -952,11 +952,105 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
+ # AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
+
++dnl -*- mode: autoconf -*-
++dnl Copyright 2009 Johan Dahlin
++dnl
++dnl This file is free software; the author(s) gives unlimited
++dnl permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++
++# serial 1
++
++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
++[
++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
++
++ dnl enable/disable introspection
++ m4_if([$2], [require],
++ [dnl
++ enable_introspection=yes
++ ],[dnl
++ AC_ARG_ENABLE(introspection,
++ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
++ [Enable introspection for this build]),,
++ [enable_introspection=auto])
++ ])dnl
++
++ AC_MSG_CHECKING([for gobject-introspection])
++
++ dnl presence/version checking
++ AS_CASE([$enable_introspection],
++ [no], [dnl
++ found_introspection="no (disabled, use --enable-introspection to enable)"
++ ],dnl
++ [yes],[dnl
++ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
++ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
++ found_introspection=yes,
++ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
++ ],dnl
++ [auto],[dnl
++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
++ ],dnl
++ [dnl
++ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
++ ])dnl
++
++ AC_MSG_RESULT([$found_introspection])
++
++ INTROSPECTION_SCANNER=
++ INTROSPECTION_COMPILER=
++ INTROSPECTION_GENERATE=
++ INTROSPECTION_GIRDIR=
++ INTROSPECTION_TYPELIBDIR=
++ if test "x$found_introspection" = "xyes"; then
++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++ fi
++ AC_SUBST(INTROSPECTION_SCANNER)
++ AC_SUBST(INTROSPECTION_COMPILER)
++ AC_SUBST(INTROSPECTION_GENERATE)
++ AC_SUBST(INTROSPECTION_GIRDIR)
++ AC_SUBST(INTROSPECTION_TYPELIBDIR)
++ AC_SUBST(INTROSPECTION_CFLAGS)
++ AC_SUBST(INTROSPECTION_LIBS)
++ AC_SUBST(INTROSPECTION_MAKEFILE)
++
++ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
++])
++
++
++dnl Usage:
++dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
++
++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
++[
++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
++])
++
++dnl Usage:
++dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
++
++
++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
++[
++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
++])
++
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-# Inc.
++# 2006, 2007, 2008 Free Software Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -965,8 +1059,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
+
+ m4_define([_LT_COPYING], [dnl
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-# Inc.
++# 2006, 2007, 2008 Free Software Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is part of GNU Libtool.
+@@ -993,7 +1086,7 @@ m4_define([_LT_COPYING], [dnl
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ])
+
+-# serial 57 LT_INIT
++# serial 56 LT_INIT
+
+
+ # LT_PREREQ(VERSION)
+@@ -1022,7 +1115,6 @@ esac
+ # ------------------
+ AC_DEFUN([LT_INIT],
+ [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+ AC_BEFORE([$0], [LT_LANG])dnl
+ AC_BEFORE([$0], [LT_OUTPUT])dnl
+ AC_BEFORE([$0], [LTDL_INIT])dnl
+@@ -1039,8 +1131,6 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
+ AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+ m4_require([_LT_PROG_LTMAIN])dnl
+
+-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+-
+ dnl Parse OPTIONS
+ _LT_SET_OPTIONS([$0], [$1])
+
+@@ -1077,7 +1167,7 @@ m4_defun([_LT_CC_BASENAME],
+ *) break;;
+ esac
+ done
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ ])
+
+
+@@ -1097,9 +1187,6 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
+ m4_defun([_LT_SETUP],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+-
+ _LT_DECL([], [host_alias], [0], [The host system])dnl
+ _LT_DECL([], [host], [0])dnl
+ _LT_DECL([], [host_os], [0])dnl
+@@ -1141,6 +1228,7 @@ fi
+ _LT_CHECK_OBJDIR
+
+ m4_require([_LT_TAG_COMPILER])dnl
++_LT_PROG_ECHO_BACKSLASH
+
+ case $host_os in
+ aix3*)
+@@ -1154,6 +1242,23 @@ aix3*)
;;
-
- # 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)
+ esac
+
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
+ # Global variables:
+ ofile=libtool
+ can_build_shared=yes
+@@ -1194,28 +1299,6 @@ _LT_CONFIG_COMMANDS
+ ])# _LT_SETUP
+
+
+-# _LT_PREPARE_SED_QUOTE_VARS
+-# --------------------------
+-# Define a few sed substitution that help us do robust quoting.
+-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+-[# Backslashify metacharacters that are still active within
+-# double-quoted strings.
+-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-
+-# Sed substitution to delay expansion of an escaped single quote.
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+-
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+-])
+-
+ # _LT_PROG_LTMAIN
+ # ---------------
+ # Note that this code is called both from `configure', and `config.status'
+@@ -1368,7 +1451,7 @@ m4_define([_lt_decl_all_varnames],
+ # declaration there will have the same value as in `configure'. VARNAME
+ # must have a single quote delimited value for this to work.
+ m4_define([_LT_CONFIG_STATUS_DECLARE],
+-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+
+
+ # _LT_CONFIG_STATUS_DECLARATIONS
+@@ -1378,7 +1461,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
+ # embedded single quotes properly. In configure, this macro expands
+ # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+ #
+-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
++# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+ [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+@@ -1477,20 +1560,12 @@ LTCC='$LTCC'
+ LTCFLAGS='$LTCFLAGS'
+ compiler='$compiler_DEFAULT'
+
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+- eval 'cat <<_LTECHO_EOF
+-\$[]1
+-_LTECHO_EOF'
+-}
+-
+ # Quote evaled strings.
+ for var in lt_decl_all_varnames([[ \
+ ]], lt_decl_quote_varnames); do
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -1501,9 +1576,9 @@ done
+ # Double-quote double-evaled strings.
+ for var in lt_decl_all_varnames([[ \
+ ]], lt_decl_dquote_varnames); do
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -1511,38 +1586,16 @@ for var in lt_decl_all_varnames([[ \
+ esac
+ done
+
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\[$]0 --fallback-echo"')dnl "
++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
++ ;;
++esac
++
+ _LT_OUTPUT_LIBTOOL_INIT
+ ])
+
+-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+-# ------------------------------------
+-# Generate a child script FILE with all initialization necessary to
+-# reuse the environment learned by the parent script, and make the
+-# file executable. If COMMENT is supplied, it is inserted after the
+-# `#!' sequence but before initialization text begins. After this
+-# macro, additional text can be appended to FILE to form the body of
+-# the child script. The macro ends with non-zero status if the
+-# file could not be fully written (such as if the disk is full).
+-m4_ifdef([AS_INIT_GENERATED],
+-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+-[m4_defun([_LT_GENERATED_FILE_INIT],
+-[m4_require([AS_PREPARE])]dnl
+-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+-[lt_write_fail=0
+-cat >$1 <<_ASEOF || lt_write_fail=1
+-#! $SHELL
+-# Generated by $as_me.
+-$2
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-export SHELL
+-_ASEOF
+-cat >>$1 <<\_ASEOF || lt_write_fail=1
+-AS_SHELL_SANITIZE
+-_AS_PREPARE
+-exec AS_MESSAGE_FD>&1
+-_ASEOF
+-test $lt_write_fail = 0 && chmod +x $1[]dnl
+-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+ # LT_OUTPUT
+ # ---------
+@@ -1552,11 +1605,20 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_
+ AC_DEFUN([LT_OUTPUT],
+ [: ${CONFIG_LT=./config.lt}
+ AC_MSG_NOTICE([creating $CONFIG_LT])
+-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+-[# Run this file to recreate a libtool stub with the current configuration.])
++cat >"$CONFIG_LT" <<_LTEOF
++#! $SHELL
++# Generated by $as_me.
++# Run this file to recreate a libtool stub with the current configuration.
+
+-cat >>"$CONFIG_LT" <<\_LTEOF
+ lt_cl_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
++_LTEOF
++
++cat >>"$CONFIG_LT" <<\_LTEOF
++AS_SHELL_SANITIZE
++_AS_PREPARE
++
++exec AS_MESSAGE_FD>&1
+ exec AS_MESSAGE_LOG_FD>>config.log
+ {
+ echo
+@@ -1582,7 +1644,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
+ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+ configured by $[0], generated by m4_PACKAGE_STRING.
+
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2008 Free Software Foundation, Inc.
+ This config.lt script is free software; the Free Software Foundation
+ gives unlimited permision to copy, distribute and modify it."
+
+@@ -1627,13 +1689,15 @@ chmod +x "$CONFIG_LT"
+ # appending to config.log, which fails on DOS, as config.log is still kept
+ # open by configure. Here we exec the FD to /dev/null, effectively closing
+ # config.log, so it can be properly (re)opened and appended to by config.lt.
+-lt_cl_success=:
+-test "$silent" = yes &&
+- lt_config_lt_args="$lt_config_lt_args --quiet"
+-exec AS_MESSAGE_LOG_FD>/dev/null
+-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+-exec AS_MESSAGE_LOG_FD>>config.log
+-$lt_cl_success || AS_EXIT(1)
++if test "$no_create" != yes; then
++ lt_cl_success=:
++ test "$silent" = yes &&
++ lt_config_lt_args="$lt_config_lt_args --quiet"
++ exec AS_MESSAGE_LOG_FD>/dev/null
++ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
++ exec AS_MESSAGE_LOG_FD>>config.log
++ $lt_cl_success || AS_EXIT(1)
++fi
+ ])# LT_OUTPUT
+
+
+@@ -1810,13 +1874,11 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)
+ AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+ AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+ AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+ dnl aclocal-1.4 backwards compatibility:
+ dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+ dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+ dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+ dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+ # _LT_TAG_COMPILER
+@@ -1921,31 +1983,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+- [lt_cv_ld_force_load=no
+- cat > conftest.c << _LT_EOF
+-int forced_loaded() { return 2;}
+-_LT_EOF
+- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+- cat > conftest.c << _LT_EOF
+-int main() { return 0;}
+-_LT_EOF
+- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+- _lt_result=$?
+- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+- lt_cv_ld_force_load=yes
+- else
+- cat conftest.err >&AS_MESSAGE_LOG_FD
+- fi
+- rm -f conftest.err libconftest.a conftest conftest.c
+- rm -rf conftest.dSYM
+- ])
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+@@ -1973,7 +2010,7 @@ _LT_EOF
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
++ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+@@ -1993,11 +2030,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- if test "$lt_cv_ld_force_load" = "yes"; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+- else
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+- fi
++ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ case $cc_basename in
+@@ -2005,7 +2038,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+- output_verbose_link_cmd=func_echo_all
++ output_verbose_link_cmd=echo
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+@@ -2051,65 +2084,170 @@ if test -z "$aix_libpath"; then aix_libp
+ # _LT_SHELL_INIT(ARG)
+ # -------------------
+ m4_define([_LT_SHELL_INIT],
+-[m4_divert_text([M4SH-INIT], [$1
+-])])# _LT_SHELL_INIT
+-
++[ifdef([AC_DIVERSION_NOTICE],
++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++ [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_SHELL_INIT
+
+
+ # _LT_PROG_ECHO_BACKSLASH
+ # -----------------------
+-# Find how we can fake an echo command that does not interpret backslash.
+-# In particular, with Autoconf 2.60 or later we add some code to the start
+-# of the generated configure script which will find a shell with a builtin
+-# printf (which we can use as an echo command).
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
+ m4_defun([_LT_PROG_ECHO_BACKSLASH],
+-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+-
+-AC_MSG_CHECKING([how to print strings])
+-# Test print first, because it will be a builtin if present.
+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+- ECHO='print -r --'
+-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+- ECHO='printf %s\n'
++[_LT_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$lt_ECHO in
++X*--fallback-echo)
++ # Remove one level of quotation (which was required for Make).
++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++ ;;
++esac
++
++ECHO=${lt_ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++ # Discard the --no-reexec flag, and continue.
++ shift
++elif test "X[$]1" = X--fallback-echo; then
++ # Avoid inline document here, it may be left over
++ :
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
++ # Yippee, $ECHO works!
++ :
+ else
+- # Use this function as a fallback that always works.
+- func_fallback_echo ()
+- {
+- eval 'cat <<_LTECHO_EOF
+-$[]1
+-_LTECHO_EOF'
+- }
+- ECHO='func_fallback_echo'
++ # Restart under the correct shell.
++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ fi
+
+-# func_echo_all arg...
+-# Invoke $ECHO with all args, space-separated.
+-func_echo_all ()
+-{
+- $ECHO "$*"
+-}
++if test "X[$]1" = X--fallback-echo; then
++ # used as fallback echo
++ shift
++ cat <<_LT_EOF
++[$]*
++_LT_EOF
++ exit 0
++fi
+
+-case "$ECHO" in
+- printf*) AC_MSG_RESULT([printf]) ;;
+- print*) AC_MSG_RESULT([print -r]) ;;
+- *) AC_MSG_RESULT([cat]) ;;
+-esac
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+-m4_ifdef([_AS_DETECT_SUGGESTED],
+-[_AS_DETECT_SUGGESTED([
+- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+- PATH=/empty FPATH=/empty; export PATH FPATH
+- test "X`printf %s $ECHO`" = "X$ECHO" \
+- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
++if test -z "$lt_ECHO"; then
++ if test "X${echo_test_string+set}" != Xset; then
++ # find a string as large as possible, as long as the shell can cope with it
++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
++ then
++ break
++ fi
++ done
++ fi
+
++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ :
++ else
++ # The Solaris, AIX, and Digital Unix default echo programs unquote
++ # backslashes. This makes it impossible to quote backslashes using
++ # echo "$something" | sed 's/\\/\\\\/g'
++ #
++ # So, first we look for a working echo in the user's PATH.
++
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for dir in $PATH /usr/ucb; do
++ IFS="$lt_save_ifs"
++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ ECHO="$dir/echo"
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
++
++ if test "X$ECHO" = Xecho; then
++ # We didn't find a better echo, so look for alternatives.
++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ # This shell has a builtin print -r that does the trick.
++ ECHO='print -r'
++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
++ test "X$CONFIG_SHELL" != X/bin/ksh; then
++ # If we have ksh, try running configure again with it.
++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++ export ORIGINAL_CONFIG_SHELL
++ CONFIG_SHELL=/bin/ksh
++ export CONFIG_SHELL
++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++ else
++ # Try using printf.
++ ECHO='printf %s\n'
++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ # Cool, printf works
++ :
++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++ test "X$echo_testing_string" = 'X\t' &&
++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++ export CONFIG_SHELL
++ SHELL="$CONFIG_SHELL"
++ export SHELL
++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++ test "X$echo_testing_string" = 'X\t' &&
++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
++ else
++ # maybe with a smaller string...
++ prev=:
++
++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
++ then
++ break
++ fi
++ prev="$cmd"
++ done
++
++ if test "$prev" != 'sed 50q "[$]0"'; then
++ echo_test_string=`eval $prev`
++ export echo_test_string
++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++ else
++ # Oops. We lost completely, so just stick with echo.
++ ECHO=echo
++ fi
++ fi
++ fi
++ fi
++ fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++lt_ECHO=$ECHO
++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
++
++AC_SUBST(lt_ECHO)
++])
+ _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
++_LT_DECL([], [ECHO], [1],
++ [An echo program that does not interpret backslashes])
+ ])# _LT_PROG_ECHO_BACKSLASH
+
+
+@@ -2141,7 +2279,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+@@ -2293,19 +2431,10 @@ if test -n "$RANLIB"; then
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+-
+-case $host_os in
+- darwin*)
+- lock_old_archive_extraction=yes ;;
+- *)
+- lock_old_archive_extraction=no ;;
+-esac
+ _LT_DECL([], [old_postinstall_cmds], [2])
+ _LT_DECL([], [old_postuninstall_cmds], [2])
+ _LT_TAGDECL([], [old_archive_cmds], [2],
+ [Commands used to build an old-style archive])
+-_LT_DECL([], [lock_old_archive_extraction], [0],
+- [Whether to use a lock for old archive extraction])
+ ])# _LT_CMD_OLD_ARCHIVE
+
+
+@@ -2330,15 +2459,15 @@ AC_CACHE_CHECK([$1], [$2],
+ -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+@@ -2378,7 +2507,7 @@ AC_CACHE_CHECK([$1], [$2],
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
+- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+@@ -2441,11 +2570,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- mint*)
+- # On MiNT this can take a long time and run out of memory.
+- lt_cv_sys_max_cmd_len=8192;
+- ;;
+-
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+@@ -2510,8 +2634,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
++ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
++ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+@@ -2562,7 +2686,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-[#line $LINENO "configure"
++[#line __oline__ "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -2603,13 +2727,7 @@ else
+ # endif
+ #endif
+
+-/* When -fvisbility=hidden is used, assume the code has been annotated
+- correspondingly for the symbols needed. */
+-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+-void fnord () __attribute__((visibility("default")));
+-#endif
+-
+-void fnord () { int i=42; }
++void fnord() { int i=42;}
+ int main ()
+ {
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -2618,11 +2736,7 @@ int main ()
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else
+- {
+- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- else puts (dlerror ());
+- }
++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+@@ -2798,16 +2912,16 @@ AC_CACHE_CHECK([if $compiler supports -c
+ -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
+- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+@@ -2966,7 +3080,6 @@ m4_require([_LT_DECL_EGREP])dnl
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_DECL_OBJDUMP])dnl
+ m4_require([_LT_DECL_SED])dnl
+-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+ AC_MSG_CHECKING([dynamic linker characteristics])
+ m4_if([$1],
+ [], [
+@@ -2975,23 +3088,16 @@ if test "$GCC" = yes; then
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+- case $host_os in
+- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+- *) lt_sed_strip_eq="s,=/,/,g" ;;
+- esac
+- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+- case $lt_search_path_spec in
+- *\;*)
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+- ;;
+- *)
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+- ;;
+- esac
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+@@ -3004,7 +3110,7 @@ if test "$GCC" = yes; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+@@ -3024,13 +3130,7 @@ BEGIN {RS=" "; FS="/|\n";} {
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+ }'`
+- # AWK program above erroneously prepends '/' to C:/dos/paths
+- # for these hosts.
+- case $host_os in
+- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+- esac
+- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi])
+@@ -3118,7 +3218,7 @@ amigaos*)
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+@@ -3171,12 +3271,23 @@ cygwin* | mingw* | pw32* | cegcc*)
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-m4_if([$1], [],[
+- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
++ # It is most probably a Windows format PATH printed by
++ # mingw gcc, but we are running on Cygwin. Gcc prints its search
++ # path with ; separators, and with drive letters. We can handle the
++ # drive letters (cygwin fileutils understands them), so leave them,
++ # especially as we might pass files found there to a mingw objdump,
++ # which wouldn't understand a cygwinified path. Ahh.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+@@ -3276,19 +3387,6 @@ gnu*)
+ hardcode_into_libs=yes
+ ;;
+
+-haiku*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- dynamic_linker="$host_os runtime_loader"
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+- hardcode_into_libs=yes
+- ;;
+-
+ hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+@@ -3331,10 +3429,8 @@ hpux9* | hpux10* | hpux11*)
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
++ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+- # or fails outright, so override atomically:
+- install_override_mode=555
+ ;;
+
+ interix[[3-9]]*)
+@@ -3401,35 +3497,26 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+-
+ # Some binutils ld are patched to set DT_RUNPATH
+- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+- [lt_cv_shlibpath_overrides_runpath=no
+- save_LDFLAGS=$LDFLAGS
+- save_libdir=$libdir
+- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+- [lt_cv_shlibpath_overrides_runpath=yes])])
+- LDFLAGS=$save_LDFLAGS
+- libdir=$save_libdir
+- ])
+- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
++ save_LDFLAGS=$LDFLAGS
++ save_libdir=$libdir
++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
++ [shlibpath_overrides_runpath=yes])])
++ LDFLAGS=$save_LDFLAGS
++ libdir=$save_libdir
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -52,13 +1013,15 @@
-
# 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' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
++ 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="/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)
+@@ -3441,6 +3528,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -77,12 +1040,82 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -4118,11 +4127,11 @@ irix5* | irix6* | nonstopux*)
+@@ -3661,8 +3760,6 @@ _LT_DECL([], [library_names_spec], [1],
+ The last name is the one that the linker finds with -lNAME]])
+ _LT_DECL([], [soname_spec], [1],
+ [[The coded name of the library, if different from the real name]])
+-_LT_DECL([], [install_override_mode], [1],
+- [Permission mode override for installation of shared libraries])
+ _LT_DECL([], [postinstall_cmds], [2],
+ [Command to use after installation of a shared archive])
+ _LT_DECL([], [postuninstall_cmds], [2],
+@@ -3775,7 +3872,6 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ m4_require([_LT_DECL_SED])dnl
+ m4_require([_LT_DECL_EGREP])dnl
+-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+ AC_ARG_WITH([gnu-ld],
+ [AS_HELP_STRING([--with-gnu-ld],
+@@ -3905,8 +4001,8 @@ case $host_os in
+ fi
+ ;;
+ esac
+-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+-_LT_TAGDECL([], [reload_cmds], [2])dnl
++_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
++_LT_DECL([], [reload_cmds], [2])dnl
+ ])# _LT_CMD_RELOAD
+
+
+@@ -3958,18 +4054,16 @@ mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
++ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+- # Keep this pattern in sync with the one in func_win32_libid.
+- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+-cegcc*)
++cegcc)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+@@ -3999,10 +4093,6 @@ gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-haiku*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+@@ -4011,11 +4101,11 @@ hpux10.20* | hpux11*)
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+@@ -4041,7 +4131,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -91,16 +1124,108 @@
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], [
+@@ -4179,19 +4269,7 @@ if test "$lt_cv_path_NM" != "no"; then
+ NM="$lt_cv_path_NM"
+ else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+- if test -n "$DUMPBIN"; then :
+- # Let the user override the test.
+- else
+- AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+- *COFF*)
+- DUMPBIN="$DUMPBIN -symbols"
+- ;;
+- *)
+- DUMPBIN=:
+- ;;
+- esac
+- fi
++ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+ AC_SUBST([DUMPBIN])
+ if test "$DUMPBIN" != ":"; then
+ NM="$DUMPBIN"
+@@ -4204,13 +4282,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-co
+ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+ [lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+ cat conftest.out >&AS_MESSAGE_LOG_FD
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -4233,7 +4311,7 @@ AC_DEFUN([LT_LIB_M],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+ *-ncr-sysv4.3*)
+@@ -4261,12 +4339,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+ if test "$GCC" = yes; then
+- case $cc_basename in
+- nvcc*)
+- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+- *)
+- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+- esac
++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+ lt_cv_prog_compiler_rtti_exceptions,
+@@ -4283,7 +4356,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_
+ m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([LT_PATH_NM])dnl
+ AC_REQUIRE([LT_PATH_LD])dnl
+ m4_require([_LT_DECL_SED])dnl
+@@ -4409,7 +4481,7 @@ _LT_EOF
+ if AC_TRY_EVAL(ac_compile); then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
++ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+ mv -f "$nlist"T "$nlist"
+@@ -4571,11 +4643,6 @@ m4_if([$1], [CXX], [
+ # DJGPP does not support shared libraries at all
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+- haiku*)
+- # PIC is the default for Haiku.
+- # The "-static" flag exists, but is broken.
+- _LT_TAGVAR(lt_prog_compiler_static, $1)=
+- ;;
+ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+@@ -4714,8 +4781,8 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- 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], [
+- xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+- # IBM XL 8.0, 9.0 on PPC and BlueGene
++ xlc* | xlC*)
++ # IBM XL 8.0 on PPC
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+@@ -4745,7 +4812,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -109,16 +1234,108 @@
;;
*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'
+@@ -4777,7 +4844,7 @@ m4_if([$1], [CXX], [
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC* | sunCC*)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4881,12 +4948,6 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- haiku*)
+- # PIC is the default for Haiku.
+- # The "-static" flag exists, but is broken.
+- _LT_TAGVAR(lt_prog_compiler_static, $1)=
+- ;;
+-
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+@@ -4929,13 +4990,6 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+-
+- case $cc_basename in
+- nvcc*) # Cuda Compiler Driver 2.2
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+- ;;
+- esac
+ else
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+@@ -4999,7 +5053,7 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+ ;;
+- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
++ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+@@ -5011,26 +5065,26 @@ m4_if([$1], [CXX], [
+ # All Alpha code is PIC.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+- xl* | bgxl* | bgf* | mpixl*)
+- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
++ xl*)
++ # IBM XL C 8.0/Fortran 10.1 on PPC
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ F* | *Sun*Fortran*)
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+- ;;
+ *Sun\ C*)
+ # Sun C 5.9
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
+ esac
+ ;;
+ esac
+@@ -5061,7 +5115,7 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -5228,6 +5237,9 @@ m4_if([$1], [CXX], [
+- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
++ f77* | f90* | f95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+@@ -5171,10 +5225,8 @@ m4_if([$1], [CXX], [
+ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+- # Also, AIX nm treats weak defined symbols like other global defined
+- # symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+@@ -5185,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'
;;
@@ -128,7 +1345,7 @@
*)
_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
+@@ -5249,36 +5304,13 @@ dnl Note also adjust exclude_expsyms for
openbsd*)
with_gnu_ld=no
;;
@@ -138,24 +1355,130 @@
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'
+-
+- # On some targets, GNU ld is compatible enough with the native linker
+- # that we're better off using the native interface for both.
+- lt_use_gnu_ld_interface=no
+ if test "$with_gnu_ld" = yes; then
+- case $host_os in
+- aix*)
+- # The AIX port of GNU ld has always aspired to compatibility
+- # with the native linker. However, as the warning in the GNU ld
+- # block says, versions before 2.19.5* couldn't really create working
+- # shared libraries, regardless of the interface used.
+- case `$LD -v 2>&1` in
+- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+- *)
+- lt_use_gnu_ld_interface=yes
+- ;;
+- esac
+- ;;
+- *)
+- lt_use_gnu_ld_interface=yes
+- ;;
+- esac
+- fi
+-
+- if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
+@@ -5312,12 +5344,11 @@ dnl Note also adjust exclude_expsyms for
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: the GNU linker, at least up to release 2.19, is reported
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+ *** Therefore, libtool is disabling shared libraries support. If you
+-*** really care for shared libraries, you may want to install binutils
+-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+-*** You will then need to restart the configuration process.
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+
+ _LT_EOF
+ fi
+@@ -5353,7 +5384,6 @@ _LT_EOF
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+@@ -5375,11 +5405,6 @@ _LT_EOF
+ fi
;;
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+- haiku*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(link_all_deplibs, $1)=yes
+- ;;
+-
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5409,12 +5434,11 @@ _LT_EOF
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+- pgf77* | pgf90* | pgf95* | pgfortran*)
+- # Portland Group f77 and f90 compilers
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -5425,17 +5449,13 @@ _LT_EOF
+ lf95*) # Lahey Fortran 8.1
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ tmp_sharedflag='--shared' ;;
+- xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
++ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+- nvcc*) # Cuda Compiler Driver 2.2
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+- _LT_TAGVAR(compiler_needs_object, $1)=yes
+- ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+@@ -5451,17 +5471,17 @@ _LT_EOF
+ fi
+
case $cc_basename in
-@@ -5474,7 +5490,7 @@ _LT_EOF
+- xlf* | bgf* | bgxlf* | mpixlf*)
++ xlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -5470,7 +5490,7 @@ _LT_EOF
fi
;;
@@ -164,7 +1487,19 @@
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
+@@ -5582,10 +5602,8 @@ _LT_EOF
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+- # Also, AIX nm treats weak defined symbols like other global
+- # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+@@ -5647,6 +5665,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -172,7 +1507,99 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5887,7 +5904,7 @@ _LT_EOF
+@@ -5674,7 +5693,7 @@ _LT_EOF
+ # empty executable.
+ _LT_SYS_MODULE_PATH_AIX
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+@@ -5689,13 +5708,8 @@ _LT_EOF
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- if test "$with_gnu_ld" = yes; then
+- # We only use this code for GNU lds that support --whole-archive.
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+- else
+- # Exported symbols can be pulled into shared objects from archives
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+- fi
++ # Exported symbols can be pulled into shared objects from archives
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+@@ -5734,7 +5748,7 @@ _LT_EOF
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+@@ -5801,7 +5815,7 @@ _LT_EOF
+ ;;
+
+ hpux10*)
+- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+@@ -5820,7 +5834,7 @@ _LT_EOF
+ ;;
+
+ hpux11*)
+- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -5841,14 +5855,7 @@ _LT_EOF
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- m4_if($1, [], [
+- # Older versions of the 11.00 compiler do not understand -b yet
+- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+- _LT_LINKER_OPTION([if $CC understands -b],
+- _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+- [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -5876,19 +5883,19 @@ _LT_EOF
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ AC_LINK_IFELSE(int foo(void) {},
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ )
+ LDFLAGS="$save_LDFLAGS"
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+@@ -5897,7 +5904,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -181,83 +1608,948 @@
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
+@@ -5950,17 +5957,17 @@ _LT_EOF
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+@@ -5970,13 +5977,13 @@ _LT_EOF
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ else
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -6167,38 +6174,36 @@ x|xyes)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+- [$RM conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+- _LT_TAGVAR(allow_undefined_flag, $1)=
+- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+- then
+- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+- else
+- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+- fi
+- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $RM conftest*
+- ])
+- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
++ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++ $RM conftest*
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
++ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
++ _LT_TAGVAR(allow_undefined_flag, $1)=
++ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
++ then
++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++ else
++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++ fi
++ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $RM conftest*
++ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+ ;;
+ esac
+ fi
+@@ -6364,14 +6369,14 @@ CC="$lt_save_CC"
+ ])# _LT_LANG_C_CONFIG
+
+
+-# _LT_LANG_CXX_CONFIG([TAG])
+-# --------------------------
+-# Ensure that the configuration variables for a C++ compiler are suitably
+-# defined. These variables are subsequently used by _LT_CONFIG to write
+-# the compiler configuration to `libtool'.
+-m4_defun([_LT_LANG_CXX_CONFIG],
+-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+-m4_require([_LT_DECL_EGREP])dnl
++# _LT_PROG_CXX
++# ------------
++# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
++# compiler, we have our own version here.
++m4_defun([_LT_PROG_CXX],
++[
++pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
++AC_PROG_CXX
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+@@ -6379,6 +6384,22 @@ if test -n "$CXX" && ( test "X$CXX" != "
+ else
+ _lt_caught_CXX_error=yes
+ fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_CXX
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_CXX], [])
++
++
++# _LT_LANG_CXX_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for a C++ compiler are suitably
++# defined. These variables are subsequently used by _LT_CONFIG to write
++# the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_CXX_CONFIG],
++[AC_REQUIRE([_LT_PROG_CXX])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_EGREP])dnl
+
+ AC_LANG_PUSH(C++)
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+@@ -6400,8 +6421,6 @@ _LT_TAGVAR(module_cmds, $1)=
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+@@ -6504,7 +6523,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+ else
+ GXX=no
+@@ -6616,7 +6635,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ _LT_SYS_MODULE_PATH_AIX
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+@@ -6631,13 +6650,8 @@ if test "$_lt_caught_CXX_error" != yes;
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- if test "$with_gnu_ld" = yes; then
+- # We only use this code for GNU lds that support --whole-archive.
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+- else
+- # Exported symbols can be pulled into shared objects from archives
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+- fi
++ # Exported symbols can be pulled into shared objects from archives
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ # This is similar to how AIX traditionally builds its shared
+ # libraries.
+@@ -6670,7 +6684,6 @@ if test "$_lt_caught_CXX_error" != yes;
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+@@ -6731,11 +6744,6 @@ if test "$_lt_caught_CXX_error" != yes;
+ gnu*)
;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- haiku*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(link_all_deplibs, $1)=yes
+- ;;
+-
+ hpux9*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -6760,7 +6768,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+@@ -6825,7 +6833,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+@@ -6868,7 +6876,7 @@ if test "$_lt_caught_CXX_error" != yes;
case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-Index: anjuta-2.32.0.0/configure
-===================================================================
---- anjuta-2.32.0.0.orig/configure 2010-10-03 11:11:00.955565974 +0200
-+++ anjuta-2.32.0.0/configure 2010-10-03 11:29:43.543563202 +0200
-@@ -1,13 +1,13 @@
+ CC*)
+ # SGI C++
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -6879,9 +6887,9 @@ if test "$_lt_caught_CXX_error" != yes;
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ fi
+ fi
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+@@ -6910,7 +6918,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -6947,26 +6955,26 @@ if test "$_lt_caught_CXX_error" != yes;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+- *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
++ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
++ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $RANLIB $oldlib'
+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+- *) # Version 6 and above use weak symbols
++ *) # Version 6 will use weak symbols
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+@@ -6974,7 +6982,7 @@ if test "$_lt_caught_CXX_error" != yes;
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+@@ -6993,9 +7001,9 @@ if test "$_lt_caught_CXX_error" != yes;
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+- xl* | mpixl* | bgxl*)
++ xl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -7015,13 +7023,13 @@ if test "$_lt_caught_CXX_error" != yes;
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+- output_verbose_link_cmd='func_echo_all'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -7090,7 +7098,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+- output_verbose_link_cmd=func_echo_all
++ output_verbose_link_cmd=echo
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -7125,15 +7133,15 @@ if test "$_lt_caught_CXX_error" != yes;
+ case $host in
+ osf3*)
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $RM $lib.exp'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ ;;
+@@ -7149,17 +7157,17 @@ if test "$_lt_caught_CXX_error" != yes;
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ esac
+
+@@ -7169,7 +7177,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+ else
+ # FIXME: insert proper C++ library support
+@@ -7205,7 +7213,7 @@ if test "$_lt_caught_CXX_error" != yes;
+
+ solaris*)
+ case $cc_basename in
+- CC* | sunCC*)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+@@ -7226,7 +7234,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ esac
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+- output_verbose_link_cmd='func_echo_all'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -7253,7 +7261,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+@@ -7264,7 +7272,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ fi
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+@@ -7318,10 +7326,6 @@ if test "$_lt_caught_CXX_error" != yes;
+ CC*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+- '"$_LT_TAGVAR(old_archive_cmds, $1)"
+- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+- '"$_LT_TAGVAR(reload_cmds, $1)"
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -7568,7 +7572,7 @@ linux*)
+
+ solaris*)
+ case $cc_basename in
+- CC* | sunCC*)
++ CC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+@@ -7612,16 +7616,32 @@ _LT_TAGDECL([], [compiler_lib_search_pat
+ ])# _LT_SYS_HIDDEN_LIBDEPS
+
+
++# _LT_PROG_F77
++# ------------
++# Since AC_PROG_F77 is broken, in that it returns the empty string
++# if there is no fortran compiler, we have our own version here.
++m4_defun([_LT_PROG_F77],
++[
++pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
++AC_PROG_F77
++if test -z "$F77" || test "X$F77" = "Xno"; then
++ _lt_disable_F77=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_F77
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_F77], [])
++
++
+ # _LT_LANG_F77_CONFIG([TAG])
+ # --------------------------
+ # Ensure that the configuration variables for a Fortran 77 compiler are
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
+ # to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_F77_CONFIG],
+-[AC_LANG_PUSH(Fortran 77)
+-if test -z "$F77" || test "X$F77" = "Xno"; then
+- _lt_disable_F77=yes
+-fi
++[AC_REQUIRE([_LT_PROG_F77])dnl
++AC_LANG_PUSH(Fortran 77)
+
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -7640,8 +7660,6 @@ _LT_TAGVAR(module_cmds, $1)=
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+@@ -7741,17 +7759,32 @@ AC_LANG_POP
+ ])# _LT_LANG_F77_CONFIG
+
+
++# _LT_PROG_FC
++# -----------
++# Since AC_PROG_FC is broken, in that it returns the empty string
++# if there is no fortran compiler, we have our own version here.
++m4_defun([_LT_PROG_FC],
++[
++pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
++AC_PROG_FC
++if test -z "$FC" || test "X$FC" = "Xno"; then
++ _lt_disable_FC=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_FC
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_FC], [])
++
++
+ # _LT_LANG_FC_CONFIG([TAG])
+ # -------------------------
+ # Ensure that the configuration variables for a Fortran compiler are
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
+ # to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_FC_CONFIG],
+-[AC_LANG_PUSH(Fortran)
+-
+-if test -z "$FC" || test "X$FC" = "Xno"; then
+- _lt_disable_FC=yes
+-fi
++[AC_REQUIRE([_LT_PROG_FC])dnl
++AC_LANG_PUSH(Fortran)
+
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -7770,8 +7803,6 @@ _LT_TAGVAR(module_cmds, $1)=
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+@@ -7917,8 +7948,6 @@ _LT_CC_BASENAME([$compiler])
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+ if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+@@ -8280,7 +8309,7 @@ _LT_EOF
+ func_dirname ()
+ {
+ # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+@@ -8291,7 +8320,7 @@ func_dirname ()
+ # func_basename file
+ func_basename ()
+ {
+- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ }
+
+ dnl func_dirname_and_basename
+@@ -8307,8 +8336,10 @@ dnl so there is no need for it here.
+ func_stripname ()
+ {
+ case ${2} in
+- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++ .*) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++ *) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+ }
+
+@@ -8319,20 +8350,20 @@ my_sed_long_arg='1s/^-[[^=]]*=//'
+ # func_opt_split
+ func_opt_split ()
+ {
+- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+ }
+
+ # func_lo2o object
+ func_lo2o ()
+ {
+- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ }
+
+ # func_xform libobj-or-source
+ func_xform ()
+ {
+- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+ }
+
+ # func_arith arithmetic-term...
+@@ -8380,15 +8411,14 @@ _LT_EOF
+
+ # Helper functions for option handling. -*- Autoconf -*-
+ #
+-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+ # Written by Gary V. Vaughan, 2004
+ #
+ # This file is free software; the Free Software Foundation gives
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+
+-# serial 7 ltoptions.m4
++# serial 6 ltoptions.m4
+
+ # This is to help aclocal find these macros, as it can't see m4_define.
+ AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+@@ -8503,7 +8533,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+ [enable_win32_dll=yes
+
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+@@ -8511,13 +8541,13 @@ case $host in
+ esac
+
+ test -z "$AS" && AS=as
+-_LT_DECL([], [AS], [1], [Assembler program])dnl
++_LT_DECL([], [AS], [0], [Assembler program])dnl
+
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+ ])# win32-dll
+
+ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+@@ -8877,29 +8907,29 @@ m4_define([lt_dict_filter],
+
+ # Generated from ltversion.in.
+
+-# serial 3175 ltversion.m4
++# serial 3017 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.2.10])
+-m4_define([LT_PACKAGE_REVISION], [1.3175])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.10'
+-macro_revision='1.3175'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+
+ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+ #
+-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
++# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+ # Written by Scott James Remnant, 2004.
+ #
+ # This file is free software; the Free Software Foundation gives
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+
+-# serial 5 lt~obsolete.m4
++# serial 4 lt~obsolete.m4
+
+ # These exist entirely to fool aclocal when bootstrapping libtool.
+ #
+@@ -8969,6 +8999,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC
+ m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
+ m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
+ m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
++m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
+ m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+ m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+ m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+@@ -8981,13 +9012,6 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [
+ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+ m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
+-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
+
+ # nls.m4 serial 5 (gettext-0.18)
+ dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+@@ -9159,7 +9183,7 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT])
++_PKG_TEXT])[]dnl
+ ])
+ elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+@@ -9170,7 +9194,7 @@ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+Index: anjuta-2.32.1.0/configure
+===================================================================
+--- anjuta-2.32.1.0.orig/configure 2010-11-12 14:54:47.000000000 +0100
++++ anjuta-2.32.1.0/configure 2010-11-13 10:44:51.682331416 +0100
+@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.65 for anjuta 2.32.0.0.
-+# Generated by GNU Autoconf 2.67 for anjuta 2.32.0.0.
+-# Generated by GNU Autoconf 2.66 for anjuta 2.32.1.0.
++# Generated by GNU Autoconf 2.67 for anjuta 2.32.1.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
+@@ -173,14 +173,6 @@ test x\$exitcode = x0 || exit 1"
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+-
+- test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+- PATH=/empty FPATH=/empty; export PATH FPATH
+- test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+- || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
+ test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
+@@ -537,8 +529,155 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+ # Sed expression to map a string onto a valid variable name.
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
++
++
++# Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+
++case X$lt_ECHO in
++X*--fallback-echo)
++ # Remove one level of quotation (which was required for Make).
++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
++ ;;
++esac
++
++ECHO=${lt_ECHO-echo}
++if test "X$1" = X--no-reexec; then
++ # Discard the --no-reexec flag, and continue.
++ shift
++elif test "X$1" = X--fallback-echo; then
++ # Avoid inline document here, it may be left over
++ :
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
++ # Yippee, $ECHO works!
++ :
++else
++ # Restart under the correct shell.
++ exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++ # used as fallback echo
++ shift
++ cat <<_LT_EOF
++$*
++_LT_EOF
++ exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test -z "$lt_ECHO"; then
++ if test "X${echo_test_string+set}" != Xset; then
++ # find a string as large as possible, as long as the shell can cope with it
++ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
++ then
++ break
++ fi
++ done
++ fi
++
++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ :
++ else
++ # The Solaris, AIX, and Digital Unix default echo programs unquote
++ # backslashes. This makes it impossible to quote backslashes using
++ # echo "$something" | sed 's/\\/\\\\/g'
++ #
++ # So, first we look for a working echo in the user's PATH.
++
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for dir in $PATH /usr/ucb; do
++ IFS="$lt_save_ifs"
++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ ECHO="$dir/echo"
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
++
++ if test "X$ECHO" = Xecho; then
++ # We didn't find a better echo, so look for alternatives.
++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ # This shell has a builtin print -r that does the trick.
++ ECHO='print -r'
++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
++ test "X$CONFIG_SHELL" != X/bin/ksh; then
++ # If we have ksh, try running configure again with it.
++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++ export ORIGINAL_CONFIG_SHELL
++ CONFIG_SHELL=/bin/ksh
++ export CONFIG_SHELL
++ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++ else
++ # Try using printf.
++ ECHO='printf %s\n'
++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ # Cool, printf works
++ :
++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++ test "X$echo_testing_string" = 'X\t' &&
++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++ export CONFIG_SHELL
++ SHELL="$CONFIG_SHELL"
++ export SHELL
++ ECHO="$CONFIG_SHELL $0 --fallback-echo"
++ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++ test "X$echo_testing_string" = 'X\t' &&
++ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ ECHO="$CONFIG_SHELL $0 --fallback-echo"
++ else
++ # maybe with a smaller string...
++ prev=:
++
++ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
++ then
++ break
++ fi
++ prev="$cmd"
++ done
++
++ if test "$prev" != 'sed 50q "$0"'; then
++ echo_test_string=`eval $prev`
++ export echo_test_string
++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++ else
++ # Oops. We lost completely, so just stick with echo.
++ ECHO=echo
++ fi
++ fi
++ fi
++ fi
++ fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++lt_ECHO=$ECHO
++if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++
++
+
+ test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
-
- # 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
+@@ -739,6 +878,14 @@ ANJUTA_CFLAGS
+ gjsdir
+ HAVE_INTROSPECTION_FALSE
+ HAVE_INTROSPECTION_TRUE
++INTROSPECTION_MAKEFILE
++INTROSPECTION_LIBS
++INTROSPECTION_CFLAGS
++INTROSPECTION_TYPELIBDIR
++INTROSPECTION_GIRDIR
++INTROSPECTION_GENERATE
++INTROSPECTION_COMPILER
++INTROSPECTION_SCANNER
+ GCONF_SCHEMAS_INSTALL_FALSE
+ GCONF_SCHEMAS_INSTALL_TRUE
+ GCONF_SCHEMA_FILE_DIR
+@@ -750,6 +897,7 @@ OTOOL
+ LIPO
+ NMEDIT
+ DSYMUTIL
++lt_ECHO
+ RANLIB
+ AR
+ OBJDUMP
+@@ -904,6 +1052,7 @@ enable_libtool_lock
+ with_gconf_source
+ with_gconf_schema_file_dir
+ enable_schemas_install
++enable_introspection
+ enable_plugin_devhelp
+ enable_plugin_glade
+ enable_plugin_sourceview
+@@ -1020,8 +1169,9 @@ do
fi
case $ac_option in
@@ -269,146 +2561,25 @@
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
+@@ -1595,6 +1745,8 @@ Optional Features:
+ --disable-libtool-lock avoid locking (might break parallel builds)
+ --disable-schemas-install
+ Disable the schemas installation
++ --enable-introspection=[no/auto/yes]
++ Enable introspection for this build
+ --disable-plugin-devhelp
+ Disable devhelp plugin support in Anjuta.
+ --disable-plugin-glade Disable glade plugin support in Anjuta.
+@@ -1753,7 +1905,7 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
- anjuta configure 2.32.0.0
--generated by GNU Autoconf 2.65
+ anjuta configure 2.32.1.0
+-generated by GNU Autoconf 2.66
+generated by GNU Autoconf 2.67
--Copyright (C) 2009 Free Software Foundation, Inc.
-+Copyright (C) 2010 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
+@@ -1825,7 +1977,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -417,25 +2588,7 @@
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
+@@ -2086,7 +2238,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -444,20 +2597,7 @@
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 :
+@@ -2195,7 +2347,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ac_header_preproc=no
fi
@@ -466,179 +2606,26 @@
{ $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
+@@ -2343,7 +2495,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.32.0.0, which was
--generated by GNU Autoconf 2.65. Invocation command line was
+ It was created by anjuta $as_me 2.32.1.0, which was
+-generated by GNU Autoconf 2.66. 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
+@@ -2601,7 +2753,7 @@ $as_echo "$as_me: loading site script $a
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
-@@ -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.32.0.
- ANJUTA_VERSION=2.32.0.0
+@@ -2715,12 +2867,11 @@ $as_echo "#define ANJUTA_VERSION 2.32.1.
+ ANJUTA_VERSION=2.32.1.0
-GLIB_REQUIRED=2.25.15
@@ -651,163 +2638,66 @@
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='
+@@ -2880,11 +3031,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;;
+ 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;;
+ 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
-
+@@ -3841,7 +3992,7 @@ 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
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4092,9 +4104,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
+@@ -3956,7 +4107,7 @@ 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
+ as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -4136,8 +4147,8 @@ done
- else
+@@ -3999,7 +4150,7 @@ 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
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -4194,9 +4205,9 @@ $as_echo "$ac_try_echo"; } >&5
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+@@ -4058,7 +4209,7 @@ $as_echo "$ac_try_echo"; } >&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.
+ 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; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
fi
fi
-@@ -4247,8 +4258,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
+@@ -4110,7 +4261,7 @@ 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
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -4699,7 +4710,7 @@ else
+@@ -4561,7 +4712,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -816,7 +2706,7 @@
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -4715,11 +4726,11 @@ else
+@@ -4577,11 +4728,11 @@ else
ac_preproc_ok=:
break
fi
@@ -830,7 +2720,7 @@
if $ac_preproc_ok; then :
break
fi
-@@ -4758,7 +4769,7 @@ else
+@@ -4620,7 +4771,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -839,7 +2729,7 @@
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -4774,18 +4785,18 @@ else
+@@ -4636,18 +4787,18 @@ else
ac_preproc_ok=:
break
fi
@@ -855,146 +2745,244 @@
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
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
-@@ -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
+@@ -5350,8 +5501,8 @@ esac
+
+
+
+-macro_version='2.2.10'
+-macro_revision='1.3175'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+
+
+
+@@ -5389,7 +5540,7 @@ fi
$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;;
+*) 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
+@@ -5422,7 +5573,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;;
+*) 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
+@@ -5438,75 +5589,6 @@ IFS=$ac_save_IFS
+ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+-# Backslashify metacharacters that are still active within
+-# double-quoted strings.
+-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\(["`\\]\)/\\\1/g'
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-
+-# Sed substitution to delay expansion of an escaped single quote.
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+-
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+-
+-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+-$as_echo_n "checking how to print strings... " >&6; }
+-# Test print first, because it will be a builtin if present.
+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+- ECHO='print -r --'
+-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+- ECHO='printf %s\n'
+-else
+- # Use this function as a fallback that always works.
+- func_fallback_echo ()
+- {
+- eval 'cat <<_LTECHO_EOF
+-$1
+-_LTECHO_EOF'
+- }
+- ECHO='func_fallback_echo'
+-fi
+-
+-# func_echo_all arg...
+-# Invoke $ECHO with all args, space-separated.
+-func_echo_all ()
+-{
+- $ECHO ""
+-}
+-
+-case "$ECHO" in
+- printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+-$as_echo "printf" >&6; } ;;
+- print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+-$as_echo "print -r" >&6; } ;;
+- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+-$as_echo "cat" >&6; } ;;
+-esac
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+ if test "${ac_cv_path_SED+set}" = set; then :
+@@ -5972,11 +6054,8 @@ if test "$lt_cv_path_NM" != "no"; then
+ NM="$lt_cv_path_NM"
+ else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+- if test -n "$DUMPBIN"; then :
+- # Let the user override the test.
+- else
+- if test -n "$ac_tool_prefix"; then
+- for ac_prog in dumpbin "link -dump"
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+@@ -6020,7 +6099,7 @@ fi
+ fi
+ if test -z "$DUMPBIN"; then
+ ac_ct_DUMPBIN=$DUMPBIN
+- for ac_prog in dumpbin "link -dump"
++ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -6075,15 +6154,6 @@ esac
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
+
+- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+- *COFF*)
+- DUMPBIN="$DUMPBIN -symbols"
+- ;;
+- *)
+- DUMPBIN=:
+- ;;
+- esac
+- fi
+
+ if test "$DUMPBIN" != ":"; then
+ NM="$DUMPBIN"
+@@ -6103,13 +6173,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 echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6176: $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 echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6179: $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)
+- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
++ (eval echo "\"\$as_me:6182: 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*)
+@@ -6155,11 +6225,6 @@ else
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- mint*)
+- # On MiNT this can take a long time and run out of memory.
+- lt_cv_sys_max_cmd_len=8192;
+- ;;
+-
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+@@ -6224,8 +6289,8 @@ else
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
++ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
++ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+@@ -6496,18 +6561,16 @@ mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
++ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+- # Keep this pattern in sync with the one in func_win32_libid.
+- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+-cegcc*)
++cegcc)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+@@ -6537,10 +6600,6 @@ gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-haiku*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+@@ -6549,11 +6608,11 @@ hpux10.20* | hpux11*)
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+@@ -6579,7 +6638,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1003,137 +2991,967 @@
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*)
+@@ -6991,18 +7050,6 @@ if test -n "$RANLIB"; then
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
+-case $host_os in
+- darwin*)
+- lock_old_archive_extraction=yes ;;
+- *)
+- lock_old_archive_extraction=no ;;
+-esac
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -7172,8 +7219,8 @@ _LT_EOF
+ test $ac_status = 0; }; then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
++ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "$nlist"; then
+@@ -7326,7 +7373,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
+- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
++ echo '#line 7376 "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
+@@ -8038,38 +8085,6 @@ rm -f core conftest.err conftest.$ac_obj
fi
--rm -f conftest.err conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+-$as_echo_n "checking for -force_load linker flag... " >&6; }
+-if test "${lt_cv_ld_force_load+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_ld_force_load=no
+- cat > conftest.c << _LT_EOF
+-int forced_loaded() { return 2;}
+-_LT_EOF
+- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+- echo "$AR cru libconftest.a conftest.o" >&5
+- $AR cru libconftest.a conftest.o 2>&5
+- echo "$RANLIB libconftest.a" >&5
+- $RANLIB libconftest.a 2>&5
+- cat > conftest.c << _LT_EOF
+-int main() { return 0;}
+-_LT_EOF
+- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+- _lt_result=$?
+- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+- lt_cv_ld_force_load=yes
+- else
+- cat conftest.err >&5
+- fi
+- rm -f conftest.err libconftest.a conftest conftest.c
+- rm -rf conftest.dSYM
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+-$as_echo "$lt_cv_ld_force_load" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+@@ -8097,7 +8112,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
++ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+@@ -8250,61 +8265,585 @@ done
+
+
+
++ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++if test -z "$CXX"; then
++ if test -n "$CCC"; then
++ CXX=$CCC
++ else
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CXX+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$CXX"; then
++ ac_cv_prog_CXX="$CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
+-
+-
+-# Set options
+-
+-
+-
+- enable_dlopen=no
+-
+-
+- enable_win32_dll=no
+-
+-
+- # Check whether --enable-shared was given.
+-if test "${enable_shared+set}" = set; then :
+- enableval=$enable_shared; p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_shared=yes ;;
+- no) enable_shared=no ;;
+- *)
+- enable_shared=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_shared=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac
++fi
++fi
++CXX=$ac_cv_prog_CXX
++if test -n "$CXX"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
++$as_echo "$CXX" >&6; }
+ else
+- enable_shared=yes
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+
++ test -n "$CXX" && break
++ done
++fi
++if test -z "$CXX"; then
++ ac_ct_CXX=$CXX
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_CXX"; then
++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_CXX="$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
+-
+-
+-
+-
+-
+-
+-
+-
+-# Check whether --with-pic was given.
+-if test "${with_pic+set}" = set; then :
+- withval=$with_pic; pic_mode="$withval"
++fi
++fi
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
++$as_echo "$ac_ct_CXX" >&6; }
+ else
+- pic_mode=default
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+
+-test -z "$pic_mode" && pic_mode=default
++ test -n "$ac_ct_CXX" && break
++done
++
++ if test "x$ac_ct_CXX" = x; then
++ CXX="g++"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ CXX=$ac_ct_CXX
++ fi
++fi
++
++ fi
++fi
++# Provide some information about the compiler.
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
++ ac_status=$?
++ if test -s conftest.err; then
++ sed '10a\
++... rest of stderr output deleted ...
++ 10q' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ fi
++ rm -f conftest.er1 conftest.err
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++#ifndef __GNUC__
++ choke me
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ ac_compiler_gnu=yes
++else
++ ac_compiler_gnu=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++ GXX=yes
++else
++ GXX=
++fi
++ac_test_CXXFLAGS=${CXXFLAGS+set}
++ac_save_CXXFLAGS=$CXXFLAGS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
++$as_echo_n "checking whether $CXX accepts -g... " >&6; }
++if test "${ac_cv_prog_cxx_g+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++ ac_cxx_werror_flag=yes
++ ac_cv_prog_cxx_g=no
++ CXXFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ ac_cv_prog_cxx_g=yes
++else
++ CXXFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++
++else
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++ CXXFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ ac_cv_prog_cxx_g=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
++$as_echo "$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++ CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++ if test "$GXX" = yes; then
++ CXXFLAGS="-g -O2"
++ else
++ CXXFLAGS="-g"
++ fi
++else
++ if test "$GXX" = yes; then
++ CXXFLAGS="-O2"
++ else
++ CXXFLAGS=
++ fi
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++depcc="$CXX" am_compiler_list=
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
++
++ am_cv_CXX_dependencies_compiler_type=none
++ if test "$am_compiler_list" = ""; then
++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++ fi
++ am__universal=false
++ case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac
++
++ for depmode in $am_compiler_list; do
++ # Setup a source with many dependencies, because some compilers
++ # like to wrap large dependency lists on column 80 (with \), and
++ # we should not choose a depcomp mode which is confused by this.
++ #
++ # We need to recreate these files for each test, as the compiler may
++ # overwrite some of them when testing with obscure command lines.
++ # This happens at least with the AIX C compiler.
++ : > sub/conftest.c
++ for i in 1 2 3 4 5 6; do
++ echo '#include "conftst'$i'.h"' >> sub/conftest.c
++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++ # Solaris 8's {/usr,}/bin/sh.
++ touch sub/conftst$i.h
++ done
++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs
++ am__obj=sub/conftest.${OBJEXT-o}
++ am__minus_obj="-o $am__obj"
++ case $depmode in
++ gcc)
++ # This depmode causes a compiler race in universal mode.
++ test "$am__universal" = false || continue
++ ;;
++ nosideeffect)
++ # after this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested
++ if test "x$enable_dependency_tracking" = xyes; then
++ continue
++ else
++ break
++ fi
++ ;;
++ msvisualcpp | msvcmsys)
++ # This compiler won't grok `-c -o', but also, the minuso test has
++ # not run yet. These depmodes are late enough in the game, and
++ # so weak that their functioning should not be impacted.
++ am__obj=conftest.${OBJEXT-o}
++ am__minus_obj=
++ ;;
++ none) break ;;
++ esac
++ if depmode=$depmode \
++ source=sub/conftest.c object=$am__obj \
++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++ # icc doesn't choke on unknown options, it will just issue warnings
++ # or remarks (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored or not supported.
++ # When given -MP, icc 7.0 and 7.1 complain thusly:
++ # icc: Command line warning: ignoring option '-M'; no argument required
++ # The diagnosis changed in icc 8.0:
++ # icc: Command line remark: option '-MP' not supported
++ if (grep 'ignoring option' conftest.err ||
++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++ am_cv_CXX_dependencies_compiler_type=$depmode
++ break
++ fi
++ fi
++ done
++
++ cd ..
++ rm -rf conftest.dir
++else
++ am_cv_CXX_dependencies_compiler_type=none
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
++
++ if
++ test "x$enable_dependency_tracking" != xno \
++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
++ am__fastdepCXX_TRUE=
++ am__fastdepCXX_FALSE='#'
++else
++ am__fastdepCXX_TRUE='#'
++ am__fastdepCXX_FALSE=
++fi
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
++$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
++if test -z "$CXXCPP"; then
++ if test "${ac_cv_prog_CXXCPP+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ # Double quotes because CXXCPP needs to be expanded
++ for CXXCPP in "$CXX -E" "/lib/cpp"
++ do
++ ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++
++else
++ # Broken: fails on valid input.
++continue
++fi
+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
++
++ # OK, works on sane cases. Now check whether nonexistent headers
++ # can be detected and how.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++ # Broken: success on invalid input.
++continue
++else
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++ break
++fi
++
++ done
++ ac_cv_prog_CXXCPP=$CXXCPP
++
++fi
++ CXXCPP=$ac_cv_prog_CXXCPP
++else
++ ac_cv_prog_CXXCPP=$CXXCPP
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
++$as_echo "$CXXCPP" >&6; }
++ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++
++else
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether nonexistent headers
++ # can be detected and how.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++ # Broken: success on invalid input.
++continue
++else
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++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;}
++_lt_caught_CXX_error=yes; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++else
++ _lt_caught_CXX_error=yes
++fi
++
++
++
++
++
++# Set options
++
++
++
++ enable_dlopen=no
++
++
++ enable_win32_dll=no
++
++
++ # Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then :
++ enableval=$enable_shared; p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_shared=yes ;;
++ no) enable_shared=no ;;
++ *)
++ enable_shared=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_shared=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
++else
++ enable_shared=yes
++fi
++
++
++
++
++
++
++
++
++
++
++
++# Check whether --with-pic was given.
++if test "${with_pic+set}" = set; then :
++ withval=$with_pic; pic_mode="$withval"
++else
++ pic_mode=default
++fi
++
++
++test -z "$pic_mode" && pic_mode=default
+
+
+
+@@ -8375,7 +8914,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+
+
+
+-
+ test -z "$LN_S" && LN_S="ln -s"
+
+
+@@ -8425,6 +8963,19 @@ _ACEOF
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
+ case $host_os in
+ aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+@@ -8437,6 +8988,23 @@ aix3*)
+ ;;
+ esac
+
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
+ # Global variables:
+ ofile=libtool
+ can_build_shared=yes
+@@ -8465,7 +9033,7 @@ for cc_temp in $compiler""; do
+ *) break;;
+ esac
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
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+ # Only perform the check for file, if the check method requires it
+@@ -8670,12 +9238,7 @@ if test -n "$compiler"; then
+ lt_prog_compiler_no_builtin_flag=
+
+ if test "$GCC" = yes; then
+- case $cc_basename in
+- nvcc*)
+- lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+- *)
+- lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+- esac
++ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+@@ -8695,15 +9258,15 @@ 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 echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9261: $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
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:9265: \$? = $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'
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_rtti_exceptions=yes
+@@ -8781,12 +9344,6 @@ $as_echo_n "checking for $compiler optio
+ lt_prog_compiler_pic='-fno-common'
;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- haiku*)
+- # PIC is the default for Haiku.
+- # The "-static" flag exists, but is broken.
+- lt_prog_compiler_static=
+- ;;
+-
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+@@ -8829,13 +9386,6 @@ $as_echo_n "checking for $compiler optio
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ esac
+-
+- case $cc_basename in
+- nvcc*) # Cuda Compiler Driver 2.2
+- lt_prog_compiler_wl='-Xlinker '
+- lt_prog_compiler_pic='-Xcompiler -fPIC'
+- ;;
+- esac
+ else
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+@@ -8898,7 +9448,7 @@ $as_echo_n "checking for $compiler optio
+ lt_prog_compiler_pic='--shared'
+ lt_prog_compiler_static='--static'
+ ;;
+- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
++ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl='-Wl,'
+@@ -8910,26 +9460,26 @@ $as_echo_n "checking for $compiler optio
+ # All Alpha code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+- xl* | bgxl* | bgf* | mpixl*)
+- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
++ xl*)
++ # IBM XL C 8.0/Fortran 10.1 on PPC
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-qpic'
+ lt_prog_compiler_static='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ F* | *Sun*Fortran*)
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+- lt_prog_compiler_pic='-KPIC'
+- lt_prog_compiler_static='-Bstatic'
+- lt_prog_compiler_wl=''
+- ;;
+ *Sun\ C*)
+ # Sun C 5.9
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Wl,'
+ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl=''
++ ;;
+ esac
+ ;;
+ esac
+@@ -8960,7 +9510,7 @@ $as_echo_n "checking for $compiler optio
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -9585,11 +9595,11 @@ else
+- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
++ f77* | f90* | f95*)
+ lt_prog_compiler_wl='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl='-Wl,';;
+@@ -9047,15 +9597,15 @@ 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 echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9600: $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
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:9604: \$? = $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
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works=yes
+@@ -9103,7 +9653,7 @@ else
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works=yes
+@@ -9152,16 +9702,16 @@ 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 echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9705: $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
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:9709: \$? = $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
+ # So say no if there are warnings
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+@@ -9207,16 +9757,16 @@ 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 echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9760: $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
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:9764: \$? = $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
+ # So say no if there are warnings
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+@@ -9326,36 +9876,13 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -1143,24 +3961,130 @@
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'
+-
+- # On some targets, GNU ld is compatible enough with the native linker
+- # that we're better off using the native interface for both.
+- lt_use_gnu_ld_interface=no
+ if test "$with_gnu_ld" = yes; then
+- case $host_os in
+- aix*)
+- # The AIX port of GNU ld has always aspired to compatibility
+- # with the native linker. However, as the warning in the GNU ld
+- # block says, versions before 2.19.5* couldn't really create working
+- # shared libraries, regardless of the interface used.
+- case `$LD -v 2>&1` in
+- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+- *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+- *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+- *)
+- lt_use_gnu_ld_interface=yes
+- ;;
+- esac
+- ;;
+- *)
+- lt_use_gnu_ld_interface=yes
+- ;;
+- esac
+- fi
+-
+- if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
+@@ -9389,12 +9916,11 @@ $as_echo_n "checking whether the $compil
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: the GNU linker, at least up to release 2.19, is reported
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+ *** Therefore, libtool is disabling shared libraries support. If you
+-*** really care for shared libraries, you may want to install binutils
+-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+-*** You will then need to restart the configuration process.
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+
+ _LT_EOF
+ fi
+@@ -9430,7 +9956,6 @@ _LT_EOF
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+- export_dynamic_flag_spec='${wl}--export-all-symbols'
+ allow_undefined_flag=unsupported
+ always_export_symbols=no
+ enable_shared_with_static_runtimes=yes
+@@ -9452,11 +9977,6 @@ _LT_EOF
+ fi
;;
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+- haiku*)
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- link_all_deplibs=yes
+- ;;
+-
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+@@ -9486,12 +10006,11 @@ _LT_EOF
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+- pgf77* | pgf90* | pgf95* | pgfortran*)
+- # Portland Group f77 and f90 compilers
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -9502,17 +10021,13 @@ _LT_EOF
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec=
+ tmp_sharedflag='--shared' ;;
+- xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
++ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+- nvcc*) # Cuda Compiler Driver 2.2
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+- compiler_needs_object=yes
+- ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+@@ -9528,17 +10043,17 @@ _LT_EOF
+ fi
+
case $cc_basename in
-@@ -10046,7 +10060,7 @@ _LT_EOF
+- xlf* | bgf* | bgxlf* | mpixlf*)
++ xlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_flag_spec_ld='-rpath $libdir'
+- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
++ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -9547,7 +10062,7 @@ _LT_EOF
fi
;;
@@ -1169,7 +4093,19 @@
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
+@@ -9659,10 +10174,8 @@ _LT_EOF
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+- # Also, AIX nm treats weak defined symbols like other global
+- # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+@@ -9724,6 +10237,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -1177,7 +4113,157 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10547,7 +10562,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9780,7 +10294,7 @@ rm -f core conftest.err conftest.$ac_obj
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+@@ -9824,13 +10338,8 @@ if test -z "$aix_libpath"; then aix_libp
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag=' ${wl}-bernotok'
+ allow_undefined_flag=' ${wl}-berok'
+- if test "$with_gnu_ld" = yes; then
+- # We only use this code for GNU lds that support --whole-archive.
+- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+- else
+- # Exported symbols can be pulled into shared objects from archives
+- whole_archive_flag_spec='$convenience'
+- fi
++ # Exported symbols can be pulled into shared objects from archives
++ whole_archive_flag_spec='$convenience'
+ archive_cmds_need_lc=yes
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+@@ -9869,7 +10378,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+@@ -9885,11 +10394,7 @@ if test -z "$aix_libpath"; then aix_libp
+ hardcode_direct=no
+ hardcode_automatic=yes
+ hardcode_shlibpath_var=unsupported
+- if test "$lt_cv_ld_force_load" = "yes"; then
+- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+- else
+- whole_archive_flag_spec=''
+- fi
++ whole_archive_flag_spec=''
+ link_all_deplibs=yes
+ allow_undefined_flag="$_lt_dar_allow_undefined"
+ case $cc_basename in
+@@ -9897,7 +10402,7 @@ if test -z "$aix_libpath"; then aix_libp
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+- output_verbose_link_cmd=func_echo_all
++ output_verbose_link_cmd=echo
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+@@ -9963,7 +10468,7 @@ if test -z "$aix_libpath"; then aix_libp
+ ;;
+
+ hpux10*)
+- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+@@ -9982,7 +10487,7 @@ if test -z "$aix_libpath"; then aix_libp
+ ;;
+
+ hpux11*)
+- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -10003,46 +10508,7 @@ if test -z "$aix_libpath"; then aix_libp
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+-
+- # Older versions of the 11.00 compiler do not understand -b yet
+- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+-$as_echo_n "checking if $CC understands -b... " >&6; }
+-if test "${lt_cv_prog_compiler__b+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_prog_compiler__b=no
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -b"
+- echo "$lt_simple_link_test_code" > conftest.$ac_ext
+- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The linker can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test -s conftest.err; then
+- # Append any errors to the config.log.
+- cat conftest.err 1>&5
+- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+- if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_cv_prog_compiler__b=yes
+- fi
+- else
+- lt_cv_prog_compiler__b=yes
+- fi
+- fi
+- $RM -r conftest*
+- LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+-$as_echo "$lt_cv_prog_compiler__b" >&6; }
+-
+-if test x"$lt_cv_prog_compiler__b" = xyes; then
+- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-else
+- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-fi
+-
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -10070,7 +10536,7 @@ fi
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+@@ -10081,15 +10547,15 @@ fi
+ int foo(void) {}
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
+ else
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+@@ -10098,7 +10564,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -1186,16 +4272,289 @@
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*
+@@ -10151,17 +10617,17 @@ rm -f core conftest.err conftest.$ac_obj
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+@@ -10171,13 +10637,13 @@ rm -f core conftest.err conftest.$ac_obj
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10380,50 +10846,44 @@ x|xyes)
+ # to ld, don't add -lc before -lgcc.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- $RM conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++ $RM conftest*
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$lt_prog_compiler_wl
+- pic_flag=$lt_prog_compiler_pic
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$allow_undefined_flag
+- allow_undefined_flag=
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$lt_prog_compiler_wl
++ pic_flag=$lt_prog_compiler_pic
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$allow_undefined_flag
++ allow_undefined_flag=
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- then
+- lt_cv_archive_cmds_need_lc=no
+- else
+- lt_cv_archive_cmds_need_lc=yes
+- fi
+- allow_undefined_flag=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $RM conftest*
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+- archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
++ then
++ archive_cmds_need_lc=no
++ else
++ archive_cmds_need_lc=yes
++ fi
++ allow_undefined_flag=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $RM conftest*
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
++$as_echo "$archive_cmds_need_lc" >&6; }
+ ;;
+ esac
+ fi
+@@ -10594,23 +11054,16 @@ if test "$GCC" = yes; then
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+- case $host_os in
+- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+- *) lt_sed_strip_eq="s,=/,/,g" ;;
+- esac
+- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+- case $lt_search_path_spec in
+- *\;*)
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+- ;;
+- *)
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+- ;;
+- esac
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+@@ -10623,7 +11076,7 @@ if test "$GCC" = yes; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+@@ -10643,13 +11096,7 @@ BEGIN {RS=" "; FS="/|\n";} {
+ if (lt_foo != "") { lt_freq[lt_foo]++; }
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
+ }'`
+- # AWK program above erroneously prepends '/' to C:/dos/paths
+- # for these hosts.
+- case $host_os in
+- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+- esac
+- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -10737,7 +11184,7 @@ amigaos*)
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
;;
-
- # 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
+@@ -10790,12 +11237,23 @@ cygwin* | mingw* | pw32* | cegcc*)
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-
+- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
++ # It is most probably a Windows format PATH printed by
++ # mingw gcc, but we are running on Cygwin. Gcc prints its search
++ # path with ; separators, and with drive letters. We can handle the
++ # drive letters (cygwin fileutils understands them), so leave them,
++ # especially as we might pass files found there to a mingw objdump,
++ # which wouldn't understand a cygwinified path. Ahh.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+@@ -10895,19 +11353,6 @@ gnu*)
+ hardcode_into_libs=yes
+ ;;
+
+-haiku*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- dynamic_linker="$host_os runtime_loader"
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+- hardcode_into_libs=yes
+- ;;
+-
+ hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+@@ -10950,10 +11395,8 @@ hpux9* | hpux10* | hpux11*)
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
++ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+- # or fails outright, so override atomically:
+- install_override_mode=555
+ ;;
+
+ interix[3-9]*)
+@@ -11020,17 +11463,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+-
+ # Some binutils ld are patched to set DT_RUNPATH
+- if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_shlibpath_overrides_runpath=no
+- save_LDFLAGS=$LDFLAGS
+- save_libdir=$libdir
+- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ save_LDFLAGS=$LDFLAGS
++ save_libdir=$libdir
++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -11043,31 +11481,23 @@ main ()
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+- lt_cv_shlibpath_overrides_runpath=yes
++ shlibpath_overrides_runpath=yes
+ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- LDFLAGS=$save_LDFLAGS
+- libdir=$save_libdir
+-
+-fi
+-
+- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
++ LDFLAGS=$save_LDFLAGS
++ libdir=$save_libdir
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -1204,13 +4563,15 @@
-
# 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' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
++ 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="/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
+@@ -11079,6 +11509,18 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1229,52 +4590,665 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12115,7 +12139,7 @@ else
+@@ -11369,11 +11811,6 @@ fi
+
+
+
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+ hardcode_action=
+@@ -11704,7 +12141,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"
+-#line $LINENO "configure"
++#line 12144 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12211,7 +12235,7 @@ else
+@@ -11745,13 +12182,7 @@ else
+ # endif
+ #endif
+
+-/* When -fvisbility=hidden is used, assume the code has been annotated
+- correspondingly for the symbols needed. */
+-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+-void fnord () __attribute__((visibility("default")));
+-#endif
+-
+-void fnord () { int i=42; }
++void fnord() { int i=42;}
+ int main ()
+ {
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -11760,11 +12191,7 @@ int main ()
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else
+- {
+- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- else puts (dlerror ());
+- }
++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+@@ -11810,7 +12237,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"
+-#line $LINENO "configure"
++#line 12240 "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; }
+@@ -11851,13 +12278,7 @@ else
+ # endif
+ #endif
+
+-/* When -fvisbility=hidden is used, assume the code has been annotated
+- correspondingly for the symbols needed. */
+-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+-void fnord () __attribute__((visibility("default")));
+-#endif
+-
+-void fnord () { int i=42; }
++void fnord() { int i=42;}
+ int main ()
+ {
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -11866,11 +12287,7 @@ int main ()
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else
+- {
+- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- else puts (dlerror ());
+- }
++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+@@ -11981,191 +12398,52 @@ fi
+ # Report which library types will actually be built
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+ $as_echo_n "checking if libtool supports shared libraries... " >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+-$as_echo "$can_build_shared" >&6; }
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+-$as_echo_n "checking whether to build shared libraries... " >&6; }
+- test "$can_build_shared" = "no" && enable_shared=no
+-
+- # On AIX, shared libraries and static libraries use the same namespace, and
+- # are all built from PIC.
+- case $host_os in
+- aix3*)
+- test "$enable_shared" = yes && enable_static=no
+- if test -n "$RANLIB"; then
+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+- postinstall_cmds='$RANLIB $lib'
+- fi
+- ;;
+-
+- aix[4-9]*)
+- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+- test "$enable_shared" = yes && enable_static=no
+- fi
+- ;;
+- esac
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+-$as_echo "$enable_shared" >&6; }
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+-$as_echo_n "checking whether to build static libraries... " >&6; }
+- # Make sure either enable_shared or enable_static is yes.
+- test "$enable_shared" = yes || enable_static=yes
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+-$as_echo "$enable_static" >&6; }
+-
+-
+-
+-
+-fi
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-CC="$lt_save_CC"
+-
+- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+- (test "X$CXX" != "Xg++"))) ; then
+- ac_ext=cpp
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+-if test -z "$CXXCPP"; then
+- if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- # Double quotes because CXXCPP needs to be expanded
+- for CXXCPP in "$CXX -E" "/lib/cpp"
+- do
+- ac_preproc_ok=false
+-for ac_cxx_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <limits.h> exists even on freestanding compilers.
+- # On the NeXT, cc -E runs the code through the compiler's parser,
+- # not just through cpp. "Syntax error" is here to catch this case.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
+-_ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+-
+-else
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
++$as_echo "$can_build_shared" >&6; }
+
+- # OK, works on sane cases. Now check whether nonexistent headers
+- # can be detected and how.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+- # Broken: success on invalid input.
+-continue
+-else
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
++$as_echo_n "checking whether to build shared libraries... " >&6; }
++ test "$can_build_shared" = "no" && enable_shared=no
+
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+- break
+-fi
++ # On AIX, shared libraries and static libraries use the same namespace, and
++ # are all built from PIC.
++ case $host_os in
++ aix3*)
++ test "$enable_shared" = yes && enable_static=no
++ if test -n "$RANLIB"; then
++ archive_cmds="$archive_cmds~\$RANLIB \$lib"
++ postinstall_cmds='$RANLIB $lib'
++ fi
++ ;;
+
+- done
+- ac_cv_prog_CXXCPP=$CXXCPP
++ aix[4-9]*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
++ ;;
++ esac
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
++$as_echo "$enable_shared" >&6; }
+
+-fi
+- CXXCPP=$ac_cv_prog_CXXCPP
+-else
+- ac_cv_prog_CXXCPP=$CXXCPP
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+-$as_echo "$CXXCPP" >&6; }
+-ac_preproc_ok=false
+-for ac_cxx_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <limits.h> exists even on freestanding compilers.
+- # On the NeXT, cc -E runs the code through the compiler's parser,
+- # not just through cpp. "Syntax error" is here to catch this case.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
+-_ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
++$as_echo_n "checking whether to build static libraries... " >&6; }
++ # Make sure either enable_shared or enable_static is yes.
++ test "$enable_shared" = yes || enable_static=yes
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
++$as_echo "$enable_static" >&6; }
+
+-else
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether nonexistent headers
+- # can be detected and how.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+- # Broken: success on invalid input.
+-continue
+-else
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
+
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f 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 \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
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
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-else
+- _lt_caught_CXX_error=yes
+-fi
++CC="$lt_save_CC"
++
+
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -12192,8 +12470,6 @@ module_cmds_CXX=
+ module_expsym_cmds_CXX=
+ link_all_deplibs_CXX=unknown
+ old_archive_cmds_CXX=$old_archive_cmds
+-reload_flag_CXX=$reload_flag
+-reload_cmds_CXX=$reload_cmds
+ no_undefined_flag_CXX=
+ whole_archive_flag_spec_CXX=
+ enable_shared_with_static_runtimes_CXX=no
+@@ -12276,7 +12552,7 @@ $RM -r conftest*
+ *) break;;
+ esac
+ done
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+ if test -n "$compiler"; then
+@@ -12438,7 +12714,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+ else
+ GXX=no
+@@ -12580,7 +12856,7 @@ if test -z "$aix_libpath"; then aix_libp
+
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+@@ -12624,13 +12900,8 @@ if test -z "$aix_libpath"; then aix_libp
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_CXX=' ${wl}-bernotok'
+ allow_undefined_flag_CXX=' ${wl}-berok'
+- if test "$with_gnu_ld" = yes; then
+- # We only use this code for GNU lds that support --whole-archive.
+- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+- else
+- # Exported symbols can be pulled into shared objects from archives
+- whole_archive_flag_spec_CXX='$convenience'
+- fi
++ # Exported symbols can be pulled into shared objects from archives
++ whole_archive_flag_spec_CXX='$convenience'
+ archive_cmds_need_lc_CXX=yes
+ # This is similar to how AIX traditionally builds its shared
+ # libraries.
+@@ -12663,7 +12934,6 @@ if test -z "$aix_libpath"; then aix_libp
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+ allow_undefined_flag_CXX=unsupported
+ always_export_symbols_CXX=no
+ enable_shared_with_static_runtimes_CXX=yes
+@@ -12690,11 +12960,7 @@ if test -z "$aix_libpath"; then aix_libp
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+- if test "$lt_cv_ld_force_load" = "yes"; then
+- whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+- else
+- whole_archive_flag_spec_CXX=''
+- fi
++ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ case $cc_basename in
+@@ -12702,7 +12968,7 @@ if test -z "$aix_libpath"; then aix_libp
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+- output_verbose_link_cmd=func_echo_all
++ output_verbose_link_cmd=echo
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+@@ -12755,11 +13021,6 @@ if test -z "$aix_libpath"; then aix_libp
+ gnu*)
;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- haiku*)
+- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- link_all_deplibs_CXX=yes
+- ;;
+-
+ hpux9*)
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+@@ -12784,7 +13045,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+@@ -12849,7 +13110,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+@@ -12892,7 +13153,7 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13979,7 +14003,7 @@ $as_echo_n "checking for $compiler optio
+ CC*)
+ # SGI C++
+- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -12903,9 +13164,9 @@ if test -z "$aix_libpath"; then aix_libp
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ fi
+ fi
+ link_all_deplibs_CXX=yes
+@@ -12934,7 +13195,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -12971,26 +13232,26 @@ if test -z "$aix_libpath"; then aix_libp
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+- *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
++ *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+ prelink_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
++ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ old_archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $RANLIB $oldlib'
+ archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+- *) # Version 6 and above use weak symbols
++ *) # Version 6 will use weak symbols
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+@@ -12998,7 +13259,7 @@ if test -z "$aix_libpath"; then aix_libp
+
+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+@@ -13017,9 +13278,9 @@ if test -z "$aix_libpath"; then aix_libp
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
;;
- 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
+- xl* | mpixl* | bgxl*)
++ xl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -13039,13 +13300,13 @@ if test -z "$aix_libpath"; then aix_libp
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_CXX=yes
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+- output_verbose_link_cmd='func_echo_all'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -13114,7 +13375,7 @@ if test -z "$aix_libpath"; then aix_libp
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+- output_verbose_link_cmd=func_echo_all
++ output_verbose_link_cmd=echo
+ else
+ ld_shlibs_CXX=no
+ fi
+@@ -13149,15 +13410,15 @@ if test -z "$aix_libpath"; then aix_libp
+ case $host in
+ osf3*)
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ allow_undefined_flag_CXX=' -expect_unresolved \*'
+- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $RM $lib.exp'
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+ ;;
+@@ -13173,17 +13434,17 @@ if test -z "$aix_libpath"; then aix_libp
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ *)
+- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ esac
+
+@@ -13193,7 +13454,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+ else
+ # FIXME: insert proper C++ library support
+@@ -13229,7 +13490,7 @@ if test -z "$aix_libpath"; then aix_libp
+
+ solaris*)
+ case $cc_basename in
+- CC* | sunCC*)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ archive_cmds_need_lc_CXX=yes
+ no_undefined_flag_CXX=' -zdefs'
+@@ -13250,7 +13511,7 @@ if test -z "$aix_libpath"; then aix_libp
+ esac
+ link_all_deplibs_CXX=yes
+
+- output_verbose_link_cmd='func_echo_all'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -13277,7 +13538,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+@@ -13288,7 +13549,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+@@ -13342,10 +13603,6 @@ if test -z "$aix_libpath"; then aix_libp
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+- '"$old_archive_cmds_CXX"
+- reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+- '"$reload_cmds_CXX"
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -13527,7 +13784,7 @@ linux*)
+
+ solaris*)
+ case $cc_basename in
+- CC* | sunCC*)
++ CC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+@@ -13643,11 +13900,6 @@ $as_echo_n "checking for $compiler optio
+ # DJGPP does not support shared libraries at all
+ lt_prog_compiler_pic_CXX=
+ ;;
+- haiku*)
+- # PIC is the default for Haiku.
+- # The "-static" flag exists, but is broken.
+- lt_prog_compiler_static_CXX=
+- ;;
+ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+@@ -13786,8 +14038,8 @@ $as_echo_n "checking for $compiler optio
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX='-non_shared'
+ ;;
+- xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+- # IBM XL 8.0, 9.0 on PPC and BlueGene
++ xlc* | xlC*)
++ # IBM XL 8.0 on PPC
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-qpic'
+ lt_prog_compiler_static_CXX='-qstaticlink'
+@@ -13817,7 +14069,7 @@ $as_echo_n "checking for $compiler optio
;;
esac
;;
@@ -1283,49 +5257,96 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -14167,11 +14191,11 @@ else
+@@ -13849,7 +14101,7 @@ $as_echo_n "checking for $compiler optio
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC* | sunCC*)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+@@ -13941,15 +14193,15 @@ 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 echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14196: $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
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:14200: \$? = $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
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works_CXX=yes
+@@ -13994,7 +14246,7 @@ else
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works_CXX=yes
+@@ -14040,16 +14292,16 @@ 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 echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14295: $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
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:14299: \$? = $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
+ # So say no if there are warnings
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
+@@ -14092,16 +14344,16 @@ 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 echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14347: $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
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:14351: \$? = $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
+ # So say no if there are warnings
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
+@@ -14156,10 +14408,8 @@ $as_echo_n "checking whether the $compil
+ aix[4-9]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+- # Also, AIX nm treats weak defined symbols like other global defined
+- # symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+@@ -14170,6 +14420,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'
;;
@@ -1335,16 +5356,196 @@
*)
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*
+@@ -14206,50 +14459,44 @@ x|xyes)
+ # to ld, don't add -lc before -lgcc.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- $RM conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++ $RM conftest*
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$lt_prog_compiler_wl_CXX
+- pic_flag=$lt_prog_compiler_pic_CXX
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+- allow_undefined_flag_CXX=
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$lt_prog_compiler_wl_CXX
++ pic_flag=$lt_prog_compiler_pic_CXX
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++ allow_undefined_flag_CXX=
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- then
+- lt_cv_archive_cmds_need_lc_CXX=no
+- else
+- lt_cv_archive_cmds_need_lc_CXX=yes
+- fi
+- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $RM conftest*
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+- archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
++ then
++ archive_cmds_need_lc_CXX=no
++ else
++ archive_cmds_need_lc_CXX=yes
++ fi
++ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $RM conftest*
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
++$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+ ;;
+ esac
+ fi
+@@ -14406,7 +14653,7 @@ amigaos*)
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
;;
-
- # 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
+@@ -14459,11 +14706,23 @@ cygwin* | mingw* | pw32* | cegcc*)
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
++ # It is most probably a Windows format PATH printed by
++ # mingw gcc, but we are running on Cygwin. Gcc prints its search
++ # path with ; separators, and with drive letters. We can handle the
++ # drive letters (cygwin fileutils understands them), so leave them,
++ # especially as we might pass files found there to a mingw objdump,
++ # which wouldn't understand a cygwinified path. Ahh.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+@@ -14562,19 +14821,6 @@ gnu*)
+ hardcode_into_libs=yes
+ ;;
+
+-haiku*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- dynamic_linker="$host_os runtime_loader"
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+- hardcode_into_libs=yes
+- ;;
+-
+ hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+@@ -14617,10 +14863,8 @@ hpux9* | hpux10* | hpux11*)
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
++ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+- # or fails outright, so override atomically:
+- install_override_mode=555
+ ;;
+
+ interix[3-9]*)
+@@ -14687,17 +14931,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+-
+ # Some binutils ld are patched to set DT_RUNPATH
+- if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_shlibpath_overrides_runpath=no
+- save_LDFLAGS=$LDFLAGS
+- save_libdir=$libdir
+- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ save_LDFLAGS=$LDFLAGS
++ save_libdir=$libdir
++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -14710,31 +14949,23 @@ main ()
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+- lt_cv_shlibpath_overrides_runpath=yes
++ shlibpath_overrides_runpath=yes
+ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- LDFLAGS=$save_LDFLAGS
+- libdir=$save_libdir
+-
+-fi
+-
+- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
++ LDFLAGS=$save_LDFLAGS
++ libdir=$save_libdir
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -1353,13 +5554,15 @@
-
# 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' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
++ 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="/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
+@@ -14746,6 +14977,18 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1378,52 +5581,126 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -15385,7 +15421,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR a
+@@ -14985,8 +15228,6 @@ fi
+
+
+
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+ hardcode_action_CXX=
+@@ -15182,7 +15423,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 ;;
+ *) 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
- :
+@@ -15196,7 +15437,90 @@ fi
+
+
+
+- if false; then
++
++
++
++ # Check whether --enable-introspection was given.
++if test "${enable_introspection+set}" = set; then :
++ enableval=$enable_introspection;
++else
++ enable_introspection=auto
++fi
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
++$as_echo_n "checking for gobject-introspection... " >&6; }
++
++ case $enable_introspection in #(
++ no) :
++ found_introspection="no (disabled, use --enable-introspection to enable)"
++ ;; #(
++ yes) :
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ :
++else
++ 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
++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ 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
++fi
++ ;; #(
++ auto) :
++ 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
++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ found_introspection=yes
++else
++ found_introspection=no
++fi
++ ;; #(
++ *) :
++ 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
++$as_echo "$found_introspection" >&6; }
++
++ INTROSPECTION_SCANNER=
++ INTROSPECTION_COMPILER=
++ INTROSPECTION_GENERATE=
++ INTROSPECTION_GIRDIR=
++ INTROSPECTION_TYPELIBDIR=
++ if test "x$found_introspection" = "xyes"; then
++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++ fi
++
++
++
++
++
++
++
++
++
++ if test "x$found_introspection" = "xyes"; then
+ HAVE_INTROSPECTION_TRUE=
+ HAVE_INTROSPECTION_FALSE='#'
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
+@@ -15205,6 +15529,8 @@ else
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
+
+
++
++
+ gjsdir=`pkg-config --variable=jsdir gjs-1.0`
+
+
+@@ -15265,9 +15591,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
@@ -1434,7 +5711,7 @@
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
+@@ -15277,9 +15601,7 @@ if test -n "$ANJUTA_CFLAGS"; then
libxslt\""; } >&5
($PKG_CONFIG --exists --print-errors "gthread-2.0 >= $GTHREAD_REQUIRED
unique-1.0 >= $UNIQUE_REQUIRED
@@ -1445,7 +5722,7 @@
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
+@@ -15292,9 +15614,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
@@ -1456,7 +5733,7 @@
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
+@@ -15314,9 +15634,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
@@ -1467,7 +5744,7 @@
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
+@@ -15326,9 +15644,7 @@ if test -n "$ANJUTA_LIBS"; then
libxslt\""; } >&5
($PKG_CONFIG --exists --print-errors "gthread-2.0 >= $GTHREAD_REQUIRED
unique-1.0 >= $UNIQUE_REQUIRED
@@ -1478,7 +5755,7 @@
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
+@@ -15341,9 +15657,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
@@ -1489,7 +5766,7 @@
gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
vte >= $VTE_REQUIRED
-@@ -15660,9 +15684,7 @@ fi
+@@ -15372,9 +15686,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
@@ -1500,7 +5777,7 @@
gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
vte >= $VTE_REQUIRED
-@@ -15673,9 +15695,7 @@ fi
+@@ -15385,9 +15697,7 @@ fi
else
ANJUTA_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0 >= $GTHREAD_REQUIRED
unique-1.0 >= $UNIQUE_REQUIRED
@@ -1511,12 +5788,9 @@
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
+@@ -15401,9 +15711,7 @@ fi
+
+ 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
@@ -1525,56 +5799,34 @@
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
+@@ -15420,7 +15728,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables ANJUTA_CFLAGS
+ and ANJUTA_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-+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
+@@ -15435,8 +15742,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; }
+-
+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
+@@ -15545,7 +15851,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;
+ 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
+@@ -15581,12 +15887,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" && \
@@ -1590,7 +5842,7 @@
else
pkg_failed=yes
fi
-@@ -15883,12 +15901,12 @@ if test -n "$PLUGIN_DEVHELP_LIBS"; then
+@@ -15597,12 +15903,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" && \
@@ -1606,7 +5858,7 @@
else
pkg_failed=yes
fi
-@@ -15908,9 +15926,9 @@ else
+@@ -15622,9 +15928,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1618,414 +5870,108 @@
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
+@@ -15853,7 +16159,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables PLUGIN_SOURCEVIEW_CFLAGS
+ and PLUGIN_SOURCEVIEW_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-+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
+@@ -15868,8 +16173,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; }
+-
+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
+@@ -15976,7 +16280,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables VALA_CFLAGS
+ and VALA_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-+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
+@@ -15991,8 +16294,7 @@ and VALA_LIBS to avoid the need to call
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; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ VALA_CFLAGS=$pkg_cv_VALA_CFLAGS
+ VALA_LIBS=$pkg_cv_VALA_LIBS
+@@ -16319,7 +16621,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables PLUGIN_SYMBOL_DB_CFLAGS
+ and PLUGIN_SYMBOL_DB_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16334,8 +16635,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
+@@ -16480,7 +16780,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables VTE_CFLAGS
+ and VTE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-+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
+@@ -16495,8 +16794,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; }
+-
+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.
+@@ -19713,6 +20011,10 @@ if test -z "${am__fastdepCXX_TRUE}" && t
+ as_fn_error $? "conditional \"am__fastdepCXX\" 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.
++if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
++ 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.
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
+@@ -20182,7 +20484,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# values after options handling.
ac_log="
- This file was extended by anjuta $as_me 2.32.0.0, which was
--generated by GNU Autoconf 2.65. Invocation command line was
+ This file was extended by anjuta $as_me 2.32.1.0, which was
+-generated by GNU Autoconf 2.66. 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
+@@ -20248,7 +20550,7 @@ 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.32.0.0
--configured by $0, generated by GNU Autoconf 2.65,
+ anjuta config.status 2.32.1.0
+-configured by $0, generated by GNU Autoconf 2.66,
+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=:
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -20269,11 +20571,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
@@ -2043,7 +5989,7 @@
*)
ac_option=$1
ac_optarg=$2
-@@ -20541,6 +20559,7 @@ do
+@@ -20295,6 +20602,7 @@ do
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -2051,237 +5997,632 @@
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
+@@ -20370,198 +20678,184 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
+ sed_quote_subst='$sed_quote_subst'
+ double_quote_subst='$double_quote_subst'
+ delay_variable_subst='$delay_variable_subst'
+-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
+-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
+-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
++enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
++pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
++enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
++host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
++host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
++host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
++build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
++build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
++build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
++SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
++Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
++GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
++EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
++FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
++LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
++NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
++LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
++max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
++ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
++exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
++lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
++lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
++lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
++reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
++reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
++deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
++file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
++AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
++AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
++RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
++old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
++CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
++GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
++SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
++ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
++MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
++need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
++DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
++NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
++LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
++libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
++shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
++export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
++allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
++inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
++link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
++fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
++always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
++export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
++variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
++need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
++version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
++runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
++libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
++soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
++old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
++striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
++predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
++postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
++predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
++postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
++LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+
+ LTCC='$LTCC'
+ LTCFLAGS='$LTCFLAGS'
+ compiler='$compiler_DEFAULT'
+
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+- eval 'cat <<_LTECHO_EOF
+-\$1
+-_LTECHO_EOF'
+-}
+-
+ # Quote evaled strings.
+-for var in SHELL \
+-ECHO \
+-SED \
++for var in SED \
+ GREP \
+ EGREP \
+ FGREP \
+@@ -20585,6 +20879,8 @@ lt_cv_sys_global_symbol_pipe \
+ lt_cv_sys_global_symbol_to_cdecl \
+ lt_cv_sys_global_symbol_to_c_name_address \
+ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
++SHELL \
++ECHO \
+ lt_prog_compiler_no_builtin_flag \
+ lt_prog_compiler_wl \
+ lt_prog_compiler_pic \
+@@ -20614,7 +20910,6 @@ variables_saved_for_relink \
+ libname_spec \
+ library_names_spec \
+ soname_spec \
+-install_override_mode \
+ finish_eval \
+ old_striplib \
+ striplib \
+@@ -20625,7 +20920,6 @@ predeps \
+ postdeps \
+ compiler_lib_search_path \
+ LD_CXX \
+-reload_flag_CXX \
+ compiler_CXX \
+ lt_prog_compiler_no_builtin_flag_CXX \
+ lt_prog_compiler_wl_CXX \
+@@ -20651,9 +20945,9 @@ postdep_objects_CXX \
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX; do
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -20680,7 +20974,6 @@ postuninstall_cmds \
+ finish_cmds \
+ sys_lib_search_path_spec \
+ sys_lib_dlsearch_path_spec \
+-reload_cmds_CXX \
+ old_archive_cmds_CXX \
+ old_archive_from_new_cmds_CXX \
+ old_archive_from_expsyms_cmds_CXX \
+@@ -20690,9 +20983,9 @@ module_cmds_CXX \
+ module_expsym_cmds_CXX \
+ export_symbols_cmds_CXX \
+ prelink_cmds_CXX; do
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -20700,6 +20993,12 @@ prelink_cmds_CXX; do
+ esac
+ done
+
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
++ ;;
++esac
++
+ ac_aux_dir='$ac_aux_dir'
+ xsi_shell='$xsi_shell'
+ lt_shell_append='$lt_shell_append'
+@@ -20875,7 +21174,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;;
+ *) 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
+@@ -21191,7 +21490,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;;
+ :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
+@@ -21219,7 +21518,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;;
+ 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
+@@ -21246,7 +21545,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 ;;
+ || 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
+@@ -21582,8 +21881,7 @@ $as_echo X"$file" |
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-# Inc.
++# 2006, 2007, 2008 Free Software Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is part of GNU Libtool.
+@@ -21631,12 +21929,6 @@ pic_mode=$pic_mode
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# An echo program that protects backslashes.
+-ECHO=$lt_ECHO
+-
+ # The host system.
+ host_alias=$host_alias
+ host=$host
+@@ -21686,6 +21978,10 @@ SP2NL=$lt_lt_SP2NL
+ # turn newlines into spaces.
+ NL2SP=$lt_lt_NL2SP
+
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
+ # An object symbol dumper.
+ OBJDUMP=$lt_OBJDUMP
+
+@@ -21707,9 +22003,6 @@ RANLIB=$lt_RANLIB
+ old_postinstall_cmds=$lt_old_postinstall_cmds
+ old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+-# Whether to use a lock for old archive extraction.
+-lock_old_archive_extraction=$lock_old_archive_extraction
+-
+ # A C compiler.
+ LTCC=$lt_CC
+
+@@ -21731,6 +22024,12 @@ global_symbol_to_c_name_address_lib_pref
+ # The name of the directory that contains temporary libtool files.
+ objdir=$objdir
+
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# An echo program that does not interpret backslashes.
++ECHO=$lt_ECHO
++
+ # Used to examine libraries when file_magic_cmd begins with "file".
+ MAGIC_CMD=$MAGIC_CMD
+
+@@ -21793,9 +22092,6 @@ library_names_spec=$lt_library_names_spe
+ # The coded name of the library, if different from the real name.
+ soname_spec=$lt_soname_spec
+
+-# Permission mode override for installation of shared libraries.
+-install_override_mode=$lt_install_override_mode
+-
+ # Command to use after installation of a shared archive.
+ postinstall_cmds=$lt_postinstall_cmds
+
+@@ -21835,10 +22131,6 @@ striplib=$lt_striplib
+ # The linker used to build libraries.
+ LD=$lt_LD
+
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+ # Commands used to build an old-style archive.
+ old_archive_cmds=$lt_old_archive_cmds
+
+@@ -22112,7 +22404,7 @@ _LT_EOF
+ func_dirname ()
+ {
+ # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
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.32.0.0/libanjuta/Makefile.in
-===================================================================
---- anjuta-2.32.0.0.orig/libanjuta/Makefile.in 2010-10-03 11:11:00.943568639 +0200
-+++ anjuta-2.32.0.0/libanjuta/Makefile.in 2010-10-03 11:29:43.543563202 +0200
+@@ -22123,7 +22415,7 @@ func_dirname ()
+ # func_basename file
+ func_basename ()
+ {
+- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ }
+
+
+@@ -22136,8 +22428,10 @@ func_basename ()
+ func_stripname ()
+ {
+ case ${2} in
+- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++ .*) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++ *) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+ }
+
+@@ -22148,20 +22442,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
+ # func_opt_split
+ func_opt_split ()
+ {
+- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+ }
+
+ # func_lo2o object
+ func_lo2o ()
+ {
+- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ }
+
+ # func_xform libobj-or-source
+ func_xform ()
+ {
+- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+ }
+
+ # func_arith arithmetic-term...
+@@ -22222,10 +22516,6 @@ _LT_EOF
+ # The linker used to build libraries.
+ LD=$lt_LD_CXX
+
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag_CXX
+-reload_cmds=$lt_reload_cmds_CXX
+-
+ # Commands used to build an old-style archive.
+ old_archive_cmds=$lt_old_archive_cmds_CXX
+
+Index: anjuta-2.32.1.0/libanjuta/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/libanjuta/Makefile.in 2010-11-12 14:54:48.000000000 +0100
++++ anjuta-2.32.1.0/libanjuta/Makefile.in 2010-11-13 10:44:53.946333609 +0100
@@ -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 \
@@ -2291,7 +6632,30 @@
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 = \
+@@ -264,6 +264,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -387,6 +395,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -478,6 +487,8 @@ libanjuta_la_SOURCES = \
cell-renderer-captioned-image.h \
e-splash.h \
e-splash.c \
@@ -2300,7 +6664,7 @@
anjuta-vcs-status.h \
anjuta-vcs-status-tree-view.c \
anjuta-vcs-status-tree-view.h \
-@@ -549,6 +551,7 @@ libanjuta_include = \
+@@ -540,6 +551,7 @@ libanjuta_include = \
anjuta-session.h \
anjuta-save-prompt.h \
anjuta-serializer.h \
@@ -2308,7 +6672,7 @@
resources.h \
anjuta-vcs-status-tree-view.h \
anjuta-vcs-status.h \
-@@ -722,6 +725,7 @@ distclean-compile:
+@@ -713,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@
@@ -2316,10 +6680,10 @@
@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@
-Index: anjuta-2.32.0.0/plugins/language-support-python/Makefile.in
-===================================================================
---- anjuta-2.32.0.0.orig/plugins/language-support-python/Makefile.in 2010-10-03 11:30:35.451566100 +0200
-+++ anjuta-2.32.0.0/plugins/language-support-python/Makefile.in 2010-10-03 11:30:18.491562039 +0200
+Index: anjuta-2.32.1.0/plugins/language-support-python/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/language-support-python/Makefile.in 2010-11-12 14:54:53.000000000 +0100
++++ anjuta-2.32.1.0/plugins/language-support-python/Makefile.in 2010-11-13 10:44:59.022334613 +0100
@@ -86,6 +86,10 @@ libpython_plugin_la_OBJECTS = $(am_libpy
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -2331,7 +6695,30 @@
SCRIPTS = $(scripts_SCRIPTS)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -388,6 +392,7 @@ plugin_LTLIBRARIES = libpython_plugin.la
+@@ -201,6 +205,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -324,6 +336,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -379,6 +392,7 @@ plugin_LTLIBRARIES = libpython_plugin.la
# Plugin sources
libpython_plugin_la_SOURCES = plugin.c plugin.h python-assist.c python-assist.h python-utils.c python-utils.h
@@ -2339,7 +6726,7 @@
# Plugin dependencies
libpython_plugin_la_LIBADD = \
-@@ -472,7 +477,7 @@ clean-pluginLTLIBRARIES:
+@@ -463,7 +477,7 @@ clean-pluginLTLIBRARIES:
rm -f "$${dir}/so_locations"; \
done
libpython_plugin.la: $(libpython_plugin_la_OBJECTS) $(libpython_plugin_la_DEPENDENCIES)
@@ -2348,3 +6735,3405 @@
install-scriptsSCRIPTS: $(scripts_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
+Index: anjuta-2.32.1.0/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/Makefile.in 2010-11-13 10:45:10.054339149 +0100
++++ anjuta-2.32.1.0/Makefile.in 2010-11-13 10:45:06.526336098 +0100
+@@ -215,6 +215,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -338,6 +346,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/data/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/data/Makefile.in 2010-11-13 10:45:24.249836079 +0100
++++ anjuta-2.32.1.0/data/Makefile.in 2010-11-13 10:44:53.578333702 +0100
+@@ -159,6 +159,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -282,6 +290,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/doc/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/doc/Makefile.in 2010-11-13 10:45:23.989835645 +0100
++++ anjuta-2.32.1.0/doc/Makefile.in 2010-11-13 10:44:53.690335227 +0100
+@@ -161,6 +161,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -284,6 +292,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/launcher/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/launcher/Makefile.in 2010-11-13 10:45:24.401831653 +0100
++++ anjuta-2.32.1.0/launcher/Makefile.in 2010-11-13 10:44:53.794332164 +0100
+@@ -166,6 +166,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -289,6 +297,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/libanjuta/interfaces/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/libanjuta/interfaces/Makefile.in 2010-11-13 10:45:10.510340064 +0100
++++ anjuta-2.32.1.0/libanjuta/interfaces/Makefile.in 2010-11-13 10:44:54.074334033 +0100
+@@ -219,6 +219,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -342,6 +350,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/libfoocanvas/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/libfoocanvas/Makefile.in 2010-11-13 10:45:23.893833008 +0100
++++ anjuta-2.32.1.0/libfoocanvas/Makefile.in 2010-11-13 10:44:54.182335956 +0100
+@@ -191,6 +191,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -314,6 +322,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/manuals/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/manuals/Makefile.in 2010-11-13 10:45:11.381834487 +0100
++++ anjuta-2.32.1.0/manuals/Makefile.in 2010-11-13 10:44:54.266333914 +0100
+@@ -177,6 +177,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -300,6 +308,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/manuals/anjuta-build-tutorial/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/manuals/anjuta-build-tutorial/Makefile.in 2010-11-13 10:45:11.577837900 +0100
++++ anjuta-2.32.1.0/manuals/anjuta-build-tutorial/Makefile.in 2010-11-13 10:44:54.406333620 +0100
+@@ -158,6 +158,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -281,6 +289,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/manuals/anjuta-faqs/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/manuals/anjuta-faqs/Makefile.in 2010-11-13 10:45:11.473839478 +0100
++++ anjuta-2.32.1.0/manuals/anjuta-faqs/Makefile.in 2010-11-13 10:44:54.529832842 +0100
+@@ -158,6 +158,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -281,6 +289,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/manuals/anjuta-manual/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/manuals/anjuta-manual/Makefile.in 2010-11-13 10:45:12.789836132 +0100
++++ anjuta-2.32.1.0/manuals/anjuta-manual/Makefile.in 2010-11-13 10:44:54.658332418 +0100
+@@ -158,6 +158,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -281,6 +289,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/manuals/reference/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/manuals/reference/Makefile.in 2010-11-13 10:45:11.721834759 +0100
++++ anjuta-2.32.1.0/manuals/reference/Makefile.in 2010-11-13 10:44:54.742333310 +0100
+@@ -173,6 +173,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -296,6 +304,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/manuals/reference/libanjuta/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/manuals/reference/libanjuta/Makefile.in 2010-11-13 10:45:11.813835339 +0100
++++ anjuta-2.32.1.0/manuals/reference/libanjuta/Makefile.in 2010-11-13 10:44:54.842333097 +0100
+@@ -140,6 +140,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -263,6 +271,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/mime/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/mime/Makefile.in 2010-11-13 10:45:13.357838560 +0100
++++ anjuta-2.32.1.0/mime/Makefile.in 2010-11-13 10:44:54.926333022 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/pixmaps/16x16/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/pixmaps/16x16/Makefile.in 2010-11-13 10:45:13.561837262 +0100
++++ anjuta-2.32.1.0/pixmaps/16x16/Makefile.in 2010-11-13 10:44:55.014332547 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/pixmaps/22x22/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/pixmaps/22x22/Makefile.in 2010-11-13 10:45:14.097836042 +0100
++++ anjuta-2.32.1.0/pixmaps/22x22/Makefile.in 2010-11-13 10:44:55.098332475 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/pixmaps/24x24/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/pixmaps/24x24/Makefile.in 2010-11-13 10:45:13.985835486 +0100
++++ anjuta-2.32.1.0/pixmaps/24x24/Makefile.in 2010-11-13 10:44:55.186332973 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/pixmaps/32x32/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/pixmaps/32x32/Makefile.in 2010-11-13 10:45:13.677840344 +0100
++++ anjuta-2.32.1.0/pixmaps/32x32/Makefile.in 2010-11-13 10:44:55.270333375 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/pixmaps/48x48/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/pixmaps/48x48/Makefile.in 2010-11-13 10:45:13.885837159 +0100
++++ anjuta-2.32.1.0/pixmaps/48x48/Makefile.in 2010-11-13 10:44:55.358332894 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/pixmaps/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/pixmaps/Makefile.in 2010-11-13 10:45:13.469841555 +0100
++++ anjuta-2.32.1.0/pixmaps/Makefile.in 2010-11-13 10:44:55.450332998 +0100
+@@ -198,6 +198,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -321,6 +329,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/pixmaps/scalable/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/pixmaps/scalable/Makefile.in 2010-11-13 10:45:13.781839725 +0100
++++ anjuta-2.32.1.0/pixmaps/scalable/Makefile.in 2010-11-13 10:44:55.538332526 +0100
+@@ -158,6 +158,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -281,6 +289,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/Makefile.in 2010-11-13 10:45:14.225837920 +0100
++++ anjuta-2.32.1.0/plugins/Makefile.in 2010-11-13 10:44:55.626335963 +0100
+@@ -173,6 +173,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -296,6 +304,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/build-basic-autotools/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/build-basic-autotools/Makefile.in 2010-11-13 10:45:16.521837902 +0100
++++ anjuta-2.32.1.0/plugins/build-basic-autotools/Makefile.in 2010-11-13 10:44:55.754334415 +0100
+@@ -202,6 +202,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -325,6 +333,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/class-gen/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/class-gen/Makefile.in 2010-11-13 10:45:16.241834085 +0100
++++ anjuta-2.32.1.0/plugins/class-gen/Makefile.in 2010-11-13 10:44:55.882334342 +0100
+@@ -236,6 +236,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -359,6 +367,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/class-gen/templates/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/class-gen/templates/Makefile.in 2010-11-13 10:45:16.337836715 +0100
++++ anjuta-2.32.1.0/plugins/class-gen/templates/Makefile.in 2010-11-13 10:44:55.966334754 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/class-inheritance/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/class-inheritance/Makefile.in 2010-11-13 10:45:15.321835519 +0100
++++ anjuta-2.32.1.0/plugins/class-inheritance/Makefile.in 2010-11-13 10:44:56.082332955 +0100
+@@ -205,6 +205,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -328,6 +336,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/cvs-plugin/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/cvs-plugin/Makefile.in 2010-11-13 10:45:22.765836155 +0100
++++ anjuta-2.32.1.0/plugins/cvs-plugin/Makefile.in 2010-11-13 10:44:56.206332790 +0100
+@@ -204,6 +204,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -327,6 +335,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/debug-manager/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/debug-manager/Makefile.in 2010-11-13 10:45:14.581836104 +0100
++++ anjuta-2.32.1.0/plugins/debug-manager/Makefile.in 2010-11-13 10:44:56.338335239 +0100
+@@ -240,6 +240,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -363,6 +371,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/debug-manager/images/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/debug-manager/images/Makefile.in 2010-11-13 10:45:14.817840876 +0100
++++ anjuta-2.32.1.0/plugins/debug-manager/images/Makefile.in 2010-11-13 10:44:56.422332232 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/devhelp/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/devhelp/Makefile.in 2010-11-13 10:45:20.361835716 +0100
++++ anjuta-2.32.1.0/plugins/devhelp/Makefile.in 2010-11-13 10:44:56.538332876 +0100
+@@ -200,6 +200,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -323,6 +331,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/dir-project/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/dir-project/Makefile.in 2010-11-13 10:45:21.569833391 +0100
++++ anjuta-2.32.1.0/plugins/dir-project/Makefile.in 2010-11-13 10:44:56.662333205 +0100
+@@ -195,6 +195,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -318,6 +326,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/document-manager/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/document-manager/Makefile.in 2010-11-13 10:45:22.533835377 +0100
++++ anjuta-2.32.1.0/plugins/document-manager/Makefile.in 2010-11-13 10:44:56.786333033 +0100
+@@ -241,6 +241,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -364,6 +372,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/document-manager/images/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/document-manager/images/Makefile.in 2010-11-13 10:45:22.609833168 +0100
++++ anjuta-2.32.1.0/plugins/document-manager/images/Makefile.in 2010-11-13 10:44:56.874333045 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/file-loader/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/file-loader/Makefile.in 2010-11-13 10:45:15.449843273 +0100
++++ anjuta-2.32.1.0/plugins/file-loader/Makefile.in 2010-11-13 10:44:56.990332218 +0100
+@@ -195,6 +195,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -318,6 +326,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/file-manager/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/file-manager/Makefile.in 2010-11-13 10:45:15.589840543 +0100
++++ anjuta-2.32.1.0/plugins/file-manager/Makefile.in 2010-11-13 10:44:57.118331665 +0100
+@@ -203,6 +203,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -326,6 +334,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/file-wizard/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/file-wizard/Makefile.in 2010-11-13 10:45:20.625836739 +0100
++++ anjuta-2.32.1.0/plugins/file-wizard/Makefile.in 2010-11-13 10:44:57.234333273 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/gbf-am/GBF/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/gbf-am/GBF/Makefile.in 2010-11-13 10:45:21.909834624 +0100
++++ anjuta-2.32.1.0/plugins/gbf-am/GBF/Makefile.in 2010-11-13 10:44:57.318333187 +0100
+@@ -158,6 +158,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -281,6 +289,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/gbf-am/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/gbf-am/Makefile.in 2010-11-13 10:45:21.841836523 +0100
++++ anjuta-2.32.1.0/plugins/gbf-am/Makefile.in 2010-11-13 10:44:57.470333166 +0100
+@@ -246,6 +246,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -369,6 +377,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/gbf-mkfile/GBF/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/gbf-mkfile/GBF/Makefile.in 2010-11-13 10:45:21.709835539 +0100
++++ anjuta-2.32.1.0/plugins/gbf-mkfile/GBF/Makefile.in 2010-11-13 10:44:57.554333584 +0100
+@@ -158,6 +158,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -281,6 +289,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/gbf-mkfile/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/gbf-mkfile/Makefile.in 2010-11-13 10:45:21.637836867 +0100
++++ anjuta-2.32.1.0/plugins/gbf-mkfile/Makefile.in 2010-11-13 10:44:57.678332934 +0100
+@@ -237,6 +237,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -360,6 +368,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/gdb/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/gdb/Makefile.in 2010-11-13 10:45:23.365834409 +0100
++++ anjuta-2.32.1.0/plugins/gdb/Makefile.in 2010-11-13 10:44:57.822334185 +0100
+@@ -245,6 +245,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -368,6 +376,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/gdb/images/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/gdb/images/Makefile.in 2010-11-13 10:45:23.437833576 +0100
++++ anjuta-2.32.1.0/plugins/gdb/images/Makefile.in 2010-11-13 10:44:57.906332644 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/git/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/git/Makefile.in 2010-11-13 10:45:22.093836791 +0100
++++ anjuta-2.32.1.0/plugins/git/Makefile.in 2010-11-13 10:44:58.050333914 +0100
+@@ -238,6 +238,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -361,6 +369,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/glade/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/glade/Makefile.in 2010-11-13 10:45:23.293834754 +0100
++++ anjuta-2.32.1.0/plugins/glade/Makefile.in 2010-11-13 10:44:58.166335041 +0100
+@@ -201,6 +201,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -324,6 +332,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/gtodo/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/gtodo/Makefile.in 2010-11-13 10:45:21.969834010 +0100
++++ anjuta-2.32.1.0/plugins/gtodo/Makefile.in 2010-11-13 10:44:58.290333401 +0100
+@@ -198,6 +198,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -321,6 +329,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/js-debugger/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/js-debugger/Makefile.in 2010-11-13 10:45:21.773835006 +0100
++++ anjuta-2.32.1.0/plugins/js-debugger/Makefile.in 2010-11-13 10:44:58.402332972 +0100
+@@ -195,6 +195,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -318,6 +326,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/language-manager/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/language-manager/Makefile.in 2010-11-13 10:45:23.825833441 +0100
++++ anjuta-2.32.1.0/plugins/language-manager/Makefile.in 2010-11-13 10:44:58.518332636 +0100
+@@ -196,6 +196,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -319,6 +327,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/language-support-cpp-java/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/language-support-cpp-java/Makefile.in 2010-11-13 10:45:23.105836431 +0100
++++ anjuta-2.32.1.0/plugins/language-support-cpp-java/Makefile.in 2010-11-13 10:44:58.658332837 +0100
+@@ -260,6 +260,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -383,6 +391,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/language-support-cpp-java/cxxparser/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/language-support-cpp-java/cxxparser/Makefile.in 2010-11-13 10:45:23.173836482 +0100
++++ anjuta-2.32.1.0/plugins/language-support-cpp-java/cxxparser/Makefile.in 2010-11-13 10:44:58.766332797 +0100
+@@ -188,6 +188,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -311,6 +319,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/language-support-js/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/language-support-js/Makefile.in 2010-11-13 10:45:14.317838502 +0100
++++ anjuta-2.32.1.0/plugins/language-support-js/Makefile.in 2010-11-13 10:44:58.890335569 +0100
+@@ -208,6 +208,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -331,6 +339,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/language-support-vala/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/language-support-vala/Makefile.in 2010-11-13 10:45:22.853836652 +0100
++++ anjuta-2.32.1.0/plugins/language-support-vala/Makefile.in 2010-11-13 10:44:59.134334187 +0100
+@@ -209,6 +209,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -332,6 +340,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/message-view/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/message-view/Makefile.in 2010-11-13 10:45:20.697834923 +0100
++++ anjuta-2.32.1.0/plugins/message-view/Makefile.in 2010-11-13 10:44:59.262333616 +0100
+@@ -204,6 +204,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -327,6 +335,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/patch/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/patch/Makefile.in 2010-11-13 10:45:15.065838119 +0100
++++ anjuta-2.32.1.0/plugins/patch/Makefile.in 2010-11-13 10:44:59.382335806 +0100
+@@ -195,6 +195,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -318,6 +326,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-import/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-import/Makefile.in 2010-11-13 10:45:16.117842077 +0100
++++ anjuta-2.32.1.0/plugins/project-import/Makefile.in 2010-11-13 10:44:59.498332536 +0100
+@@ -198,6 +198,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -321,6 +329,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-manager/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-manager/Makefile.in 2010-11-13 10:45:23.733836283 +0100
++++ anjuta-2.32.1.0/plugins/project-manager/Makefile.in 2010-11-13 10:44:59.618333270 +0100
+@@ -198,6 +198,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -321,6 +329,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/Makefile.in 2010-11-13 10:45:16.793837618 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/Makefile.in 2010-11-13 10:44:59.746332702 +0100
+@@ -237,6 +237,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -360,6 +368,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/Makefile.in 2010-11-13 10:45:16.897834076 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/Makefile.in 2010-11-13 10:44:59.838332798 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/anjuta-plugin/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/anjuta-plugin/Makefile.in 2010-11-13 10:45:18.941833314 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/anjuta-plugin/Makefile.in 2010-11-13 10:44:59.926333301 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/anjuta-plugin/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/anjuta-plugin/po/Makefile.in 2010-11-13 10:45:18.989833410 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/anjuta-plugin/po/Makefile.in 2010-11-13 10:45:00.014333805 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.in 2010-11-13 10:45:19.041834089 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.in 2010-11-13 10:45:00.098332754 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/cpp/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/cpp/Makefile.in 2010-11-13 10:45:17.973835147 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/cpp/Makefile.in 2010-11-13 10:45:00.186333252 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/cpp/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/cpp/po/Makefile.in 2010-11-13 10:45:18.017836135 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/cpp/po/Makefile.in 2010-11-13 10:45:00.270332676 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/cpp/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/cpp/src/Makefile.in 2010-11-13 10:45:18.069834368 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/cpp/src/Makefile.in 2010-11-13 10:45:00.354333084 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/directory/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/directory/Makefile.in 2010-11-13 10:45:19.917835082 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/directory/Makefile.in 2010-11-13 10:45:00.438333009 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/gcj/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/gcj/Makefile.in 2010-11-13 10:45:19.113836190 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/gcj/Makefile.in 2010-11-13 10:45:00.530334582 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/gcj/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/gcj/src/Makefile.in 2010-11-13 10:45:19.165835885 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/gcj/src/Makefile.in 2010-11-13 10:45:00.610332952 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/gtk/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/gtk/Makefile.in 2010-11-13 10:45:18.753836448 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/gtk/Makefile.in 2010-11-13 10:45:00.698333449 +0100
+@@ -173,6 +173,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -296,6 +304,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/gtk/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/gtk/po/Makefile.in 2010-11-13 10:45:18.805838584 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/gtk/po/Makefile.in 2010-11-13 10:45:00.782333363 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/gtk/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/gtk/src/Makefile.in 2010-11-13 10:45:18.857834856 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/gtk/src/Makefile.in 2010-11-13 10:45:00.866332307 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/gtkmm/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/gtkmm/Makefile.in 2010-11-13 10:45:18.253832606 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/gtkmm/Makefile.in 2010-11-13 10:45:00.954332810 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/gtkmm/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/gtkmm/po/Makefile.in 2010-11-13 10:45:18.305833765 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/gtkmm/po/Makefile.in 2010-11-13 10:45:01.038333226 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/gtkmm/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/gtkmm/src/Makefile.in 2010-11-13 10:45:18.357832973 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/gtkmm/src/Makefile.in 2010-11-13 10:45:01.122332662 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/java/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/java/Makefile.in 2010-11-13 10:45:19.977834957 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/java/Makefile.in 2010-11-13 10:45:01.210332669 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/java/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/java/po/Makefile.in 2010-11-13 10:45:20.033835237 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/java/po/Makefile.in 2010-11-13 10:45:01.294333072 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/java/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/java/src/Makefile.in 2010-11-13 10:45:20.081834357 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/java/src/Makefile.in 2010-11-13 10:45:01.378332993 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/js_minimal/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/js_minimal/Makefile.in 2010-11-13 10:45:18.125833176 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/js_minimal/Makefile.in 2010-11-13 10:45:01.470334074 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/js_minimal/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/js_minimal/src/Makefile.in 2010-11-13 10:45:18.185835981 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/js_minimal/src/Makefile.in 2010-11-13 10:45:01.554332536 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/library/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/library/Makefile.in 2010-11-13 10:45:19.229835355 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/library/Makefile.in 2010-11-13 10:45:01.642332549 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/library/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/library/po/Makefile.in 2010-11-13 10:45:19.281836023 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/library/po/Makefile.in 2010-11-13 10:45:01.726333933 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/library/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/library/src/Makefile.in 2010-11-13 10:45:19.333833762 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/library/src/Makefile.in 2010-11-13 10:45:01.810332870 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/licenses/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/licenses/Makefile.in 2010-11-13 10:45:17.637834981 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/licenses/Makefile.in 2010-11-13 10:45:01.894333284 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/m4/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/m4/Makefile.in 2010-11-13 10:45:19.405833908 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/m4/Makefile.in 2010-11-13 10:45:01.978332718 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/minimal/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/minimal/Makefile.in 2010-11-13 10:45:19.681836172 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/minimal/Makefile.in 2010-11-13 10:45:02.062333135 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/mkfile/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/mkfile/Makefile.in 2010-11-13 10:45:17.749835031 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/mkfile/Makefile.in 2010-11-13 10:45:02.150334125 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/mkfile/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/mkfile/po/Makefile.in 2010-11-13 10:45:17.857840863 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/mkfile/po/Makefile.in 2010-11-13 10:45:02.238335108 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/mkfile/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/mkfile/src/Makefile.in 2010-11-13 10:45:17.929835630 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/mkfile/src/Makefile.in 2010-11-13 10:45:02.318332977 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/pygtk/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/pygtk/Makefile.in 2010-11-13 10:45:19.465835738 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/pygtk/Makefile.in 2010-11-13 10:45:02.410335036 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/pygtk/data/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/pygtk/data/Makefile.in 2010-11-13 10:45:19.573836204 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/pygtk/data/Makefile.in 2010-11-13 10:45:02.494333983 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/pygtk/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/pygtk/po/Makefile.in 2010-11-13 10:45:19.521837483 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/pygtk/po/Makefile.in 2010-11-13 10:45:02.578332934 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/pygtk/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/pygtk/src/Makefile.in 2010-11-13 10:45:19.625836390 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/pygtk/src/Makefile.in 2010-11-13 10:45:02.662332856 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/python/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/python/Makefile.in 2010-11-13 10:45:19.749833774 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/python/Makefile.in 2010-11-13 10:45:02.750333838 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/python/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/python/po/Makefile.in 2010-11-13 10:45:19.801834444 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/python/po/Makefile.in 2010-11-13 10:45:02.834332778 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/python/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/python/src/Makefile.in 2010-11-13 10:45:19.857837161 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/python/src/Makefile.in 2010-11-13 10:45:02.918333192 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/sdl/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/sdl/Makefile.in 2010-11-13 10:45:18.577836433 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/sdl/Makefile.in 2010-11-13 10:45:03.010336229 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/sdl/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/sdl/po/Makefile.in 2010-11-13 10:45:18.633835241 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/sdl/po/Makefile.in 2010-11-13 10:45:03.094335179 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/sdl/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/sdl/src/Makefile.in 2010-11-13 10:45:18.685834446 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/sdl/src/Makefile.in 2010-11-13 10:45:03.174333055 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/terminal/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/terminal/Makefile.in 2010-11-13 10:45:16.997841203 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/terminal/Makefile.in 2010-11-13 10:45:03.266333146 +0100
+@@ -198,6 +198,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -321,6 +329,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/terminal/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/terminal/po/Makefile.in 2010-11-13 10:45:17.117839981 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/terminal/po/Makefile.in 2010-11-13 10:45:03.350335020 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/terminal/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/terminal/src/Makefile.in 2010-11-13 10:45:17.225834079 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/terminal/src/Makefile.in 2010-11-13 10:45:03.434334456 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/wxwin/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/wxwin/Makefile.in 2010-11-13 10:45:18.413838137 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/wxwin/Makefile.in 2010-11-13 10:45:03.522333494 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/wxwin/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/wxwin/po/Makefile.in 2010-11-13 10:45:18.465836367 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/wxwin/po/Makefile.in 2010-11-13 10:45:03.606333421 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/wxwin/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/wxwin/src/Makefile.in 2010-11-13 10:45:18.517837044 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/wxwin/src/Makefile.in 2010-11-13 10:45:03.690334319 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/xlib-dock/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/xlib-dock/Makefile.in 2010-11-13 10:45:20.137835120 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/xlib-dock/Makefile.in 2010-11-13 10:45:03.774334231 +0100
+@@ -173,6 +173,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -296,6 +304,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/xlib-dock/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/xlib-dock/po/Makefile.in 2010-11-13 10:45:20.185833747 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/xlib-dock/po/Makefile.in 2010-11-13 10:45:03.858332198 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/xlib-dock/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/xlib-dock/src/Makefile.in 2010-11-13 10:45:20.237835882 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/xlib-dock/src/Makefile.in 2010-11-13 10:45:03.942333100 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/xlib/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/xlib/Makefile.in 2010-11-13 10:45:17.333837952 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/xlib/Makefile.in 2010-11-13 10:45:04.034334184 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/xlib/po/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/xlib/po/Makefile.in 2010-11-13 10:45:17.429833746 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/xlib/po/Makefile.in 2010-11-13 10:45:04.118335576 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/project-wizard/templates/xlib/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/project-wizard/templates/xlib/src/Makefile.in 2010-11-13 10:45:17.529832564 +0100
++++ anjuta-2.32.1.0/plugins/project-wizard/templates/xlib/src/Makefile.in 2010-11-13 10:45:04.202334517 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/python-loader/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/python-loader/Makefile.in 2010-11-13 10:45:16.685834725 +0100
++++ anjuta-2.32.1.0/plugins/python-loader/Makefile.in 2010-11-13 10:45:04.314334075 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/run-program/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/run-program/Makefile.in 2010-11-13 10:45:15.977838449 +0100
++++ anjuta-2.32.1.0/plugins/run-program/Makefile.in 2010-11-13 10:45:04.434334805 +0100
+@@ -198,6 +198,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -321,6 +329,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/search/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/search/Makefile.in 2010-11-13 10:45:21.489836484 +0100
++++ anjuta-2.32.1.0/plugins/search/Makefile.in 2010-11-13 10:45:04.554335539 +0100
+@@ -197,6 +197,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -320,6 +328,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/snippets-manager/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/snippets-manager/Makefile.in 2010-11-13 10:45:22.925836798 +0100
++++ anjuta-2.32.1.0/plugins/snippets-manager/Makefile.in 2010-11-13 10:45:04.678332445 +0100
+@@ -205,6 +205,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -328,6 +336,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/sourceview/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/sourceview/Makefile.in 2010-11-13 10:45:15.765838111 +0100
++++ anjuta-2.32.1.0/plugins/sourceview/Makefile.in 2010-11-13 10:45:04.810333429 +0100
+@@ -220,6 +220,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -343,6 +351,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/starter/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/starter/Makefile.in 2010-11-13 10:45:23.669833880 +0100
++++ anjuta-2.32.1.0/plugins/starter/Makefile.in 2010-11-13 10:45:04.930334159 +0100
+@@ -199,6 +199,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -322,6 +330,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/subversion/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/subversion/Makefile.in 2010-11-13 10:45:20.429833816 +0100
++++ anjuta-2.32.1.0/plugins/subversion/Makefile.in 2010-11-13 10:45:05.058332627 +0100
+@@ -250,6 +250,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -373,6 +381,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/symbol-db/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/symbol-db/Makefile.in 2010-11-13 10:45:20.785837369 +0100
++++ anjuta-2.32.1.0/plugins/symbol-db/Makefile.in 2010-11-13 10:45:05.198333310 +0100
+@@ -249,6 +249,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -372,6 +380,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/symbol-db/anjuta-tags/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/symbol-db/anjuta-tags/Makefile.in 2010-11-13 10:45:21.101836132 +0100
++++ anjuta-2.32.1.0/plugins/symbol-db/anjuta-tags/Makefile.in 2010-11-13 10:45:05.354335808 +0100
+@@ -209,6 +209,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -332,6 +340,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/symbol-db/benchmark/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/symbol-db/benchmark/Makefile.in 2010-11-13 10:45:20.873835424 +0100
++++ anjuta-2.32.1.0/plugins/symbol-db/benchmark/Makefile.in 2010-11-13 10:45:05.442332889 +0100
+@@ -173,6 +173,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -296,6 +304,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/symbol-db/benchmark/libgda/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/symbol-db/benchmark/libgda/Makefile.in 2010-11-13 10:45:20.925835610 +0100
++++ anjuta-2.32.1.0/plugins/symbol-db/benchmark/libgda/Makefile.in 2010-11-13 10:45:05.546335709 +0100
+@@ -168,6 +168,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -291,6 +299,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/symbol-db/benchmark/sqlite/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/symbol-db/benchmark/sqlite/Makefile.in 2010-11-13 10:45:20.977833840 +0100
++++ anjuta-2.32.1.0/plugins/symbol-db/benchmark/sqlite/Makefile.in 2010-11-13 10:45:05.646332569 +0100
+@@ -168,6 +168,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -291,6 +299,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/symbol-db/benchmark/symbol-db/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/symbol-db/benchmark/symbol-db/Makefile.in 2010-11-13 10:45:21.029835985 +0100
++++ anjuta-2.32.1.0/plugins/symbol-db/benchmark/symbol-db/Makefile.in 2010-11-13 10:45:05.746332841 +0100
+@@ -167,6 +167,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -290,6 +298,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/symbol-db/images/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/symbol-db/images/Makefile.in 2010-11-13 10:45:21.369836733 +0100
++++ anjuta-2.32.1.0/plugins/symbol-db/images/Makefile.in 2010-11-13 10:45:05.834332358 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/terminal/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/terminal/Makefile.in 2010-11-13 10:45:15.197840091 +0100
++++ anjuta-2.32.1.0/plugins/terminal/Makefile.in 2010-11-13 10:45:05.962334246 +0100
+@@ -203,6 +203,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -326,6 +334,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/tools/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/tools/Makefile.in 2010-11-13 10:45:23.509834210 +0100
++++ anjuta-2.32.1.0/plugins/tools/Makefile.in 2010-11-13 10:45:06.094333782 +0100
+@@ -234,6 +234,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -357,6 +365,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/plugins/tools/scripts/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/plugins/tools/scripts/Makefile.in 2010-11-13 10:45:23.577834268 +0100
++++ anjuta-2.32.1.0/plugins/tools/scripts/Makefile.in 2010-11-13 10:45:06.182333791 +0100
+@@ -159,6 +159,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -282,6 +290,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/scripts/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/scripts/Makefile.in 2010-11-13 10:45:10.310339006 +0100
++++ anjuta-2.32.1.0/scripts/Makefile.in 2010-11-13 10:45:06.266333705 +0100
+@@ -157,6 +157,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -280,6 +288,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Index: anjuta-2.32.1.0/src/Makefile.in
+===================================================================
+--- anjuta-2.32.1.0.orig/src/Makefile.in 2010-11-13 10:45:24.309834483 +0100
++++ anjuta-2.32.1.0/src/Makefile.in 2010-11-13 10:45:06.398333720 +0100
+@@ -204,6 +204,14 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBANJUTA_CFLAGS = @LIBANJUTA_CFLAGS@
+@@ -327,6 +335,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
More information about the pkg-gnome-commits
mailing list