r24768 - in /desktop/unstable/vte/debian: changelog patches/90_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Thu Jul 15 18:30:36 UTC 2010
Author: slomo
Date: Thu Jul 15 18:30:35 2010
New Revision: 24768
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24768
Log:
* New upstream bugfix release:
+ debian/patches/90_autoreconf.patch:
- Regenerated for the new version.
Modified:
desktop/unstable/vte/debian/changelog
desktop/unstable/vte/debian/patches/90_autoreconf.patch
Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=24768&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte/debian/changelog [utf-8] Thu Jul 15 18:30:35 2010
@@ -1,3 +1,11 @@
+vte (1:0.24.3-1) unstable; urgency=low
+
+ * New upstream bugfix release:
+ + debian/patches/90_autoreconf.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Thu, 15 Jul 2010 20:30:04 +0200
+
vte (1:0.24.1-1) unstable; urgency=low
* New upstream bugfix release:
Modified: desktop/unstable/vte/debian/patches/90_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/90_autoreconf.patch?rev=24768&op=diff
==============================================================================
--- desktop/unstable/vte/debian/patches/90_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/vte/debian/patches/90_autoreconf.patch [utf-8] Thu Jul 15 18:30:35 2010
@@ -1,21 +1,21 @@
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/aclocal.m4 vte-0.24.1/aclocal.m4
---- vte-0.24.1.old/aclocal.m4 2010-04-26 13:08:58.000000000 +0200
-+++ vte-0.24.1/aclocal.m4 2010-05-03 20:15:29.739113319 +0200
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-@@ -13,1255 +13,751 @@
-
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
--[m4_warning([this file was generated for autoconf 2.64.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf. It may work, but is not guaranteed to.
+Index: vte-0.24.3/Makefile.in
+===================================================================
+--- vte-0.24.3.orig/Makefile.in 2010-07-15 20:28:27.745788348 +0200
++++ vte-0.24.3/Makefile.in 2010-07-15 20:28:19.013790835 +0200
+@@ -228,6 +228,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: vte-0.24.3/aclocal.m4
+===================================================================
+--- vte-0.24.3.orig/aclocal.m4 2010-07-15 20:28:27.621818534 +0200
++++ vte-0.24.3/aclocal.m4 2010-07-15 20:28:15.944816004 +0200
+@@ -19,1265 +19,438 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -36,7 +36,7 @@
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.11], [],
+-m4_if([$1], [1.11.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
@@ -52,7 +52,7 @@
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
+-[AM_AUTOMAKE_VERSION([1.11.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -296,84 +296,6 @@
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
--
--ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-- [$1], CXX, [depcc="$CXX" am_compiler_list=],
-- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-- [$1], UPC, [depcc="$UPC" am_compiler_list=],
-- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-- [depcc="$$1" am_compiler_list=])
--
--AC_CACHE_CHECK([dependency style of $depcc],
-- [am_cv_$1_dependencies_compiler_type],
--[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_$1_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
-- m4_case([$1], [CC],
-- [case " $depcc " in #(
-- *\ -arch\ *\ -arch\ *) am__universal=true ;;
-- esac],
-- [CXX],
-- [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
+ #
+ # First check in libc
+ #
@@ -395,6 +317,134 @@
+ gt_cv_func_dgettext_libc=yes,
+ gt_cv_func_dgettext_libc=no)
+ ])
++ fi
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ fi
+
+-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+- [$1], CXX, [depcc="$CXX" am_compiler_list=],
+- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+- [$1], UPC, [depcc="$UPC" am_compiler_list=],
+- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+- [depcc="$$1" am_compiler_list=])
++ #
++ # If we don't have everything we want, check in libintl
++ #
++ if test "$gt_cv_func_dgettext_libc" != "yes" \
++ || test "$gt_cv_func_ngettext_libc" != "yes" \
++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++ AC_CHECK_LIB(intl, bindtextdomain,
++ [AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dgettext,
++ gt_cv_func_dgettext_libintl=yes)])])
+
+-AC_CACHE_CHECK([dependency style of $depcc],
+- [am_cv_$1_dependencies_compiler_type],
+-[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
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ AC_MSG_CHECKING([if -liconv is needed to use gettext])
++ AC_MSG_RESULT([])
++ AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dcgettext,
++ [gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv],
++ :,-liconv)],
++ :,-liconv)
++ fi
+
+- am_cv_$1_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
+- m4_case([$1], [CC],
+- [case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac],
+- [CXX],
+- [case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac])
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_bind_textdomain_codeset
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ LIBS="$glib_save_LIBS"
+
+- 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
++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++ gt_cv_func_dgettext_libc=no
++ else
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
++ fi
+
+- # 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
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ gt_cv_have_gettext=yes
fi
- ;;
- msvisualcpp | msvcmsys)
@@ -427,8 +477,8 @@
- am_cv_$1_dependencies_compiler_type=$depmode
- break
+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ INTLLIBS="-lintl $libintl_extra_libs"
fi
- fi
- done
@@ -444,472 +494,6 @@
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
--
--
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
--])
--
--
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[ --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
-- am_depcomp="$ac_aux_dir/depcomp"
-- AMDEPBACKSLASH='\'
--fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])dnl
--_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
--])
--
--# Generate code to set up dependency tracking. -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--#serial 5
--
--# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# ------------------------------
--AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[{
-- # Autoconf 2.62 quotes --file arguments for eval, but not when files
-- # are listed without --file. Let's play safe and only enable the eval
-- # if we detect the quoting.
-- case $CONFIG_FILES in
-- *\'*) eval set x "$CONFIG_FILES" ;;
-- *) set x $CONFIG_FILES ;;
-- esac
-- shift
-- for mf
-- do
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`AS_DIRNAME("$mf")`
-- else
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`AS_DIRNAME(["$file"])`
-- AS_MKDIR_P([$dirpart/$fdir])
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
-- done
--}
--])# _AM_OUTPUT_DEPENDENCY_COMMANDS
--
-
--# AM_OUTPUT_DEPENDENCY_COMMANDS
--# -----------------------------
--# This macro should only be invoked once -- use via AC_REQUIRE.
--#
--# This code is only required when automatic dependency tracking
--# is enabled. FIXME. This creates each `.P' file that we will
--# need in order to bootstrap the dependency handling code.
--AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
--[AC_CONFIG_COMMANDS([depfiles],
-- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
--])
--
--# Do all the work for Automake. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 16
--
--# This macro actually does too much. Some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
--
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out. PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition. After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.62])dnl
--dnl Autoconf wants to disallow AM_ names. We explicitly allow
--dnl the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])dnl
--if test "`cd $srcdir && pwd`" != "`pwd`"; then
-- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-- # is not polluted with repeated "-I."
-- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-- # test to see if srcdir already configured
-- if test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-- fi
--fi
--
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
-- if (cygpath --version) >/dev/null 2>/dev/null; then
-- CYGPATH_W='cygpath -w'
-- else
-- CYGPATH_W=echo
-- fi
--fi
--AC_SUBST([CYGPATH_W])
--
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
--dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
--m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
--
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
--AC_REQUIRE([AM_PROG_MKDIR_P])dnl
--# We need awk for the "check" target. The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-- [_AM_PROG_TAR([v7])])])
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_CC],
-- [_AM_DEPENDENCIES(CC)],
-- [define([AC_PROG_CC],
-- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [_AM_DEPENDENCIES(CXX)],
-- [define([AC_PROG_CXX],
-- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-- [_AM_DEPENDENCIES(OBJC)],
-- [define([AC_PROG_OBJC],
-- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
--])
--_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
--dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
--dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
--dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
--AC_CONFIG_COMMANDS_PRE(dnl
--[m4_provide_if([_AM_COMPILER_EXEEXT],
-- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
--])
--
--dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
--dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
--dnl mangled by Autoconf and run in a shell conditional statement.
--m4_define([_AC_COMPILER_EXEEXT],
--m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
--
--
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated. The stamp files are numbered to have different names.
--
--# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
--# loop where config.status creates the headers, so we can generate
--# our stamp files there.
--AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
--[# Compute $1's index in $config_headers.
--_am_arg=$1
--_am_stamp_count=1
--for _am_header in $config_headers :; do
-- case $_am_header in
-- $_am_arg | $_am_arg:* )
-- break ;;
-- * )
-- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-- esac
--done
--echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
--
--# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--if test x"${install_sh}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-- *)
-- install_sh="\${SHELL} $am_aux_dir/install-sh"
-- esac
--fi
--AC_SUBST(install_sh)])
--
--# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 2
--
--# Check whether the underlying file-system supports filenames
--# with a leading dot. For instance MS-DOS doesn't.
--AC_DEFUN([AM_SET_LEADING_DOT],
--[rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
-- am__leading_dot=.
--else
-- am__leading_dot=_
--fi
--rmdir .tst 2>/dev/null
--AC_SUBST([am__leading_dot])])
--
--# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
--# From Jim Meyering
--
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 5
--
--# AM_MAINTAINER_MODE([DEFAULT-MODE])
--# ----------------------------------
--# Control maintainer-specific portions of Makefiles.
--# Default is to disable them, unless `enable' is passed literally.
--# For symmetry, `disable' may be passed as well. Anyway, the user
--# can override the default with the --enable/--disable switch.
--AC_DEFUN([AM_MAINTAINER_MODE],
--[m4_case(m4_default([$1], [disable]),
-- [enable], [m4_define([am_maintainer_other], [disable])],
-- [disable], [m4_define([am_maintainer_other], [enable])],
-- [m4_define([am_maintainer_other], [enable])
-- m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
--AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-- AC_ARG_ENABLE([maintainer-mode],
--[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
-- (and sometimes confusing) to the casual installer],
-- [USE_MAINTAINER_MODE=$enableval],
-- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-- MAINT=$MAINTAINER_MODE_TRUE
-- AC_SUBST([MAINT])dnl
--]
--)
--
--AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
--
--# Check to see how 'make' treats includes. -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 4
--
--# AM_MAKE_INCLUDE()
--# -----------------
--# Check to see how make treats includes.
--AC_DEFUN([AM_MAKE_INCLUDE],
--[am_make=${MAKE-make}
--cat > confinc << 'END'
--am__doit:
-- @echo this is the am__doit target
--.PHONY: am__doit
--END
--# If we don't find an include directive, just comment out the code.
--AC_MSG_CHECKING([for style of include used by $am_make])
--am__include="#"
--am__quote=
--_am_result=none
--# First try GNU make style include.
--echo "include confinc" > confmf
--# Ignore all kinds of additional output from `make'.
--case `$am_make -s -f confmf 2> /dev/null` in #(
--*the\ am__doit\ target*)
-- am__include=include
-- am__quote=
-- _am_result=GNU
-- ;;
--esac
--# Now try BSD make style include.
--if test "$am__include" = "#"; then
-- echo '.include "confinc"' > confmf
-- case `$am_make -s -f confmf 2> /dev/null` in #(
-- *the\ am__doit\ target*)
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- ;;
-- esac
--fi
--AC_SUBST([am__include])
--AC_SUBST([am__quote])
--AC_MSG_RESULT([$_am_result])
--rm -f confinc confmf
--])
-+ #
-+ # If we don't have everything we want, check in libintl
-+ #
-+ if test "$gt_cv_func_dgettext_libc" != "yes" \
-+ || test "$gt_cv_func_ngettext_libc" != "yes" \
-+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-+
-+ AC_CHECK_LIB(intl, bindtextdomain,
-+ [AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dgettext,
-+ gt_cv_func_dgettext_libintl=yes)])])
-
--# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+ AC_MSG_RESULT([])
-+ AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dcgettext,
-+ [gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv],
-+ :,-liconv)],
-+ :,-liconv)
-+ fi
-
--# serial 6
-+ #
-+ # If we found libintl, then check in it for bind_textdomain_codeset();
-+ # we'll prefer libc if neither have bind_textdomain_codeset(),
-+ # and both have dgettext and ngettext
-+ #
-+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lintl $libintl_extra_libs"
-+ unset ac_cv_func_bind_textdomain_codeset
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ LIBS="$glib_save_LIBS"
-
--# AM_PROG_CC_C_O
--# --------------
--# Like AC_PROG_CC_C_O, but changed for automake.
--AC_DEFUN([AM_PROG_CC_C_O],
--[AC_REQUIRE([AC_PROG_CC_C_O])dnl
--AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--AC_REQUIRE_AUX_FILE([compile])dnl
--# FIXME: we rely on the cache variable name because
--# there is no other way.
--set dummy $CC
--am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
--eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
--if test "$am_t" != yes; then
-- # Losing compiler, so override with the script.
-- # FIXME: It is wrong to rewrite CC.
-- # But if we don't then we get into trouble of one sort or another.
-- # A longer-term fix would be to have automake use am__CC in this case,
-- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-- CC="$am_aux_dir/compile $CC"
--fi
--dnl Make sure AC_PROG_CC is never called again, or it will override our
--dnl setting of CC.
--m4_define([AC_PROG_CC],
-- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
--])
-+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-+ gt_cv_func_dgettext_libc=no
-+ else
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
-+ gt_cv_func_dgettext_libintl=no
-+ fi
-+ fi
-+ fi
-+ fi
-
--# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+ gt_cv_have_gettext=yes
-+ fi
-+
-+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+ INTLLIBS="-lintl $libintl_extra_libs"
-+ fi
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+ AC_DEFINE(HAVE_GETTEXT,1,
@@ -967,45 +551,443 @@
+ fi
+ ])
++ if test "$gt_cv_have_gettext" = "yes" ; then
++ AC_DEFINE(ENABLE_NLS, 1,
++ [always defined to indicate that i18n is enabled])
++ fi
+
+-# AM_SET_DEPDIR
+-# -------------
+-# Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+-AC_DEFUN([AM_SET_DEPDIR],
+-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+-])
+-
+-
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+- am_depcomp="$ac_aux_dir/depcomp"
+- AMDEPBACKSLASH='\'
+-fi
+-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+-])
+-
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-#serial 5
+-
+-# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# ------------------------------
+-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[{
+- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+- # are listed without --file. Let's play safe and only enable the eval
+- # if we detect the quoting.
+- case $CONFIG_FILES in
+- *\'*) eval set x "$CONFIG_FILES" ;;
+- *) set x $CONFIG_FILES ;;
+- esac
+- shift
+- for mf
+- do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
+- done
+-}
+-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-
+-
+-# AM_OUTPUT_DEPENDENCY_COMMANDS
+-# -----------------------------
+-# This macro should only be invoked once -- use via AC_REQUIRE.
+-#
+-# This code is only required when automatic dependency tracking
+-# is enabled. FIXME. This creates each `.P' file that we will
+-# need in order to bootstrap the dependency handling code.
+-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[AC_CONFIG_COMMANDS([depfiles],
+- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+-])
+-
+-# Do all the work for Automake. -*- Autoconf -*-
+-
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 16
+-
+-# This macro actually does too much. Some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
+-
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out. PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition. After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.62])dnl
+-dnl Autoconf wants to disallow AM_ names. We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+- # is not polluted with repeated "-I."
+- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+- # test to see if srcdir already configured
+- if test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+- fi
+-fi
+-
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
+-fi
+-AC_SUBST([CYGPATH_W])
+-
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+-
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+-
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+-# We need awk for the "check" target. The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+- [_AM_PROG_TAR([v7])])])
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+- [_AM_DEPENDENCIES(OBJC)],
+- [define([AC_PROG_OBJC],
+- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+-])
+-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+-AC_CONFIG_COMMANDS_PRE(dnl
+-[m4_provide_if([_AM_COMPILER_EXEEXT],
+- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+-])
+-
+-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+-dnl mangled by Autoconf and run in a shell conditional statement.
+-m4_define([_AC_COMPILER_EXEEXT],
+-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+-
+-
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
+-
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[# Compute $1's index in $config_headers.
+-_am_arg=$1
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+- case $_am_header in
+- $_am_arg | $_am_arg:* )
+- break ;;
+- * )
+- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+- esac
+-done
+-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+-
+-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-if test x"${install_sh}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+- *)
+- install_sh="\${SHELL} $am_aux_dir/install-sh"
+- esac
+-fi
+-AC_SUBST(install_sh)])
+-
+-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 2
+-
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot. For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+- am__leading_dot=.
+-else
+- am__leading_dot=_
+-fi
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
+-
+-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+-# From Jim Meyering
+-
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 5
+-
+-# AM_MAINTAINER_MODE([DEFAULT-MODE])
+-# ----------------------------------
+-# Control maintainer-specific portions of Makefiles.
+-# Default is to disable them, unless `enable' is passed literally.
+-# For symmetry, `disable' may be passed as well. Anyway, the user
+-# can override the default with the --enable/--disable switch.
+-AC_DEFUN([AM_MAINTAINER_MODE],
+-[m4_case(m4_default([$1], [disable]),
+- [enable], [m4_define([am_maintainer_other], [disable])],
+- [disable], [m4_define([am_maintainer_other], [enable])],
+- [m4_define([am_maintainer_other], [enable])
+- m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+- AC_ARG_ENABLE([maintainer-mode],
+-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
+- (and sometimes confusing) to the casual installer],
+- [USE_MAINTAINER_MODE=$enableval],
+- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+- MAINT=$MAINTAINER_MODE_TRUE
+- AC_SUBST([MAINT])dnl
+-]
+-)
+-
+-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+-
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 4
+-
+-# AM_MAKE_INCLUDE()
+-# -----------------
+-# Check to see how make treats includes.
+-AC_DEFUN([AM_MAKE_INCLUDE],
+-[am_make=${MAKE-make}
+-cat > confinc << 'END'
+-am__doit:
+- @echo this is the am__doit target
+-.PHONY: am__doit
+-END
+-# If we don't find an include directive, just comment out the code.
+-AC_MSG_CHECKING([for style of include used by $am_make])
+-am__include="#"
+-am__quote=
+-_am_result=none
+-# First try GNU make style include.
+-echo "include confinc" > confmf
+-# Ignore all kinds of additional output from `make'.
+-case `$am_make -s -f confmf 2> /dev/null` in #(
+-*the\ am__doit\ target*)
+- am__include=include
+- am__quote=
+- _am_result=GNU
+- ;;
+-esac
+-# Now try BSD make style include.
+-if test "$am__include" = "#"; then
+- echo '.include "confinc"' > confmf
+- case `$am_make -s -f confmf 2> /dev/null` in #(
+- *the\ am__doit\ target*)
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- ;;
+- esac
+-fi
+-AC_SUBST([am__include])
+-AC_SUBST([am__quote])
+-AC_MSG_RESULT([$_am_result])
+-rm -f confinc confmf
+-])
+-
+-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 6
+-
+-# AM_PROG_CC_C_O
+-# --------------
+-# Like AC_PROG_CC_C_O, but changed for automake.
+-AC_DEFUN([AM_PROG_CC_C_O],
+-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([compile])dnl
+-# FIXME: we rely on the cache variable name because
+-# there is no other way.
+-set dummy $CC
+-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+-if test "$am_t" != yes; then
+- # Losing compiler, so override with the script.
+- # FIXME: It is wrong to rewrite CC.
+- # But if we don't then we get into trouble of one sort or another.
+- # A longer-term fix would be to have automake use am__CC in this case,
+- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+- CC="$am_aux_dir/compile $CC"
+-fi
+-dnl Make sure AC_PROG_CC is never called again, or it will override our
+-dnl setting of CC.
+-m4_define([AC_PROG_CC],
+- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+-])
+-
+-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+ if test "$gt_cv_have_gettext" = "yes" ; then
-+ AC_DEFINE(ENABLE_NLS, 1,
-+ [always defined to indicate that i18n is enabled])
-+ fi
-
+-
-# serial 6
-+ dnl Test whether we really found GNU xgettext.
-+ if test "$XGETTEXT" != ":"; then
-+ dnl If it is not GNU xgettext we define it as : so that the
-+ dnl Makefiles still can work.
-+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+ : ;
-+ else
-+ AC_MSG_RESULT(
-+ [found xgettext program is not GNU xgettext; ignore it])
-+ XGETTEXT=":"
-+ fi
-+ fi
-
+-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-+ # We need to process the po/ directory.
-+ POSUB=po
-
-+ AC_OUTPUT_COMMANDS(
-+ [case "$CONFIG_FILES" in *po/Makefile.in*)
-+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-+ esac])
-
+-
+-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
@@ -1029,6 +1011,415 @@
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
+-
+-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check for `mkdir -p'.
+-AC_DEFUN([AM_PROG_MKDIR_P],
+-[AC_PREREQ([2.60])dnl
+-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+-dnl while keeping a definition of mkdir_p for backward compatibility.
+-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+-dnl Makefile.ins that do not define MKDIR_P, so we do our own
+-dnl adjustment using top_builddir (which is defined more often than
+-dnl MKDIR_P).
+-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+-case $mkdir_p in
+- [[\\/$]]* | ?:[[\\/]]*) ;;
+- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
+-])
+-
+-# Helper functions for option handling. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 4
+-
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+-
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME. Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+-
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+-
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+-# ---------------------------------------------------------------------------
+-# Adds support for distributing Python modules and packages. To
+-# install modules, copy them to $(pythondir), using the python_PYTHON
+-# automake variable. To install a package with the same name as the
+-# automake package, install to $(pkgpythondir), or use the
+-# pkgpython_PYTHON automake variable.
+-#
+-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
+-# locations to install python extension modules (shared libraries).
+-# Another macro is required to find the appropriate flags to compile
+-# extension modules.
+-#
+-# If your package is configured with a different prefix to python,
+-# users will have to add the install directory to the PYTHONPATH
+-# environment variable, or create a .pth file (see the python
+-# documentation for details).
+-#
+-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
+-# cause an error if the version of python installed on the system
+-# doesn't meet the requirement. MINIMUM-VERSION should consist of
+-# numbers and dots only.
+-AC_DEFUN([AM_PATH_PYTHON],
+- [
+- dnl Find a Python interpreter. Python versions prior to 2.0 are not
+- dnl supported. (2.0 was released on October 16, 2000).
+- m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
+-python2.1 python2.0])
+-
+- m4_if([$1],[],[
+- dnl No version check is needed.
+- # Find any Python interpreter.
+- if test -z "$PYTHON"; then
+- AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
+- fi
+- am_display_PYTHON=python
+- ], [
+- dnl A version check is needed.
+- if test -n "$PYTHON"; then
+- # If the user set $PYTHON, use it and don't search something else.
+- AC_MSG_CHECKING([whether $PYTHON version >= $1])
+- AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
+- [AC_MSG_RESULT(yes)],
+- [AC_MSG_ERROR(too old)])
+- am_display_PYTHON=$PYTHON
+- else
+- # Otherwise, try each interpreter until we find one that satisfies
+- # VERSION.
+- AC_CACHE_CHECK([for a Python interpreter with version >= $1],
+- [am_cv_pathless_PYTHON],[
+- for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
+- test "$am_cv_pathless_PYTHON" = none && break
+- AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
+- done])
+- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+- if test "$am_cv_pathless_PYTHON" = none; then
+- PYTHON=:
++ dnl Test whether we really found GNU xgettext.
++ if test "$XGETTEXT" != ":"; then
++ dnl If it is not GNU xgettext we define it as : so that the
++ dnl Makefiles still can work.
++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
++ : ;
+ else
+- AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
+- fi
+- am_display_PYTHON=$am_cv_pathless_PYTHON
+- fi
+- ])
+-
+- if test "$PYTHON" = :; then
+- dnl Run any user-specified action, or abort.
+- m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+- else
+-
+- dnl Query Python for its version number. Getting [:3] seems to be
+- dnl the best way to do this; it's what "site.py" does in the standard
+- dnl library.
+-
+- AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+- AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+-
+- dnl Use the values of $prefix and $exec_prefix for the corresponding
+- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
+- dnl distinct variables so they can be overridden if need be. However,
+- dnl general consensus is that you shouldn't need this ability.
+-
+- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+-
+- dnl At times (like when building shared libraries) you may want
+- dnl to know which OS platform Python thinks this is.
+-
+- AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
+- [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
+- AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+-
+-
+- dnl Set up 4 directories:
+-
+- dnl pythondir -- where to install python scripts. This is the
+- dnl site-packages directory, not the python standard library
+- dnl directory like in previous automake betas. This behavior
+- dnl is more consistent with lispdir.m4 for example.
+- dnl Query distutils for this directory. distutils does not exist in
+- dnl Python 1.5, so we fall back to the hardcoded directory if it
+- dnl doesn't work.
+- AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+- [am_cv_python_pythondir],
+- [if test "x$prefix" = xNONE
+- then
+- am_py_prefix=$ac_default_prefix
+- else
+- am_py_prefix=$prefix
+- fi
+- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+- case $am_cv_python_pythondir in
+- $am_py_prefix*)
+- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+- ;;
+- *)
+- case $am_py_prefix in
+- /usr|/System*) ;;
+- *)
+- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+- ;;
+- esac
+- ;;
+- esac
+- ])
+- AC_SUBST([pythondir], [$am_cv_python_pythondir])
+-
+- dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
+- dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
+- dnl more consistent with the rest of automake.
+-
+- AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
+-
+- dnl pyexecdir -- directory for installing python extension modules
+- dnl (shared libraries)
+- dnl Query distutils for this directory. distutils does not exist in
+- dnl Python 1.5, so we fall back to the hardcoded directory if it
+- dnl doesn't work.
+- AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+- [am_cv_python_pyexecdir],
+- [if test "x$exec_prefix" = xNONE
+- then
+- am_py_exec_prefix=$am_py_prefix
+- else
+- am_py_exec_prefix=$exec_prefix
+- fi
+- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+- case $am_cv_python_pyexecdir in
+- $am_py_exec_prefix*)
+- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+- ;;
+- *)
+- case $am_py_exec_prefix in
+- /usr|/System*) ;;
+- *)
+- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+- ;;
+- esac
+- ;;
+- esac
+- ])
+- AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+-
+- dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+-
+- AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
+-
+- dnl Run any user-specified action.
+- $2
+- fi
+-
+-])
+-
+-
+-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+-# ---------------------------------------------------------------------------
+-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
+-# Run ACTION-IF-FALSE otherwise.
+-# This test uses sys.hexversion instead of the string equivalent (first
+-# word of sys.version), in order to cope with versions such as 2.2c1.
+-# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
+-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
+- [prog="import sys
+-# split strings by '.' and convert to numeric. Append some zeros
+-# because we need at least 4 digits for the hex conversion.
+-# map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
+-minverhex = 0
+-# xrange is not present in Python 3.0 and range returns an iterator
+-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
+-sys.exit(sys.hexversion < minverhex)"
+- AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
+-
+-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 5
+-
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Reject unsafe characters in $srcdir or the absolute working directory
+-# name. Accept space and tab only in the latter.
+-am_lf='
+-'
+-case `pwd` in
+- *[[\\\"\#\$\&\'\`$am_lf]]*)
+- AC_MSG_ERROR([unsafe absolute working directory name]);;
+-esac
+-case $srcdir in
+- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+-esac
+-
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments. Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+- if test "$[*]" = "X"; then
+- # -L didn't work.
+- set X `ls -t "$srcdir/configure" conftest.file`
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+-
+- # If neither matched, then we have a broken ls. This can happen
+- # if, for instance, CONFIG_SHELL is bash and it inherits a
+- # broken ls alias from the environment. This has actually
+- # happened. Such a system could not be considered "sane".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
+-
+- test "$[2]" = conftest.file
+- )
+-then
+- # Ok.
+- :
+-else
+- AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-AC_MSG_RESULT(yes)])
+-
+-# Copyright (C) 2009 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 1
+-
+-# AM_SILENT_RULES([DEFAULT])
+-# --------------------------
+-# Enable less verbose build rules; with the default set to DEFAULT
+-# (`yes' being less verbose, `no' or empty being verbose).
+-AC_DEFUN([AM_SILENT_RULES],
+-[AC_ARG_ENABLE([silent-rules],
+-[ --enable-silent-rules less verbose build output (undo: `make V=1')
+- --disable-silent-rules verbose build output (undo: `make V=0')])
+-case $enable_silent_rules in
+-yes) AM_DEFAULT_VERBOSITY=0;;
+-no) AM_DEFAULT_VERBOSITY=1;;
+-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+-esac
+-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+-AM_BACKSLASH='\'
+-AC_SUBST([AM_BACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+-])
+-
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# 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.
++ AC_MSG_RESULT(
++ [found xgettext program is not GNU xgettext; ignore it])
++ XGETTEXT=":"
++ fi
++ fi
+
+-# AM_PROG_INSTALL_STRIP
+-# ---------------------
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries. This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+- AC_CHECK_TOOL([STRIP], [strip], :)
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
++ # We need to process the po/ directory.
++ POSUB=po
+
+-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ AC_OUTPUT_COMMANDS(
++ [case "$CONFIG_FILES" in *po/Makefile.in*)
++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
++ esac])
+
+-# serial 2
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.in.
@@ -1037,11 +1428,11 @@
+ POFILES="$POFILES $lang.po"
+ done
--# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
@@ -1054,7 +1445,11 @@
+ AC_SUBST(POFILES)
+ AC_SUBST(POSUB)
+ ])
-+
+
+-# AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Public sister of _AM_SUBST_NOTMAKE.
+-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation
@@ -1071,7 +1466,8 @@
+
+ GLIB_LC_MESSAGES
+ GLIB_WITH_NLS
-+
+
+-# Check how to create a tarball. -*- Autoconf -*-
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
@@ -1103,32 +1499,18 @@
+ AC_MSG_RESULT($LINGUAS)
+ fi
--# AM_PROG_MKDIR_P
--# ---------------
--# Check for `mkdir -p'.
--AC_DEFUN([AM_PROG_MKDIR_P],
--[AC_PREREQ([2.60])dnl
--AC_REQUIRE([AC_PROG_MKDIR_P])dnl
--dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
--dnl while keeping a definition of mkdir_p for backward compatibility.
--dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
--dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
--dnl Makefile.ins that do not define MKDIR_P, so we do our own
--dnl adjustment using top_builddir (which is defined more often than
--dnl MKDIR_P).
--AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
--case $mkdir_p in
-- [[\\/$]]* | ?:[[\\/]]*) ;;
-- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
--])
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
--# Helper functions for option handling. -*- Autoconf -*-
+-# serial 2
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
@@ -1141,684 +1523,6 @@
+ fi
+ AC_SUBST(MKINSTALLDIRS)
--# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ dnl Generate list of files to be processed by xgettext which will
-+ dnl be included in po/Makefile.
-+ test -d po || mkdir po
-+ if test "x$srcdir" != "x."; then
-+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-+ posrcprefix="$srcdir/"
-+ else
-+ posrcprefix="../$srcdir/"
-+ fi
-+ else
-+ posrcprefix="../"
-+ fi
-+ rm -f po/POTFILES
-+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-+ < $srcdir/po/POTFILES.in > po/POTFILES
-+ ])
-
--# serial 4
-+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-+# -------------------------------
-+# Define VARIABLE to the location where catalog files will
-+# be installed by po/Makefile.
-+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-+glib_save_prefix="$prefix"
-+glib_save_exec_prefix="$exec_prefix"
-+glib_save_datarootdir="$datarootdir"
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+datarootdir=`eval echo "${datarootdir}"`
-+if test "x$CATOBJEXT" = "x.mo" ; then
-+ localedir=`eval echo "${libdir}/locale"`
-+else
-+ localedir=`eval echo "${datadir}/locale"`
-+fi
-+prefix="$glib_save_prefix"
-+exec_prefix="$glib_save_exec_prefix"
-+datarootdir="$glib_save_datarootdir"
-+AC_DEFINE_UNQUOTED($1, "$localedir",
-+ [Define the location where the catalogs will be installed])
-+])
-
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+dnl
-+dnl Now the definitions that aclocal will find
-+dnl
-+ifdef(glib_configure_in,[],[
-+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-+])dnl
-
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME. Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-+#
-+# Create a temporary file with TEST-FILE as its contents and pass the
-+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
-+# 0 and perform ACTION-IF-FAIL for any other exit status.
-+AC_DEFUN([GLIB_RUN_PROG],
-+[cat >conftest.foo <<_ACEOF
-+$2
-+_ACEOF
-+if AC_RUN_LOG([$1 conftest.foo]); then
-+ m4_ifval([$3], [$3], [:])
-+m4_ifvaln([$4], [else $4])dnl
-+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-+fi])
-
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+# gnome-common.m4
-+#
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+dnl GNOME_COMMON_INIT
-
--# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
--# ---------------------------------------------------------------------------
--# Adds support for distributing Python modules and packages. To
--# install modules, copy them to $(pythondir), using the python_PYTHON
--# automake variable. To install a package with the same name as the
--# automake package, install to $(pkgpythondir), or use the
--# pkgpython_PYTHON automake variable.
--#
--# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
--# locations to install python extension modules (shared libraries).
--# Another macro is required to find the appropriate flags to compile
--# extension modules.
--#
--# If your package is configured with a different prefix to python,
--# users will have to add the install directory to the PYTHONPATH
--# environment variable, or create a .pth file (see the python
--# documentation for details).
--#
--# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
--# cause an error if the version of python installed on the system
--# doesn't meet the requirement. MINIMUM-VERSION should consist of
--# numbers and dots only.
--AC_DEFUN([AM_PATH_PYTHON],
-- [
-- dnl Find a Python interpreter. Python versions prior to 2.0 are not
-- dnl supported. (2.0 was released on October 16, 2000).
-- m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
--python2.1 python2.0])
-+AC_DEFUN([GNOME_COMMON_INIT],
-+[
-+ dnl this macro should come after AC_CONFIG_MACRO_DIR
-+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-
-- m4_if([$1],[],[
-- dnl No version check is needed.
-- # Find any Python interpreter.
-- if test -z "$PYTHON"; then
-- AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
-- fi
-- am_display_PYTHON=python
-- ], [
-- dnl A version check is needed.
-- if test -n "$PYTHON"; then
-- # If the user set $PYTHON, use it and don't search something else.
-- AC_MSG_CHECKING([whether $PYTHON version >= $1])
-- AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
-- [AC_MSG_RESULT(yes)],
-- [AC_MSG_ERROR(too old)])
-- am_display_PYTHON=$PYTHON
-- else
-- # Otherwise, try each interpreter until we find one that satisfies
-- # VERSION.
-- AC_CACHE_CHECK([for a Python interpreter with version >= $1],
-- [am_cv_pathless_PYTHON],[
-- for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
-- test "$am_cv_pathless_PYTHON" = none && break
-- AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
-- done])
-- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-- if test "$am_cv_pathless_PYTHON" = none; then
-- PYTHON=:
-- else
-- AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
-- fi
-- am_display_PYTHON=$am_cv_pathless_PYTHON
-- fi
-- ])
-+ dnl ensure that when the Automake generated makefile calls aclocal,
-+ dnl it honours the $ACLOCAL_FLAGS environment variable
-+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-+ if test -n "$ac_macro_dir"; then
-+ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-+ fi
-
-- if test "$PYTHON" = :; then
-- dnl Run any user-specified action, or abort.
-- m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
-- else
-+ AC_SUBST([ACLOCAL_AMFLAGS])
-+])
-
-- dnl Query Python for its version number. Getting [:3] seems to be
-- dnl the best way to do this; it's what "site.py" does in the standard
-- dnl library.
-+AC_DEFUN([GNOME_DEBUG_CHECK],
-+[
-+ AC_ARG_ENABLE([debug],
-+ AC_HELP_STRING([--enable-debug],
-+ [turn on debugging]),,
-+ [enable_debug=no])
-
-- AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
-- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
-- AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
-+ if test x$enable_debug = xyes ; then
-+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-+ [Enable additional debugging at the expense of performance and size])
-+ fi
-+])
-
-- dnl Use the values of $prefix and $exec_prefix for the corresponding
-- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
-- dnl distinct variables so they can be overridden if need be. However,
-- dnl general consensus is that you shouldn't need this ability.
-+dnl GNOME_MAINTAINER_MODE_DEFINES ()
-+dnl define DISABLE_DEPRECATED
-+dnl
-+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
-+[
-+ AC_REQUIRE([AM_MAINTAINER_MODE])
-
-- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
-- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
-+ DISABLE_DEPRECATED=""
-+ if test $USE_MAINTAINER_MODE = yes; then
-+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-+ for DOMAIN in $DOMAINS; do
-+ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-+ done
-+ fi
-
-- dnl At times (like when building shared libraries) you may want
-- dnl to know which OS platform Python thinks this is.
-+ AC_SUBST(DISABLE_DEPRECATED)
-+])
-
-- AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
-- [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
-- AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
-+dnl -*- mode: autoconf -*-
-
-+# serial 1
-
-- dnl Set up 4 directories:
-+dnl Usage:
-+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
-+AC_DEFUN([GTK_DOC_CHECK],
-+[
-+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-
-- dnl pythondir -- where to install python scripts. This is the
-- dnl site-packages directory, not the python standard library
-- dnl directory like in previous automake betas. This behavior
-- dnl is more consistent with lispdir.m4 for example.
-- dnl Query distutils for this directory. distutils does not exist in
-- dnl Python 1.5, so we fall back to the hardcoded directory if it
-- dnl doesn't work.
-- AC_CACHE_CHECK([for $am_display_PYTHON script directory],
-- [am_cv_python_pythondir],
-- [if test "x$prefix" = xNONE
-- then
-- am_py_prefix=$ac_default_prefix
-- else
-- am_py_prefix=$prefix
-- fi
-- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
-- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-- case $am_cv_python_pythondir in
-- $am_py_prefix*)
-- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
-- ;;
-- esac
-- ])
-- AC_SUBST([pythondir], [$am_cv_python_pythondir])
-+ dnl check for tools we added during development
-+ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-+ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-+ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-
-- dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
-- dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
-- dnl more consistent with the rest of automake.
-+ dnl for overriding the documentation installation directory
-+ AC_ARG_WITH([html-dir],
-+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+ [with_html_dir='${datadir}/gtk-doc/html'])
-+ HTML_DIR="$with_html_dir"
-+ AC_SUBST([HTML_DIR])
-
-- AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
-+ dnl enable/disable documentation building
-+ AC_ARG_ENABLE([gtk-doc],
-+ AS_HELP_STRING([--enable-gtk-doc],
-+ [use gtk-doc to build documentation [[default=no]]]),,
-+ [enable_gtk_doc=no])
-
-- dnl pyexecdir -- directory for installing python extension modules
-- dnl (shared libraries)
-- dnl Query distutils for this directory. distutils does not exist in
-- dnl Python 1.5, so we fall back to the hardcoded directory if it
-- dnl doesn't work.
-- AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
-- [am_cv_python_pyexecdir],
-- [if test "x$exec_prefix" = xNONE
-- then
-- am_py_exec_prefix=$am_py_prefix
-- else
-- am_py_exec_prefix=$exec_prefix
-- fi
-- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
-- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-- case $am_cv_python_pyexecdir in
-- $am_py_exec_prefix*)
-- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
-- ;;
-- esac
-- ])
-- AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
-+ if test x$enable_gtk_doc = xyes; then
-+ ifelse([$1],[],
-+ [PKG_CHECK_EXISTS([gtk-doc],,
-+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-+ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-+ fi
-
-- dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-+ AC_MSG_CHECKING([whether to build gtk-doc documentation])
-+ AC_MSG_RESULT($enable_gtk_doc)
-
-- AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
-+ dnl enable/disable output formats
-+ AC_ARG_ENABLE([gtk-doc-html],
-+ AS_HELP_STRING([--enable-gtk-doc-html],
-+ [build documentation in html format [[default=yes]]]),,
-+ [enable_gtk_doc_html=yes])
-+ AC_ARG_ENABLE([gtk-doc-pdf],
-+ AS_HELP_STRING([--enable-gtk-doc-pdf],
-+ [build documentation in pdf format [[default=no]]]),,
-+ [enable_gtk_doc_pdf=no])
-
-- dnl Run any user-specified action.
-- $2
-+ if test -z "$GTKDOC_MKPDF"; then
-+ enable_gtk_doc_pdf=no
- fi
-
-+
-+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-+ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-+ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
-+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
- ])
-
-
--# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
--# ---------------------------------------------------------------------------
--# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
--# Run ACTION-IF-FALSE otherwise.
--# This test uses sys.hexversion instead of the string equivalent (first
--# word of sys.version), in order to cope with versions such as 2.2c1.
--# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
--AC_DEFUN([AM_PYTHON_CHECK_VERSION],
-- [prog="import sys
--# split strings by '.' and convert to numeric. Append some zeros
--# because we need at least 4 digits for the hex conversion.
--# map returns an iterator in Python 3.0 and a list in 2.x
--minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
--minverhex = 0
--# xrange is not present in Python 3.0 and range returns an iterator
--for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
--sys.exit(sys.hexversion < minverhex)"
-- AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-+# serial 40 IT_PROG_INTLTOOL
-+AC_DEFUN([IT_PROG_INTLTOOL], [
-+AC_PREREQ([2.50])dnl
-+AC_REQUIRE([AM_NLS])dnl
-
--# Check to make sure that the build environment is sane. -*- Autoconf -*-
-+case "$am__api_version" in
-+ 1.[01234])
-+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-+ ;;
-+ *)
-+ ;;
-+esac
-
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+if test -n "$1"; then
-+ AC_MSG_CHECKING([for intltool >= $1])
-
--# serial 5
-+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-+ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+ ]
-+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
-+fi
-
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Reject unsafe characters in $srcdir or the absolute working directory
--# name. Accept space and tab only in the latter.
--am_lf='
--'
--case `pwd` in
-- *[[\\\"\#\$\&\'\`$am_lf]]*)
-- AC_MSG_ERROR([unsafe absolute working directory name]);;
--esac
--case $srcdir in
-- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
-- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
--esac
-+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-+fi
-
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments. Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
-- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-- if test "$[*]" = "X"; then
-- # -L didn't work.
-- set X `ls -t "$srcdir/configure" conftest.file`
-- fi
-- rm -f conftest.file
-- if test "$[*]" != "X $srcdir/configure conftest.file" \
-- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
-+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-- # If neither matched, then we have a broken ls. This can happen
-- # if, for instance, CONFIG_SHELL is bash and it inherits a
-- # broken ls alias from the environment. This has actually
-- # happened. Such a system could not be considered "sane".
-- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
--alias in your environment])
-- fi
-+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-+_IT_SUBST(INTLTOOL_KEYS_RULE)
-+_IT_SUBST(INTLTOOL_PROP_RULE)
-+_IT_SUBST(INTLTOOL_OAF_RULE)
-+_IT_SUBST(INTLTOOL_PONG_RULE)
-+_IT_SUBST(INTLTOOL_SERVER_RULE)
-+_IT_SUBST(INTLTOOL_SHEET_RULE)
-+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-+_IT_SUBST(INTLTOOL_UI_RULE)
-+_IT_SUBST(INTLTOOL_XAM_RULE)
-+_IT_SUBST(INTLTOOL_KBD_RULE)
-+_IT_SUBST(INTLTOOL_XML_RULE)
-+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-+_IT_SUBST(INTLTOOL_CAVES_RULE)
-+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-+_IT_SUBST(INTLTOOL_THEME_RULE)
-+_IT_SUBST(INTLTOOL_SERVICE_RULE)
-+_IT_SUBST(INTLTOOL_POLICY_RULE)
-+
-+# Check the gettext tools to make sure they are GNU
-+AC_PATH_PROG(XGETTEXT, xgettext)
-+AC_PATH_PROG(MSGMERGE, msgmerge)
-+AC_PATH_PROG(MSGFMT, msgfmt)
-+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-+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
-+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-+fi
-
-- test "$[2]" = conftest.file
-- )
--then
-- # Ok.
-- :
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
-+if test -z "$INTLTOOL_PERL"; then
-+ AC_MSG_ERROR([perl not found])
-+fi
-+AC_MSG_CHECKING([for perl >= 5.8.1])
-+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-+if test $? -ne 0; then
-+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
- else
-- AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
-+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-+ AC_MSG_RESULT([$IT_PERL_VERSION])
- fi
--AC_MSG_RESULT(yes)])
--
--# Copyright (C) 2009 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 1
--
--# AM_SILENT_RULES([DEFAULT])
--# --------------------------
--# Enable less verbose build rules; with the default set to DEFAULT
--# (`yes' being less verbose, `no' or empty being verbose).
--AC_DEFUN([AM_SILENT_RULES],
--[AC_ARG_ENABLE([silent-rules],
--[ --enable-silent-rules less verbose build output (undo: `make V=1')
-- --disable-silent-rules verbose build output (undo: `make V=0')])
--case $enable_silent_rules in
--yes) AM_DEFAULT_VERBOSITY=0;;
--no) AM_DEFAULT_VERBOSITY=1;;
--*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
--esac
--AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
--AM_BACKSLASH='\'
--AC_SUBST([AM_BACKSLASH])dnl
--_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
--])
--
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_PROG_INSTALL_STRIP
--# ---------------------
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries. This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'. However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
--if test "$cross_compiling" != no; then
-- AC_CHECK_TOOL([STRIP], [strip], :)
-+if test "x$2" != "xno-xml"; then
-+ AC_MSG_CHECKING([for XML::Parser])
-+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+ AC_MSG_RESULT([ok])
-+ else
-+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-+ fi
- fi
--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
--# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+AC_SUBST(ALL_LINGUAS)
-
--# serial 2
-+# Set DATADIRNAME correctly if it is not set yet
-+# (copied from glib-gettext.m4)
-+if test -z "$DATADIRNAME"; then
-+ AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM([[]],
-+ [[extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr]])],
-+ [DATADIRNAME=share],
-+ [case $host in
-+ *-*-solaris*)
-+ dnl On Solaris, if bind_textdomain_codeset is in libc,
-+ dnl GNU format message catalog is always supported,
-+ dnl since both are added to the libc all together.
-+ dnl Hence, we'd like to go with DATADIRNAME=share
-+ dnl in this case.
-+ AC_CHECK_FUNC(bind_textdomain_codeset,
-+ [DATADIRNAME=share], [DATADIRNAME=lib])
-+ ;;
-+ *)
-+ [DATADIRNAME=lib]
-+ ;;
-+ esac])
-+fi
-+AC_SUBST(DATADIRNAME)
-
--# _AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
--# This macro is traced by Automake.
--AC_DEFUN([_AM_SUBST_NOTMAKE])
-+IT_PO_SUBDIR([po])
-
--# AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Public sister of _AM_SUBST_NOTMAKE.
--AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-+])
-
--# Check how to create a tarball. -*- Autoconf -*-
-
--# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+# IT_PO_SUBDIR(DIRNAME)
-+# ---------------------
-+# All po subdirs have to be declared with this macro; the subdir "po" is
-+# declared by IT_PROG_INTLTOOL.
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 2
-+AC_DEFUN([IT_PO_SUBDIR],
-+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-+dnl
-+dnl The following CONFIG_COMMANDS should be executed at the very end
-+dnl of config.status.
-+AC_CONFIG_COMMANDS_PRE([
-+ AC_CONFIG_COMMANDS([$1/stamp-it], [
-+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-+ fi
-+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-+ >"$1/stamp-it.tmp"
-+ [sed '/^#/d
-+ s/^[[].*] *//
-+ /^[ ]*$/d
-+ '"s|^| $ac_top_srcdir/|" \
-+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-+ ]
-+ [sed '/^POTFILES =/,/[^\\]$/ {
-+ /^POTFILES =/!d
-+ r $1/POTFILES
-+ }
-+ ' "$1/Makefile.in" >"$1/Makefile"]
-+ rm -f "$1/Makefile.tmp"
-+ mv "$1/stamp-it.tmp" "$1/stamp-it"
-+ ])
-+])dnl
-+])
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
@@ -1828,10 +1532,7 @@
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-+# _IT_SUBST(VARIABLE)
-+# -------------------
-+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
- #
+-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
@@ -1884,16 +1585,49 @@
- am__untar=false
- ;;
- esac
--
++ dnl Generate list of files to be processed by xgettext which will
++ dnl be included in po/Makefile.
++ test -d po || mkdir po
++ if test "x$srcdir" != "x."; then
++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
++ posrcprefix="$srcdir/"
++ else
++ posrcprefix="../$srcdir/"
++ fi
++ else
++ posrcprefix="../"
++ fi
++ rm -f po/POTFILES
++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
++ < $srcdir/po/POTFILES.in > po/POTFILES
++ ])
+
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-+AC_DEFUN([_IT_SUBST],
-+[
-+AC_SUBST([$1])
-+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-+]
-+)
++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
++# -------------------------------
++# Define VARIABLE to the location where catalog files will
++# be installed by po/Makefile.
++glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
++glib_save_prefix="$prefix"
++glib_save_exec_prefix="$exec_prefix"
++glib_save_datarootdir="$datarootdir"
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++datarootdir=`eval echo "${datarootdir}"`
++if test "x$CATOBJEXT" = "x.mo" ; then
++ localedir=`eval echo "${libdir}/locale"`
++else
++ localedir=`eval echo "${datadir}/locale"`
++fi
++prefix="$glib_save_prefix"
++exec_prefix="$glib_save_exec_prefix"
++datarootdir="$glib_save_datarootdir"
++AC_DEFINE_UNQUOTED($1, "$localedir",
++ [Define the location where the catalogs will be installed])
++])
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
@@ -1907,10 +1641,29 @@
- fi
-done
-rm -rf conftest.dir
-+# deprecated macros
-+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-+# A hint is needed for aclocal from Automake <= 1.9.4:
-+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
++dnl
++dnl Now the definitions that aclocal will find
++dnl
++ifdef(glib_configure_in,[],[
++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
++])dnl
++
++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
++#
++# Create a temporary file with TEST-FILE as its contents and pass the
++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
++# 0 and perform ACTION-IF-FAIL for any other exit status.
++AC_DEFUN([GLIB_RUN_PROG],
++[cat >conftest.foo <<_ACEOF
++$2
++_ACEOF
++if AC_RUN_LOG([$1 conftest.foo]); then
++ m4_ifval([$3], [$3], [:])
++m4_ifvaln([$4], [else $4])dnl
++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
++fi])
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
@@ -1918,126 +1671,78 @@
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- #
-@@ -1639,12 +1135,12 @@
- # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
- # ---------------------------------------------------
- m4_define([lt_decl_varnames_tagged],
--[_$0(m4_quote(m4_default([$1], [[, ]])),
-- m4_quote(m4_if([$2], [],
-- m4_quote(lt_decl_tag_varnames),
-- m4_quote(m4_shift($@)))),
-- m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
--m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
-+[m4_assert([$# <= 2])dnl
-+_$0(m4_quote(m4_default([$1], [[, ]])),
-+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-+m4_define([_lt_decl_varnames_tagged],
-+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
- # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-@@ -2204,10 +1700,10 @@
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-- darwin*) # darwin 5.x on
-+ darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
-- # target defaults to 10.4. Don't you love it?
-+ # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-@@ -2249,7 +1745,11 @@
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-- if test "$GCC" = "yes"; then
-+ case $cc_basename in
-+ ifort*) _lt_dar_can_shared=yes ;;
-+ *) _lt_dar_can_shared=$GCC ;;
-+ esac
-+ if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-@@ -2771,7 +2271,7 @@
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
-- cygwin* | mingw*)
-+ cygwin* | mingw* | cegcc*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -2939,10 +2439,6 @@
- # endif
- #endif
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -2958,7 +2454,7 @@
- else
- puts (dlerror ());
-
-- exit (status);
-+ return status;
- }]
- _LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-@@ -2997,7 +2493,7 @@
- lt_cv_dlopen_self=yes
- ;;
-
-- mingw* | pw32*)
-+ mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-@@ -3294,6 +2790,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- m4_require([_LT_DECL_EGREP])dnl
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_OBJDUMP])dnl
- m4_require([_LT_DECL_SED])dnl
- AC_MSG_CHECKING([dynamic linker characteristics])
- m4_if([$1],
-@@ -3458,14 +2955,14 @@
- # libtool to hard-code these into programs
- ;;
-
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$host_os in
-- yes,cygwin* | yes,mingw* | yes,pw32*)
-+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
-@@ -3488,7 +2985,7 @@
- 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*)
-+ 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"`
-@@ -3703,7 +3200,7 @@
+ # gnome-common.m4
+ #
+@@ -1330,6 +503,68 @@
+ AC_SUBST(DISABLE_DEPRECATED)
+ ])
+
++dnl -*- mode: autoconf -*-
++
++# serial 1
++
++dnl Usage:
++dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
++AC_DEFUN([GTK_DOC_CHECK],
++[
++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++
++ dnl check for tools we added during development
++ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
++ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
++ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
++
++ dnl for overriding the documentation installation directory
++ AC_ARG_WITH([html-dir],
++ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
++ [with_html_dir='${datadir}/gtk-doc/html'])
++ HTML_DIR="$with_html_dir"
++ AC_SUBST([HTML_DIR])
++
++ dnl enable/disable documentation building
++ AC_ARG_ENABLE([gtk-doc],
++ AS_HELP_STRING([--enable-gtk-doc],
++ [use gtk-doc to build documentation [[default=no]]]),,
++ [enable_gtk_doc=no])
++
++ if test x$enable_gtk_doc = xyes; then
++ ifelse([$1],[],
++ [PKG_CHECK_EXISTS([gtk-doc],,
++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
++ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
++ fi
++
++ AC_MSG_CHECKING([whether to build gtk-doc documentation])
++ AC_MSG_RESULT($enable_gtk_doc)
++
++ dnl enable/disable output formats
++ AC_ARG_ENABLE([gtk-doc-html],
++ AS_HELP_STRING([--enable-gtk-doc-html],
++ [build documentation in html format [[default=yes]]]),,
++ [enable_gtk_doc_html=yes])
++ AC_ARG_ENABLE([gtk-doc-pdf],
++ AS_HELP_STRING([--enable-gtk-doc-pdf],
++ [build documentation in pdf format [[default=no]]]),,
++ [enable_gtk_doc_pdf=no])
++
++ if test -z "$GTKDOC_MKPDF"; then
++ enable_gtk_doc_pdf=no
++ fi
++
++
++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
++ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
++])
++
+
+ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+ # serial 40 IT_PROG_INTLTOOL
+@@ -3965,7 +3200,7 @@
;;
# This must be Linux ELF.
@@ -2046,46 +1751,41 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -3926,7 +3423,7 @@
- version_type=linux
+@@ -3990,13 +3225,10 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -4008,6 +3240,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
- need_version=no
-- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-@@ -3950,7 +3447,7 @@
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
--
-+
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- fi
-@@ -4227,6 +3724,7 @@
- # -- PORTME fill in with the dynamic library characteristics
- m4_defun([_LT_CHECK_MAGIC_METHOD],
- [m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
- AC_CACHE_CHECK([how to recognize dependent libraries],
- lt_cv_deplibs_check_method,
- [lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -4277,6 +3775,12 @@
- fi
- ;;
-
-+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'
-+ ;;
-+
- darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-@@ -4335,7 +3839,7 @@
+@@ -4595,11 +3839,11 @@
;;
# This must be Linux ELF.
@@ -2094,40 +1794,12 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -4588,7 +4092,7 @@
- aix*)
- symcode='[[BCDT]]'
- ;;
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
- symcode='[[ABCDGISTW]]'
- ;;
- hpux*)
-@@ -4834,7 +4338,7 @@
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-- mingw* | cygwin* | os2* | pw32*)
-+ mingw* | cygwin* | os2* | pw32* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -4861,10 +4365,11 @@
- fi
- ;;
- hpux*)
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-+ # 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
-+ # sets the default TLS model and affects inlining.
- case $host_cpu in
-- hppa*64*|ia64*)
-+ hppa*64*)
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-@@ -4955,19 +4460,26 @@
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -5216,7 +4460,7 @@
;;
esac
;;
@@ -2136,109 +1808,35 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+@@ -5280,7 +4524,7 @@
;;
-- icpc* | ecpc* )
-- # Intel C++
-+ ecpc* )
-+ # old Intel C++ for x86_64 which still supported -KPIC.
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
-+ icpc* )
-+ # Intel C++, used to be incompatible with GCC.
-+ # ICC 10 doesn't accept -KPIC any more.
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
- pgCC* | pgcpp*)
- # Portland Group C++ compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -5133,7 +4645,7 @@
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -5149,10 +4661,11 @@
- ;;
-
- hpux*)
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-+ # 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
-+ # sets the default TLS model and affects inlining.
- case $host_cpu in
-- hppa*64*|ia64*)
-+ hppa*64*)
- # +Z the default
+ esac
;;
- *)
-@@ -5202,7 +4715,7 @@
- fi
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- m4_if([$1], [GCJ], [],
-@@ -5231,13 +4744,27 @@
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -5500,7 +4744,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
-- icc* | ecc* | ifort*)
-+ # old Intel for x86_64 which still supported -KPIC.
-+ ecc*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
-+ # icc used to be incompatible with GCC.
-+ # ICC 10 doesn't accept -KPIC any more.
-+ icc* | ifort*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ # Lahey Fortran 8.1.
-+ lf95*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-+ ;;
- pgcc* | pgf77* | pgf90* | pgf95*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
-@@ -5419,7 +4946,7 @@
- pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
-- cygwin* | mingw*)
-+ cygwin* | mingw* | cegcc*)
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -5705,6 +4949,9 @@
+ cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
-@@ -5474,7 +5001,7 @@
- extract_expsyms_cmds=
-
- case $host_os in
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
-@@ -5489,6 +5016,9 @@
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -5769,6 +5016,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -2248,7 +1846,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -5510,6 +5040,7 @@
+@@ -5790,6 +5040,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -2256,16 +1854,7 @@
*\ [[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 ...
-@@ -5561,7 +5092,7 @@
- fi
- ;;
-
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -5601,7 +5132,7 @@
+@@ -5881,7 +5132,7 @@
_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'
;;
@@ -2274,60 +1863,33 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -5627,6 +5158,9 @@
- tmp_addflag=' -i_dynamic -nofor_main' ;;
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
-+ lf95*) # Lahey Fortran 8.1
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ tmp_sharedflag='--shared' ;;
- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
- tmp_sharedflag='-qmkshrobj'
- tmp_addflag= ;;
-@@ -5859,6 +5393,7 @@
+@@ -5951,7 +5202,7 @@
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -6126,6 +5377,7 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
fi
- fi
-
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_TAGVAR(always_export_symbols, $1)=yes
-@@ -5913,7 +5448,7 @@
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++ _LT_TAGVAR(link_all_deplibs, $1)=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -6364,7 +5616,7 @@
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
;;
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -6017,7 +5552,7 @@
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-@@ -6798,6 +6333,7 @@
- fi
- fi
-
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to
- # export.
-@@ -6856,7 +6392,7 @@
- esac
- ;;
-
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -7076,7 +6612,7 @@
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -7360,7 +6612,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
@@ -2336,10 +1898,558 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -8237,6 +7773,18 @@
+@@ -8055,53 +7307,196 @@
+ esac
])
-
+-case " $_LT_TAGVAR(postdeps, $1) " in
+-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-esac
+- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+-fi
+-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+- [The directories searched by this compiler when creating a shared library])
+-_LT_TAGDECL([], [predep_objects], [1],
+- [Dependencies to place before and after the objects being linked to
+- create a shared library])
+-_LT_TAGDECL([], [postdep_objects], [1])
+-_LT_TAGDECL([], [predeps], [1])
+-_LT_TAGDECL([], [postdeps], [1])
+-_LT_TAGDECL([], [compiler_lib_search_path], [1],
+- [The library search path used internally by the compiler when linking
+- a shared library])
+-])# _LT_SYS_HIDDEN_LIBDEPS
++case " $_LT_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
++ [The directories searched by this compiler when creating a shared library])
++_LT_TAGDECL([], [predep_objects], [1],
++ [Dependencies to place before and after the objects being linked to
++ create a shared library])
++_LT_TAGDECL([], [postdep_objects], [1])
++_LT_TAGDECL([], [predeps], [1])
++_LT_TAGDECL([], [postdeps], [1])
++_LT_TAGDECL([], [compiler_lib_search_path], [1],
++ [The library search path used internally by the compiler when linking
++ a shared library])
++])# _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_REQUIRE([_LT_PROG_F77])dnl
++AC_LANG_PUSH(Fortran 77)
++
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_TAGVAR(allow_undefined_flag, $1)=
++_LT_TAGVAR(always_export_symbols, $1)=no
++_LT_TAGVAR(archive_expsym_cmds, $1)=
++_LT_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_TAGVAR(hardcode_direct, $1)=no
++_LT_TAGVAR(hardcode_direct_absolute, $1)=no
++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_TAGVAR(hardcode_minus_L, $1)=no
++_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(inherit_rpath, $1)=no
++_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(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++
++# Source file extension for f77 test sources.
++ac_ext=f
++
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
++
++# No sense in running all these tests if we already determined that
++# the F77 compiler isn't working. Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_disable_F77" != yes; then
++ # Code to be used in simple compile tests
++ lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
++
++ # Code to be used in simple link tests
++ lt_simple_link_test_code="\
++ program t
++ end
++"
++
++ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++ _LT_TAG_COMPILER
++
++ # save warnings/boilerplate of simple test code
++ _LT_COMPILER_BOILERPLATE
++ _LT_LINKER_BOILERPLATE
++
++ # Allow CC to be a program name with arguments.
++ lt_save_CC="$CC"
++ lt_save_GCC=$GCC
++ CC=${F77-"f77"}
++ compiler=$CC
++ _LT_TAGVAR(compiler, $1)=$CC
++ _LT_CC_BASENAME([$compiler])
++ GCC=$G77
++ if test -n "$compiler"; then
++ AC_MSG_CHECKING([if libtool supports shared libraries])
++ AC_MSG_RESULT([$can_build_shared])
++
++ AC_MSG_CHECKING([whether to build shared libraries])
++ test "$can_build_shared" = "no" && enable_shared=no
++
++ # 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
++ AC_MSG_RESULT([$enable_shared])
++
++ AC_MSG_CHECKING([whether to build static libraries])
++ # Make sure either enable_shared or enable_static is yes.
++ test "$enable_shared" = yes || enable_static=yes
++ AC_MSG_RESULT([$enable_static])
++
++ _LT_TAGVAR(GCC, $1)="$G77"
++ _LT_TAGVAR(LD, $1)="$LD"
++
++ ## CAVEAT EMPTOR:
++ ## There is no encapsulation within the following macros, do not change
++ ## the running order or otherwise move them around unless you know exactly
++ ## what you are doing...
++ _LT_COMPILER_PIC($1)
++ _LT_COMPILER_C_O($1)
++ _LT_COMPILER_FILE_LOCKS($1)
++ _LT_LINKER_SHLIBS($1)
++ _LT_SYS_DYNAMIC_LINKER($1)
++ _LT_LINKER_HARDCODE_LIBPATH($1)
++
++ _LT_CONFIG($1)
++ fi # test -n "$compiler"
++
++ GCC=$lt_save_GCC
++ CC="$lt_save_CC"
++fi # test "$_lt_disable_F77" != yes
++
++AC_LANG_POP
++])# _LT_LANG_F77_CONFIG
+
+
+-# _LT_PROG_F77
+-# ------------
+-# Since AC_PROG_F77 is broken, in that it returns the empty string
++# _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_F77],
++m4_defun([_LT_PROG_FC],
+ [
+-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+-AC_PROG_F77
+-if test -z "$F77" || test "X$F77" = "Xno"; then
+- _lt_disable_F77=yes
++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_F77
++])# _LT_PROG_FC
+
+ dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_F77], [])
++dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
+-# _LT_LANG_F77_CONFIG([TAG])
+-# --------------------------
+-# Ensure that the configuration variables for a Fortran 77 compiler are
++# _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_F77_CONFIG],
+-[AC_REQUIRE([_LT_PROG_F77])dnl
+-AC_LANG_PUSH(Fortran 77)
++m4_defun([_LT_LANG_FC_CONFIG],
++[AC_REQUIRE([_LT_PROG_FC])dnl
++AC_LANG_PUSH(Fortran)
+
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -8124,2036 +7519,2661 @@
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+-# Source file extension for f77 test sources.
+-ac_ext=f
++# Source file extension for fc test sources.
++ac_ext=${ac_fc_srcext-f}
++
++# Object file extension for compiled fc test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
++
++# No sense in running all these tests if we already determined that
++# the FC compiler isn't working. Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_disable_FC" != yes; then
++ # Code to be used in simple compile tests
++ lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
++
++ # Code to be used in simple link tests
++ lt_simple_link_test_code="\
++ program t
++ end
++"
++
++ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++ _LT_TAG_COMPILER
++
++ # save warnings/boilerplate of simple test code
++ _LT_COMPILER_BOILERPLATE
++ _LT_LINKER_BOILERPLATE
++
++ # Allow CC to be a program name with arguments.
++ lt_save_CC="$CC"
++ lt_save_GCC=$GCC
++ CC=${FC-"f95"}
++ compiler=$CC
++ GCC=$ac_cv_fc_compiler_gnu
++
++ _LT_TAGVAR(compiler, $1)=$CC
++ _LT_CC_BASENAME([$compiler])
++
++ if test -n "$compiler"; then
++ AC_MSG_CHECKING([if libtool supports shared libraries])
++ AC_MSG_RESULT([$can_build_shared])
++
++ AC_MSG_CHECKING([whether to build shared libraries])
++ test "$can_build_shared" = "no" && enable_shared=no
++
++ # 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
++ AC_MSG_RESULT([$enable_shared])
++
++ AC_MSG_CHECKING([whether to build static libraries])
++ # Make sure either enable_shared or enable_static is yes.
++ test "$enable_shared" = yes || enable_static=yes
++ AC_MSG_RESULT([$enable_static])
++
++ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
++ _LT_TAGVAR(LD, $1)="$LD"
++
++ ## CAVEAT EMPTOR:
++ ## There is no encapsulation within the following macros, do not change
++ ## the running order or otherwise move them around unless you know exactly
++ ## what you are doing...
++ _LT_SYS_HIDDEN_LIBDEPS($1)
++ _LT_COMPILER_PIC($1)
++ _LT_COMPILER_C_O($1)
++ _LT_COMPILER_FILE_LOCKS($1)
++ _LT_LINKER_SHLIBS($1)
++ _LT_SYS_DYNAMIC_LINKER($1)
++ _LT_LINKER_HARDCODE_LIBPATH($1)
++
++ _LT_CONFIG($1)
++ fi # test -n "$compiler"
++
++ GCC=$lt_save_GCC
++ CC="$lt_save_CC"
++fi # test "$_lt_disable_FC" != yes
++
++AC_LANG_POP
++])# _LT_LANG_FC_CONFIG
++
++
++# _LT_LANG_GCJ_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for the GNU Java Compiler compiler
++# are suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_GCJ_CONFIG],
++[AC_REQUIRE([LT_PROG_GCJ])dnl
++AC_LANG_SAVE
++
++# Source file extension for Java test sources.
++ac_ext=java
++
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++lt_save_GCC=$GCC
++GCC=yes
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_TAGVAR(LD, $1)="$LD"
++_LT_CC_BASENAME([$compiler])
++
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
++if test -n "$compiler"; then
++ _LT_COMPILER_NO_RTTI($1)
++ _LT_COMPILER_PIC($1)
++ _LT_COMPILER_C_O($1)
++ _LT_COMPILER_FILE_LOCKS($1)
++ _LT_LINKER_SHLIBS($1)
++ _LT_LINKER_HARDCODE_LIBPATH($1)
++
++ _LT_CONFIG($1)
++fi
++
++AC_LANG_RESTORE
++
++GCC=$lt_save_GCC
++CC="$lt_save_CC"
++])# _LT_LANG_GCJ_CONFIG
++
++
++# _LT_LANG_RC_CONFIG([TAG])
++# -------------------------
++# Ensure that the configuration variables for the Windows resource compiler
++# are suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_RC_CONFIG],
++[AC_REQUIRE([LT_PROG_RC])dnl
++AC_LANG_SAVE
++
++# Source file extension for RC test sources.
++ac_ext=rc
++
++# Object file extension for compiled RC test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++lt_save_GCC=$GCC
++GCC=
++CC=${RC-"windres"}
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++
++if test -n "$compiler"; then
++ :
++ _LT_CONFIG($1)
++fi
++
++GCC=$lt_save_GCC
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# _LT_LANG_RC_CONFIG
+
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
+
+-# No sense in running all these tests if we already determined that
+-# the F77 compiler isn't working. Some variables (like enable_shared)
+-# are currently assumed to apply to all compilers on this platform,
+-# and will be corrupted by setting them based on a non-working compiler.
+-if test "$_lt_disable_F77" != yes; then
+- # Code to be used in simple compile tests
+- lt_simple_compile_test_code="\
+- subroutine t
+- return
+- end
+-"
++# LT_PROG_GCJ
++# -----------
++AC_DEFUN([LT_PROG_GCJ],
++[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
++ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
++ [AC_CHECK_TOOL(GCJ, gcj,)
++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++ AC_SUBST(GCJFLAGS)])])[]dnl
++])
+
+- # Code to be used in simple link tests
+- lt_simple_link_test_code="\
+- program t
+- end
+-"
++# Old name:
++AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+- _LT_TAG_COMPILER
+
+- # save warnings/boilerplate of simple test code
+- _LT_COMPILER_BOILERPLATE
+- _LT_LINKER_BOILERPLATE
++# LT_PROG_RC
++# ----------
++AC_DEFUN([LT_PROG_RC],
++[AC_CHECK_TOOL(RC, windres,)
++])
+
+- # Allow CC to be a program name with arguments.
+- lt_save_CC="$CC"
+- lt_save_GCC=$GCC
+- CC=${F77-"f77"}
+- compiler=$CC
+- _LT_TAGVAR(compiler, $1)=$CC
+- _LT_CC_BASENAME([$compiler])
+- GCC=$G77
+- if test -n "$compiler"; then
+- AC_MSG_CHECKING([if libtool supports shared libraries])
+- AC_MSG_RESULT([$can_build_shared])
++# Old name:
++AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+- AC_MSG_CHECKING([whether to build shared libraries])
+- 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
+- AC_MSG_RESULT([$enable_shared])
++# _LT_DECL_EGREP
++# --------------
++# If we don't have a new enough Autoconf to choose the best grep
++# available, choose the one first in the user's PATH.
++m4_defun([_LT_DECL_EGREP],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_REQUIRE([AC_PROG_FGREP])dnl
++test -z "$GREP" && GREP=grep
++_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
++_LT_DECL([], [EGREP], [1], [An ERE matcher])
++_LT_DECL([], [FGREP], [1], [A literal string matcher])
++dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
++AC_SUBST([GREP])
++])
+
+- AC_MSG_CHECKING([whether to build static libraries])
+- # Make sure either enable_shared or enable_static is yes.
+- test "$enable_shared" = yes || enable_static=yes
+- AC_MSG_RESULT([$enable_static])
+
+- _LT_TAGVAR(GCC, $1)="$G77"
+- _LT_TAGVAR(LD, $1)="$LD"
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
@@ -2350,25 +2460,1281 @@
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
-+
-+
- # _LT_DECL_SED
- # ------------
- # Check for a fully-functional sed program, that truncates
-@@ -8697,7 +8245,7 @@
- [enable_win32_dll=yes
-
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+
+- ## CAVEAT EMPTOR:
+- ## There is no encapsulation within the following macros, do not change
+- ## the running order or otherwise move them around unless you know exactly
+- ## what you are doing...
+- _LT_COMPILER_PIC($1)
+- _LT_COMPILER_C_O($1)
+- _LT_COMPILER_FILE_LOCKS($1)
+- _LT_LINKER_SHLIBS($1)
+- _LT_SYS_DYNAMIC_LINKER($1)
+- _LT_LINKER_HARDCODE_LIBPATH($1)
+
+- _LT_CONFIG($1)
+- fi # test -n "$compiler"
++# _LT_DECL_SED
++# ------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible. Prefer GNU sed if found.
++m4_defun([_LT_DECL_SED],
++[AC_PROG_SED
++test -z "$SED" && SED=sed
++Xsed="$SED -e 1s/^X//"
++_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
++_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
++ [Sed that helps us avoid accidentally triggering echo(1) options like -n])
++])# _LT_DECL_SED
+
+- GCC=$lt_save_GCC
+- CC="$lt_save_CC"
+-fi # test "$_lt_disable_F77" != yes
++m4_ifndef([AC_PROG_SED], [
++# NOTE: This macro has been submitted for inclusion into #
++# GNU Autoconf as AC_PROG_SED. When it is available in #
++# a released version of Autoconf we should remove this #
++# macro and use it instead. #
+
+-AC_LANG_POP
+-])# _LT_LANG_F77_CONFIG
++m4_defun([AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for lt_ac_prog in sed gsed; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
++ fi
++ done
++ done
++done
++IFS=$as_save_IFS
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++ test ! -f $lt_ac_sed && continue
++ cat /dev/null > conftest.in
++ lt_ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++ # Check for GNU sed and select it if it is found.
++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++ lt_cv_path_SED=$lt_ac_sed
++ break
++ fi
++ while true; do
++ cat conftest.in conftest.in >conftest.tmp
++ mv conftest.tmp conftest.in
++ cp conftest.in conftest.nl
++ echo >>conftest.nl
++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++ cmp -s conftest.out conftest.nl || break
++ # 10000 chars as input seems more than enough
++ test $lt_ac_count -gt 10 && break
++ lt_ac_count=`expr $lt_ac_count + 1`
++ if test $lt_ac_count -gt $lt_ac_max; then
++ lt_ac_max=$lt_ac_count
++ lt_cv_path_SED=$lt_ac_sed
++ fi
++ done
++done
++])
++SED=$lt_cv_path_SED
++AC_SUBST([SED])
++AC_MSG_RESULT([$SED])
++])#AC_PROG_SED
++])#m4_ifndef
+
++# Old name:
++AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+-# _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
++
++# _LT_CHECK_SHELL_FEATURES
++# ------------------------
++# Find out whether the shell is Bourne or XSI compatible,
++# or has some other useful features.
++m4_defun([_LT_CHECK_SHELL_FEATURES],
++[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
++# Try some XSI features
++xsi_shell=no
++( _lt_dummy="a/b/c"
++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
++ = c,a/b,, \
++ && eval 'test $(( 1 + 1 )) -eq 2 \
++ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
++ && xsi_shell=yes
++AC_MSG_RESULT([$xsi_shell])
++_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
++
++AC_MSG_CHECKING([whether the shell understands "+="])
++lt_shell_append=no
++( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
++ >/dev/null 2>&1 \
++ && lt_shell_append=yes
++AC_MSG_RESULT([$lt_shell_append])
++_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
++
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++ lt_unset=unset
++else
++ lt_unset=false
+ fi
+-popdef([AC_MSG_ERROR])
+-])# _LT_PROG_FC
++_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_FC], [])
++# test EBCDIC or ASCII
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++ lt_SP2NL='tr \040 \012'
++ lt_NL2SP='tr \015\012 \040\040'
++ ;;
++ *) # EBCDIC based system
++ lt_SP2NL='tr \100 \n'
++ lt_NL2SP='tr \r\n \100\100'
++ ;;
++esac
++_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
++_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
++])# _LT_CHECK_SHELL_FEATURES
+
+
+-# _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_REQUIRE([_LT_PROG_FC])dnl
+-AC_LANG_PUSH(Fortran)
++# _LT_PROG_XSI_SHELLFNS
++# ---------------------
++# Bourne and XSI compatible variants of some useful shell functions.
++m4_defun([_LT_PROG_XSI_SHELLFNS],
++[case $xsi_shell in
++ yes)
++ cat << \_LT_EOF >> "$cfgfile"
+
+-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_TAGVAR(allow_undefined_flag, $1)=
+-_LT_TAGVAR(always_export_symbols, $1)=no
+-_LT_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_direct, $1)=no
+-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_TAGVAR(hardcode_automatic, $1)=no
+-_LT_TAGVAR(inherit_rpath, $1)=no
+-_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(no_undefined_flag, $1)=
+-_LT_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE. If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++ case ${1} in
++ */*) func_dirname_result="${1%/*}${2}" ;;
++ * ) func_dirname_result="${3}" ;;
++ esac
++}
+
+-# Source file extension for fc test sources.
+-ac_ext=${ac_fc_srcext-f}
++# func_basename file
++func_basename ()
++{
++ func_basename_result="${1##*/}"
++}
+
+-# Object file extension for compiled fc test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
++# func_dirname_and_basename file append nondir_replacement
++# perform func_basename and func_dirname in a single function
++# call:
++# dirname: Compute the dirname of FILE. If nonempty,
++# add APPEND to the result, otherwise set result
++# to NONDIR_REPLACEMENT.
++# value returned in "$func_dirname_result"
++# basename: Compute filename of FILE.
++# value retuned in "$func_basename_result"
++# Implementation must be kept synchronized with func_dirname
++# and func_basename. For efficiency, we do not delegate to
++# those functions but instead duplicate the functionality here.
++func_dirname_and_basename ()
++{
++ case ${1} in
++ */*) func_dirname_result="${1%/*}${2}" ;;
++ * ) func_dirname_result="${3}" ;;
++ esac
++ func_basename_result="${1##*/}"
++}
+
+-# No sense in running all these tests if we already determined that
+-# the FC compiler isn't working. Some variables (like enable_shared)
+-# are currently assumed to apply to all compilers on this platform,
+-# and will be corrupted by setting them based on a non-working compiler.
+-if test "$_lt_disable_FC" != yes; then
+- # Code to be used in simple compile tests
+- lt_simple_compile_test_code="\
+- subroutine t
+- return
+- end
+-"
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++func_stripname ()
++{
++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++ # positional parameters, so assign one to ordinary parameter first.
++ func_stripname_result=${3}
++ func_stripname_result=${func_stripname_result#"${1}"}
++ func_stripname_result=${func_stripname_result%"${2}"}
++}
+
+- # Code to be used in simple link tests
+- lt_simple_link_test_code="\
+- program t
+- end
+-"
++# func_opt_split
++func_opt_split ()
++{
++ func_opt_split_opt=${1%%=*}
++ func_opt_split_arg=${1#*=}
++}
+
+- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+- _LT_TAG_COMPILER
++# func_lo2o object
++func_lo2o ()
++{
++ case ${1} in
++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++ *) func_lo2o_result=${1} ;;
++ esac
++}
+
+- # save warnings/boilerplate of simple test code
+- _LT_COMPILER_BOILERPLATE
+- _LT_LINKER_BOILERPLATE
++# func_xform libobj-or-source
++func_xform ()
++{
++ func_xform_result=${1%.*}.lo
++}
+
+- # Allow CC to be a program name with arguments.
+- lt_save_CC="$CC"
+- lt_save_GCC=$GCC
+- CC=${FC-"f95"}
+- compiler=$CC
+- GCC=$ac_cv_fc_compiler_gnu
++# func_arith arithmetic-term...
++func_arith ()
++{
++ func_arith_result=$(( $[*] ))
++}
+
+- _LT_TAGVAR(compiler, $1)=$CC
+- _LT_CC_BASENAME([$compiler])
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++ func_len_result=${#1}
++}
+
+- if test -n "$compiler"; then
+- AC_MSG_CHECKING([if libtool supports shared libraries])
+- AC_MSG_RESULT([$can_build_shared])
++_LT_EOF
++ ;;
++ *) # Bourne compatible functions.
++ cat << \_LT_EOF >> "$cfgfile"
+
+- AC_MSG_CHECKING([whether to build shared libraries])
+- test "$can_build_shared" = "no" && enable_shared=no
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE. If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++ # Extract subdirectory from the argument.
++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
++ if test "X$func_dirname_result" = "X${1}"; then
++ func_dirname_result="${3}"
++ else
++ func_dirname_result="$func_dirname_result${2}"
++ fi
++}
+
+- # 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
+- AC_MSG_RESULT([$enable_shared])
++# func_basename file
++func_basename ()
++{
++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
++}
+
+- AC_MSG_CHECKING([whether to build static libraries])
+- # Make sure either enable_shared or enable_static is yes.
+- test "$enable_shared" = yes || enable_static=yes
+- AC_MSG_RESULT([$enable_static])
++dnl func_dirname_and_basename
++dnl A portable version of this function is already defined in general.m4sh
++dnl so there is no need for it here.
+
+- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+- _LT_TAGVAR(LD, $1)="$LD"
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++ case ${2} in
++ .*) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++ *) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
++ esac
++}
+
+- ## CAVEAT EMPTOR:
+- ## There is no encapsulation within the following macros, do not change
+- ## the running order or otherwise move them around unless you know exactly
+- ## what you are doing...
+- _LT_SYS_HIDDEN_LIBDEPS($1)
+- _LT_COMPILER_PIC($1)
+- _LT_COMPILER_C_O($1)
+- _LT_COMPILER_FILE_LOCKS($1)
+- _LT_LINKER_SHLIBS($1)
+- _LT_SYS_DYNAMIC_LINKER($1)
+- _LT_LINKER_HARDCODE_LIBPATH($1)
++# sed scripts:
++my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
++my_sed_long_arg='1s/^-[[^=]]*=//'
+
+- _LT_CONFIG($1)
+- fi # test -n "$compiler"
++# func_opt_split
++func_opt_split ()
++{
++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
++}
+
+- GCC=$lt_save_GCC
+- CC="$lt_save_CC"
+-fi # test "$_lt_disable_FC" != yes
++# func_lo2o object
++func_lo2o ()
++{
++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
++}
+
+-AC_LANG_POP
+-])# _LT_LANG_FC_CONFIG
++# func_xform libobj-or-source
++func_xform ()
++{
++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
++}
+
++# func_arith arithmetic-term...
++func_arith ()
++{
++ func_arith_result=`expr "$[@]"`
++}
+
+-# _LT_LANG_GCJ_CONFIG([TAG])
+-# --------------------------
+-# Ensure that the configuration variables for the GNU Java Compiler compiler
+-# are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to `libtool'.
+-m4_defun([_LT_LANG_GCJ_CONFIG],
+-[AC_REQUIRE([LT_PROG_GCJ])dnl
+-AC_LANG_SAVE
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
++}
+
+-# Source file extension for Java test sources.
+-ac_ext=java
++_LT_EOF
++esac
+
+-# Object file extension for compiled Java test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
++case $lt_shell_append in
++ yes)
++ cat << \_LT_EOF >> "$cfgfile"
+
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}"
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++ eval "$[1]+=\$[2]"
++}
++_LT_EOF
++ ;;
++ *)
++ cat << \_LT_EOF >> "$cfgfile"
+
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++ eval "$[1]=\$$[1]\$[2]"
++}
+
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_TAG_COMPILER
++_LT_EOF
++ ;;
++ esac
++])
+
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++# Helper functions for option handling. -*- Autoconf -*-
++#
++# 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.
+
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-lt_save_GCC=$GCC
+-GCC=yes
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_TAGVAR(compiler, $1)=$CC
+-_LT_TAGVAR(LD, $1)="$LD"
+-_LT_CC_BASENAME([$compiler])
++# serial 6 ltoptions.m4
+
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+-if test -n "$compiler"; then
+- _LT_COMPILER_NO_RTTI($1)
+- _LT_COMPILER_PIC($1)
+- _LT_COMPILER_C_O($1)
+- _LT_COMPILER_FILE_LOCKS($1)
+- _LT_LINKER_SHLIBS($1)
+- _LT_LINKER_HARDCODE_LIBPATH($1)
++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
++# ------------------------------------------
++m4_define([_LT_MANGLE_OPTION],
++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+- _LT_CONFIG($1)
+-fi
+
+-AC_LANG_RESTORE
++# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
++# ---------------------------------------
++# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
++# matching handler defined, dispatch to it. Other OPTION-NAMEs are
++# saved as a flag.
++m4_define([_LT_SET_OPTION],
++[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
++m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
++ _LT_MANGLE_DEFUN([$1], [$2]),
++ [m4_warning([Unknown $1 option `$2'])])[]dnl
++])
+
+-GCC=$lt_save_GCC
+-CC="$lt_save_CC"
+-])# _LT_LANG_GCJ_CONFIG
+
++# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
++# ------------------------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++m4_define([_LT_IF_OPTION],
++[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+-# _LT_LANG_RC_CONFIG([TAG])
+-# -------------------------
+-# Ensure that the configuration variables for the Windows resource compiler
+-# are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to `libtool'.
+-m4_defun([_LT_LANG_RC_CONFIG],
+-[AC_REQUIRE([LT_PROG_RC])dnl
+-AC_LANG_SAVE
+
+-# Source file extension for RC test sources.
+-ac_ext=rc
++# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
++# -------------------------------------------------------
++# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
++# are set.
++m4_define([_LT_UNLESS_OPTIONS],
++[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
++ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
++ [m4_define([$0_found])])])[]dnl
++m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
++])[]dnl
++])
+
+-# Object file extension for compiled RC test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
+
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
++# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
++# ----------------------------------------
++# OPTION-LIST is a space-separated list of Libtool options associated
++# with MACRO-NAME. If any OPTION has a matching handler declared with
++# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
++# the unknown option and exit.
++m4_defun([_LT_SET_OPTIONS],
++[# Set options
++m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
++ [_LT_SET_OPTION([$1], _LT_Option)])
+
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
++m4_if([$1],[LT_INIT],[
++ dnl
++ dnl Simply set some default values (i.e off) if boolean options were not
++ dnl specified:
++ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
++ ])
++ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
++ ])
++ dnl
++ dnl If no reference was made to various pairs of opposing options, then
++ dnl we run the default mode handler for the pair. For example, if neither
++ dnl `shared' nor `disable-shared' was passed, we enable building of shared
++ dnl archives by default:
++ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
++ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
++ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
++ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
++ [_LT_ENABLE_FAST_INSTALL])
++ ])
++])# _LT_SET_OPTIONS
+
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_TAG_COMPILER
+
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-lt_save_GCC=$GCC
+-GCC=
+-CC=${RC-"windres"}
+-compiler=$CC
+-_LT_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
++# -----------------------------------------
++m4_define([_LT_MANGLE_DEFUN],
++[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+-if test -n "$compiler"; then
+- :
+- _LT_CONFIG($1)
+-fi
+
+-GCC=$lt_save_GCC
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# _LT_LANG_RC_CONFIG
++# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
++# -----------------------------------------------
++m4_define([LT_OPTION_DEFINE],
++[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
++])# LT_OPTION_DEFINE
+
+
+-# LT_PROG_GCJ
+-# -----------
+-AC_DEFUN([LT_PROG_GCJ],
+-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+- [AC_CHECK_TOOL(GCJ, gcj,)
+- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+- AC_SUBST(GCJFLAGS)])])[]dnl
++# dlopen
++# ------
++LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+ ])
+
+-# Old name:
+-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+-
+-
+-# LT_PROG_RC
+-# ----------
+-AC_DEFUN([LT_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres,)
++AU_DEFUN([AC_LIBTOOL_DLOPEN],
++[_LT_SET_OPTION([LT_INIT], [dlopen])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `dlopen' option into LT_INIT's first parameter.])
+ ])
+
+-# Old name:
+-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+ dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([LT_AC_PROG_RC], [])
+-
+-
+-# _LT_DECL_EGREP
+-# --------------
+-# If we don't have a new enough Autoconf to choose the best grep
+-# available, choose the one first in the user's PATH.
+-m4_defun([_LT_DECL_EGREP],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_REQUIRE([AC_PROG_FGREP])dnl
+-test -z "$GREP" && GREP=grep
+-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+-_LT_DECL([], [EGREP], [1], [An ERE matcher])
+-_LT_DECL([], [FGREP], [1], [A literal string matcher])
+-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+-AC_SUBST([GREP])
+-])
++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+-# _LT_DECL_OBJDUMP
+-# --------------
+-# If we don't have a new enough Autoconf to choose the best objdump
+-# available, choose the one first in the user's PATH.
+-m4_defun([_LT_DECL_OBJDUMP],
+-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+-AC_SUBST([OBJDUMP])
+-])
++# win32-dll
++# ---------
++# Declare package support for building win32 dll's.
++LT_OPTION_DEFINE([LT_INIT], [win32-dll],
++[enable_win32_dll=yes
+
++case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -8938,14 +8486,14 @@
-
- # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
++ AC_CHECK_TOOL(AS, as, false)
++ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++ AC_CHECK_TOOL(OBJDUMP, objdump, false)
++ ;;
++esac
+
+-# _LT_DECL_SED
+-# ------------
+-# Check for a fully-functional sed program, that truncates
+-# as few characters as possible. Prefer GNU sed if found.
+-m4_defun([_LT_DECL_SED],
+-[AC_PROG_SED
+-test -z "$SED" && SED=sed
+-Xsed="$SED -e 1s/^X//"
+-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+- [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+-])# _LT_DECL_SED
++test -z "$AS" && AS=as
++_LT_DECL([], [AS], [0], [Assembler program])dnl
+
+-m4_ifndef([AC_PROG_SED], [
+-# NOTE: This macro has been submitted for inclusion into #
+-# GNU Autoconf as AC_PROG_SED. When it is available in #
+-# a released version of Autoconf we should remove this #
+-# macro and use it instead. #
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+
+-m4_defun([AC_PROG_SED],
+-[AC_MSG_CHECKING([for a sed that does not truncate output])
+-AC_CACHE_VAL(lt_cv_path_SED,
+-[# Loop through the user's path and test for sed and gsed.
+-# Then use that list of sed's as ones to test for truncation.
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for lt_ac_prog in sed gsed; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+- fi
+- done
+- done
+-done
+-IFS=$as_save_IFS
+-lt_ac_max=0
+-lt_ac_count=0
+-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+-# along with /bin/sed that truncates output.
+-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f $lt_ac_sed && continue
+- cat /dev/null > conftest.in
+- lt_ac_count=0
+- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+- # Check for GNU sed and select it if it is found.
+- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+- lt_cv_path_SED=$lt_ac_sed
+- break
+- fi
+- while true; do
+- cat conftest.in conftest.in >conftest.tmp
+- mv conftest.tmp conftest.in
+- cp conftest.in conftest.nl
+- echo >>conftest.nl
+- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+- cmp -s conftest.out conftest.nl || break
+- # 10000 chars as input seems more than enough
+- test $lt_ac_count -gt 10 && break
+- lt_ac_count=`expr $lt_ac_count + 1`
+- if test $lt_ac_count -gt $lt_ac_max; then
+- lt_ac_max=$lt_ac_count
+- lt_cv_path_SED=$lt_ac_sed
+- fi
+- done
+-done
++test -z "$OBJDUMP" && OBJDUMP=objdump
++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
++])# win32-dll
++
++AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++_LT_SET_OPTION([LT_INIT], [win32-dll])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `win32-dll' option into LT_INIT's first parameter.])
+ ])
+-SED=$lt_cv_path_SED
+-AC_SUBST([SED])
+-AC_MSG_RESULT([$SED])
+-])#AC_PROG_SED
+-])#m4_ifndef
+
+-# Old name:
+-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+ dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([LT_AC_PROG_SED], [])
++dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+-# _LT_CHECK_SHELL_FEATURES
+-# ------------------------
+-# Find out whether the shell is Bourne or XSI compatible,
+-# or has some other useful features.
+-m4_defun([_LT_CHECK_SHELL_FEATURES],
+-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+-# Try some XSI features
+-xsi_shell=no
+-( _lt_dummy="a/b/c"
+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+- = c,a/b,, \
+- && eval 'test $(( 1 + 1 )) -eq 2 \
+- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+- && xsi_shell=yes
+-AC_MSG_RESULT([$xsi_shell])
+-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
++# _LT_ENABLE_SHARED([DEFAULT])
++# ----------------------------
++# implement the --enable-shared flag, and supports the `shared' and
++# `disable-shared' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_SHARED],
++[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([shared],
++ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
++ [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],
++ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+-AC_MSG_CHECKING([whether the shell understands "+="])
+-lt_shell_append=no
+-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+- >/dev/null 2>&1 \
+- && lt_shell_append=yes
+-AC_MSG_RESULT([$lt_shell_append])
+-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
++ _LT_DECL([build_libtool_libs], [enable_shared], [0],
++ [Whether or not to build shared libraries])
++])# _LT_ENABLE_SHARED
+
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+- lt_unset=unset
+-else
+- lt_unset=false
+-fi
+-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
++LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+-# test EBCDIC or ASCII
+-case `echo X|tr X '\101'` in
+- A) # ASCII based system
+- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+- lt_SP2NL='tr \040 \012'
+- lt_NL2SP='tr \015\012 \040\040'
+- ;;
+- *) # EBCDIC based system
+- lt_SP2NL='tr \100 \n'
+- lt_NL2SP='tr \r\n \100\100'
+- ;;
+-esac
+-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+-])# _LT_CHECK_SHELL_FEATURES
++# Old names:
++AC_DEFUN([AC_ENABLE_SHARED],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
++])
+
++AC_DEFUN([AC_DISABLE_SHARED],
++[_LT_SET_OPTION([LT_INIT], [disable-shared])
++])
+
+-# _LT_PROG_XSI_SHELLFNS
+-# ---------------------
+-# Bourne and XSI compatible variants of some useful shell functions.
+-m4_defun([_LT_PROG_XSI_SHELLFNS],
+-[case $xsi_shell in
+- yes)
+- cat << \_LT_EOF >> "$cfgfile"
++AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+- case ${1} in
+- */*) func_dirname_result="${1%/*}${2}" ;;
+- * ) func_dirname_result="${3}" ;;
+- esac
+-}
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_SHARED], [])
++dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+-# func_basename file
+-func_basename ()
+-{
+- func_basename_result="${1##*/}"
+-}
+
+-# func_dirname_and_basename file append nondir_replacement
+-# perform func_basename and func_dirname in a single function
+-# call:
+-# dirname: Compute the dirname of FILE. If nonempty,
+-# add APPEND to the result, otherwise set result
+-# to NONDIR_REPLACEMENT.
+-# value returned in "$func_dirname_result"
+-# basename: Compute filename of FILE.
+-# value retuned in "$func_basename_result"
+-# Implementation must be kept synchronized with func_dirname
+-# and func_basename. For efficiency, we do not delegate to
+-# those functions but instead duplicate the functionality here.
+-func_dirname_and_basename ()
+-{
+- case ${1} in
+- */*) func_dirname_result="${1%/*}${2}" ;;
+- * ) func_dirname_result="${3}" ;;
+- esac
+- func_basename_result="${1##*/}"
+-}
+
+-# func_stripname prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-func_stripname ()
+-{
+- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+- # positional parameters, so assign one to ordinary parameter first.
+- func_stripname_result=${3}
+- func_stripname_result=${func_stripname_result#"${1}"}
+- func_stripname_result=${func_stripname_result%"${2}"}
+-}
++# _LT_ENABLE_STATIC([DEFAULT])
++# ----------------------------
++# implement the --enable-static flag, and support the `static' and
++# `disable-static' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_STATIC],
++[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([static],
++ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
++ *)
++ enable_static=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_static=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
++
++ _LT_DECL([build_old_libs], [enable_static], [0],
++ [Whether or not to build static libraries])
++])# _LT_ENABLE_STATIC
++
++LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
++
++# Old names:
++AC_DEFUN([AC_ENABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
++])
+
+-# func_opt_split
+-func_opt_split ()
+-{
+- func_opt_split_opt=${1%%=*}
+- func_opt_split_arg=${1#*=}
+-}
++AC_DEFUN([AC_DISABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], [disable-static])
++])
+
+-# func_lo2o object
+-func_lo2o ()
+-{
+- case ${1} in
+- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+- *) func_lo2o_result=${1} ;;
+- esac
+-}
++AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+- func_xform_result=${1%.*}.lo
+-}
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_STATIC], [])
++dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=$(( $[*] ))
+-}
+
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+- func_len_result=${#1}
+-}
+
+-_LT_EOF
+- ;;
+- *) # Bourne compatible functions.
+- cat << \_LT_EOF >> "$cfgfile"
++# _LT_ENABLE_FAST_INSTALL([DEFAULT])
++# ----------------------------------
++# implement the --enable-fast-install flag, and support the `fast-install'
++# and `disable-fast-install' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_FAST_INSTALL],
++[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([fast-install],
++ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_fast_install=yes ;;
++ no) enable_fast_install=no ;;
++ *)
++ enable_fast_install=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_fast_install=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+- # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+- if test "X$func_dirname_result" = "X${1}"; then
+- func_dirname_result="${3}"
+- else
+- func_dirname_result="$func_dirname_result${2}"
+- fi
+-}
++_LT_DECL([fast_install], [enable_fast_install], [0],
++ [Whether or not to optimize for fast installation])dnl
++])# _LT_ENABLE_FAST_INSTALL
+
+-# func_basename file
+-func_basename ()
+-{
+- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+-}
++LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+-dnl func_dirname_and_basename
+-dnl A portable version of this function is already defined in general.m4sh
+-dnl so there is no need for it here.
++# Old names:
++AU_DEFUN([AC_ENABLE_FAST_INSTALL],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you put
++the `fast-install' option into LT_INIT's first parameter.])
++])
+
+-# func_stripname prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-# func_strip_suffix prefix name
+-func_stripname ()
+-{
+- case ${2} in
+- .*) func_stripname_result=`$ECHO "X${3}" \
+- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "X${3}" \
+- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+- esac
+-}
++AU_DEFUN([AC_DISABLE_FAST_INSTALL],
++[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you put
++the `disable-fast-install' option into LT_INIT's first parameter.])
++])
+
+-# sed scripts:
+-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+-my_sed_long_arg='1s/^-[[^=]]*=//'
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+-# func_opt_split
+-func_opt_split ()
+-{
+- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+-}
+
+-# func_lo2o object
+-func_lo2o ()
+-{
+- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+-}
++# _LT_WITH_PIC([MODE])
++# --------------------
++# implement the --with-pic flag, and support the `pic-only' and `no-pic'
++# LT_INIT options.
++# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
++m4_define([_LT_WITH_PIC],
++[AC_ARG_WITH([pic],
++ [AS_HELP_STRING([--with-pic],
++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++ [pic_mode="$withval"],
++ [pic_mode=default])
+
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+-}
++test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=`expr "$[@]"`
+-}
++_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
++])# _LT_WITH_PIC
+
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+-}
++LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+-_LT_EOF
+-esac
++# Old name:
++AU_DEFUN([AC_LIBTOOL_PICMODE],
++[_LT_SET_OPTION([LT_INIT], [pic-only])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `pic-only' option into LT_INIT's first parameter.])
++])
+
+-case $lt_shell_append in
+- yes)
+- cat << \_LT_EOF >> "$cfgfile"
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+- eval "$[1]+=\$[2]"
+-}
+-_LT_EOF
+- ;;
+- *)
+- cat << \_LT_EOF >> "$cfgfile"
+
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+- eval "$[1]=\$$[1]\$[2]"
+-}
++m4_define([_LTDL_MODE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
++ [m4_define([_LTDL_MODE], [nonrecursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [recursive],
++ [m4_define([_LTDL_MODE], [recursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [subproject],
++ [m4_define([_LTDL_MODE], [subproject])])
+
+-_LT_EOF
+- ;;
+- esac
+-])
++m4_define([_LTDL_TYPE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [installable],
++ [m4_define([_LTDL_TYPE], [installable])])
++LT_OPTION_DEFINE([LTDL_INIT], [convenience],
++ [m4_define([_LTDL_TYPE], [convenience])])
+
+-# Helper functions for option handling. -*- Autoconf -*-
++# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
--# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
@@ -2377,24 +3743,97 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
--# serial 5 ltsugar.m4
+-# serial 6 ltoptions.m4
+# serial 6 ltsugar.m4
# This is to help aclocal find these macros, as it can't see m4_define.
- AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-@@ -9001,14 +8549,14 @@
- # Produce a SEP delimited list of all paired combinations of elements of
- # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
- # has the form PREFIXmINFIXSUFFIXn.
+-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
++AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+-# ------------------------------------------
+-m4_define([_LT_MANGLE_OPTION],
+-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
++# lt_join(SEP, ARG1, [ARG2...])
++# -----------------------------
++# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
++# associated separator.
++# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
++# versions in m4sugar had bugs.
++m4_define([lt_join],
++[m4_if([$#], [1], [],
++ [$#], [2], [[$2]],
++ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
++m4_define([_lt_join],
++[m4_if([$#$2], [2], [],
++ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+-# ---------------------------------------
+-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+-# matching handler defined, dispatch to it. Other OPTION-NAMEs are
+-# saved as a flag.
+-m4_define([_LT_SET_OPTION],
+-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+- _LT_MANGLE_DEFUN([$1], [$2]),
+- [m4_warning([Unknown $1 option `$2'])])[]dnl
+-])
++# lt_car(LIST)
++# lt_cdr(LIST)
++# ------------
++# Manipulate m4 lists.
++# These macros are necessary as long as will still need to support
++# Autoconf-2.59 which quotes differently.
++m4_define([lt_car], [[$1]])
++m4_define([lt_cdr],
++[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
++ [$#], 1, [],
++ [m4_dquote(m4_shift($@))])])
++m4_define([lt_unquote], $1)
+
+
+-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+-# ------------------------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-m4_define([_LT_IF_OPTION],
+-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
++# lt_append(MACRO-NAME, STRING, [SEPARATOR])
++# ------------------------------------------
++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
++# Note that neither SEPARATOR nor STRING are expanded; they are appended
++# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
++# No SEPARATOR is output if MACRO-NAME was previously undefined (different
++# than defined and empty).
++#
++# This macro is needed until we can rely on Autoconf 2.62, since earlier
++# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
++m4_define([lt_append],
++[m4_define([$1],
++ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+-# -------------------------------------------------------
+-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+-# are set.
+-m4_define([_LT_UNLESS_OPTIONS],
+-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+- [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+- [m4_define([$0_found])])])[]dnl
+-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+-])[]dnl
+-])
+
++# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
++# ----------------------------------------------------------
++# Produce a SEP delimited list of all paired combinations of elements of
++# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
++# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
- m4_define([lt_combine],
--[m4_if([$2], [], [],
-- [m4_if([$4], [], [],
-- [lt_join(m4_quote(m4_default([$1], [[, ]])),
-- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
-- [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
-- [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
--])
++m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
@@ -2402,74 +3841,403 @@
+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
- # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-@@ -9071,15 +8619,15 @@
-
- # Generated from ltversion.in.
-
--# serial 2976 ltversion.m4
+-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+-# ----------------------------------------
+-# OPTION-LIST is a space-separated list of Libtool options associated
+-# with MACRO-NAME. If any OPTION has a matching handler declared with
+-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+-# the unknown option and exit.
+-m4_defun([_LT_SET_OPTIONS],
+-[# Set options
+-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+- [_LT_SET_OPTION([$1], _LT_Option)])
+
+-m4_if([$1],[LT_INIT],[
+- dnl
+- dnl Simply set some default values (i.e off) if boolean options were not
+- dnl specified:
+- _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+- ])
+- _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+- ])
+- dnl
+- dnl If no reference was made to various pairs of opposing options, then
+- dnl we run the default mode handler for the pair. For example, if neither
+- dnl `shared' nor `disable-shared' was passed, we enable building of shared
+- dnl archives by default:
+- _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+- _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+- _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+- _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+- [_LT_ENABLE_FAST_INSTALL])
+- ])
+-])# _LT_SET_OPTIONS
++# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
++# -----------------------------------------------------------------------
++# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
++# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
++m4_define([lt_if_append_uniq],
++[m4_ifdef([$1],
++ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
++ [lt_append([$1], [$2], [$3])$4],
++ [$5])],
++ [lt_append([$1], [$2], [$3])$4])])
+
+
++# lt_dict_add(DICT, KEY, VALUE)
++# -----------------------------
++m4_define([lt_dict_add],
++[m4_define([$1($2)], [$3])])
+
+-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+-# -----------------------------------------
+-m4_define([_LT_MANGLE_DEFUN],
+-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
++# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
++# --------------------------------------------
++m4_define([lt_dict_add_subkey],
++[m4_define([$1($2:$3)], [$4])])
+
+-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+-# -----------------------------------------------
+-m4_define([LT_OPTION_DEFINE],
+-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+-])# LT_OPTION_DEFINE
+
++# lt_dict_fetch(DICT, KEY, [SUBKEY])
++# ----------------------------------
++m4_define([lt_dict_fetch],
++[m4_ifval([$3],
++ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
++ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+-# dlopen
+-# ------
+-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
++
++# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
++# -----------------------------------------------------------------
++m4_define([lt_if_dict_fetch],
++[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
++ [$5],
++ [$6])])
++
++
++# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
++# --------------------------------------------------------------
++m4_define([lt_dict_filter],
++[m4_if([$5], [], [],
++ [lt_join(m4_quote(m4_default([$4], [[, ]])),
++ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
++ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+ ])
+
+-AU_DEFUN([AC_LIBTOOL_DLOPEN],
+-[_LT_SET_OPTION([LT_INIT], [dlopen])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the `dlopen' option into LT_INIT's first parameter.])
++# ltversion.m4 -- version numbers -*- Autoconf -*-
++#
++# Copyright (C) 2004 Free Software Foundation, Inc.
++# Written by Scott James Remnant, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++# Generated from ltversion.in.
++
+# serial 3017 ltversion.m4
- # This file is part of GNU Libtool
-
--m4_define([LT_PACKAGE_VERSION], [2.2.4])
--m4_define([LT_PACKAGE_REVISION], [1.2976])
++# This file is part of GNU Libtool
++
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
-
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.4'
--macro_revision='1.2976'
++
++AC_DEFUN([LTVERSION_VERSION],
+[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_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
++_LT_DECL(, macro_revision, 0)
])
-@@ -9254,857 +8802,1377 @@
- fi[]dnl
- ])# PKG_PROG_PKG_CONFIG
-
--# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
--#
--# Check to see whether a particular set of modules exists. Similar
--# to PKG_CHECK_MODULES(), but does not set variables or print errors.
--#
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
++# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
++#
++# 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 4 lt~obsolete.m4
+
+-# win32-dll
+-# ---------
+-# Declare package support for building win32 dll's.
+-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+-[enable_win32_dll=yes
++# These exist entirely to fool aclocal when bootstrapping libtool.
++#
++# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
++# which have later been changed to m4_define as they aren't part of the
++# exported API, or moved to Autoconf or Automake where they belong.
++#
++# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
++# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
++# using a macro with the same name in our local m4/libtool.m4 it'll
++# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
++# and doesn't know about Autoconf macros at all.)
++#
++# So we provide this file, which has a silly filename so it's always
++# included after everything else. This provides aclocal with the
++# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
++# because those macros already exist, or will be overwritten later.
++# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
++#
++# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
++# Yes, that means every name once taken will need to remain here until
++# we give up compatibility with versions before 1.7, at which point
++# we need to keep only those names which we still refer to.
+
+-case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+- AC_CHECK_TOOL(AS, as, false)
+- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+- AC_CHECK_TOOL(OBJDUMP, objdump, false)
+- ;;
+-esac
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
++
++m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
++m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
++m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
++m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
++m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
++m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
++m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
++m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
++m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
++m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
++m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
++m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
++m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
++m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
++m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
++m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
++m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
++m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
++m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
++m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
++m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
++m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
++m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
++m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
++m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
++m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
++m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
++m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
++m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
++m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
++m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
++m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
++m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
++m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
++m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
++m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
++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])])
++m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
++m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
++m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
++m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
++m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
++m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([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])])
+
+-test -z "$AS" && AS=as
+-_LT_DECL([], [AS], [0], [Assembler program])dnl
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
+
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
++dnl Authors:
++dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
++dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
+
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+-])# win32-dll
++AC_PREREQ([2.50])
+
+-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-_LT_SET_OPTION([LT_INIT], [win32-dll])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the `win32-dll' option into LT_INIT's first parameter.])
++AC_DEFUN([AM_NLS],
++[
++ AC_MSG_CHECKING([whether NLS is requested])
++ dnl Default is enabled NLS
++ AC_ARG_ENABLE([nls],
++ [ --disable-nls do not use Native Language Support],
++ USE_NLS=$enableval, USE_NLS=yes)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
++#
++# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
+
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+-# _LT_ENABLE_SHARED([DEFAULT])
+-# ----------------------------
+-# implement the --enable-shared flag, and supports the `shared' and
+-# `disable-shared' LT_INIT options.
+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+-m4_define([_LT_ENABLE_SHARED],
+-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+-AC_ARG_ENABLE([shared],
+- [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+- [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+- [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
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
+ fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac],
+- [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+-
+- _LT_DECL([build_libtool_libs], [enable_shared], [0],
+- [Whether or not to build shared libraries])
+-])# _LT_ENABLE_SHARED
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
+
+-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
-+#
-+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-+# this or PKG_CHECK_MODULES is called, or make sure to call
-+# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_ifval([$2], [$2], [:])
++ m4_default([$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
-+
-+
+
+-# Old names:
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+-])
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
++[if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ else
++ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
-+
+
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[_LT_SET_OPTION([LT_INIT], [disable-shared])
+-])
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
@@ -2480,8 +4248,13 @@
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
+
+-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
@@ -2496,63 +4269,136 @@
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
-+
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
+
+-# _LT_ENABLE_STATIC([DEFAULT])
+-# ----------------------------
+-# implement the --enable-static flag, and support the `static' and
+-# `disable-static' LT_INIT options.
+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+-m4_define([_LT_ENABLE_STATIC],
+-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+-AC_ARG_ENABLE([static],
+- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+- [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+- [p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_static=yes ;;
+- no) enable_static=no ;;
+- *)
+- enable_static=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_static=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac],
+- [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
-+
+
+- _LT_DECL([build_old_libs], [enable_static], [0],
+- [Whether or not to build static libraries])
+-])# _LT_ENABLE_STATIC
+if test $pkg_failed = yes; then
++ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
+
+-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
++ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
-+
+
+-# Old names:
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+-])
+$$1_PKG_ERRORS
-+
+
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[_LT_SET_OPTION([LT_INIT], [disable-static])
+-])
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
-+
-+_PKG_TEXT
-+])],
-+ [AC_MSG_RESULT([no])
-+ $4])
+
+-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++_PKG_TEXT])dnl
++ ])
+elif test $pkg_failed = untried; then
-+ ifelse([$4], , [AC_MSG_FAILURE(dnl
++ AC_MSG_RESULT([no])
++ m4_default([$4], [AC_MSG_FAILURE(
+[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.
-+
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+_PKG_TEXT
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-+ [$4])
+
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++ ])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
-+ ifelse([$3], , :, [$3])
++ $3
+fi[]dnl
+])# PKG_CHECK_MODULES
-+
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-+
+
+-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+-# ----------------------------------
+-# implement the --enable-fast-install flag, and support the `fast-install'
+-# and `disable-fast-install' LT_INIT options.
+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+-m4_define([_LT_ENABLE_FAST_INSTALL],
+-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+-AC_ARG_ENABLE([fast-install],
+- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+- [p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_fast_install=yes ;;
+- no) enable_fast_install=no ;;
+- *)
+- enable_fast_install=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_fast_install=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac],
+- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -2565,14 +4411,19 @@
+m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
-+
+
+-_LT_DECL([fast_install], [enable_fast_install], [0],
+- [Whether or not to optimize for fast installation])dnl
+-])# _LT_ENABLE_FAST_INSTALL
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
-+
+
+-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
@@ -2582,15 +4433,31 @@
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-+
+
+-# Old names:
+-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+-the `fast-install' option into LT_INIT's first parameter.])
+-])
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-+
+
+-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+-the `disable-fast-install' option into LT_INIT's first parameter.])
+-])
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-+
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -2628,26 +4495,48 @@
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
-+
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
-+
-+
+
+-# _LT_WITH_PIC([MODE])
+-# --------------------
+-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+-# LT_INIT options.
+-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+-m4_define([_LT_WITH_PIC],
+-[AC_ARG_WITH([pic],
+- [AS_HELP_STRING([--with-pic],
+- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+- [pic_mode="$withval"],
+- [pic_mode=default])
+
+-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-+
+
+-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+-])# _LT_WITH_PIC
+# serial 4
-+
+
+-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+# This was merged into AC_PROG_CC in Autoconf.
-+
+
+-# Old name:
+-AU_DEFUN([AC_LIBTOOL_PICMODE],
+-[_LT_SET_OPTION([LT_INIT], [pic-only])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the `pic-only' option into LT_INIT's first parameter.])
+AU_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+AC_DIAGNOSE([obsolete], [$0:
@@ -2656,43 +4545,34 @@
+ you adjust the code. You can also remove the above call to
+ AC_PROG_CC if you already called it elsewhere.])
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-+])
+ ])
+AU_DEFUN([fp_PROG_CC_STDC])
-+
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+# AM_CONDITIONAL -*- Autoconf -*-
-+
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
- #
--# Similar to PKG_CHECK_MODULES, make sure that the first instance of
--# this or PKG_CHECK_MODULES is called, or make sure to call
--# PKG_CHECK_EXISTS manually
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_EXISTS],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--if test -n "$PKG_CONFIG" && \
-- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-- m4_ifval([$2], [$2], [:])
--m4_ifvaln([$3], [else
-- $3])dnl
--fi])
++#
+# 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.
+-m4_define([_LTDL_MODE], [])
+-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+- [m4_define([_LTDL_MODE], [nonrecursive])])
+-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+- [m4_define([_LTDL_MODE], [recursive])])
+-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+- [m4_define([_LTDL_MODE], [subproject])])
+# serial 9
--# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
--# ---------------------------------------------
--m4_define([_PKG_CONFIG],
--[if test -n "$PKG_CONFIG"; then
-- if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- else
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- fi
+-m4_define([_LTDL_TYPE], [])
+-LT_OPTION_DEFINE([LTDL_INIT], [installable],
+- [m4_define([_LTDL_TYPE], [installable])])
+-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+- [m4_define([_LTDL_TYPE], [convenience])])
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
@@ -2708,10 +4588,7 @@
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
- else
-- pkg_failed=untried
--fi[]dnl
--])# _PKG_CONFIG
++else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
@@ -2721,51 +4598,79 @@
+Usually this means the macro was only invoked conditionally.]])
+fi])])
--# _PKG_SHORT_ERRORS_SUPPORTED
--# -----------------------------
--AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi[]dnl
--])# _PKG_SHORT_ERRORS_SUPPORTED
+-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+-#
+-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+-# Written by Gary V. Vaughan, 2004
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
-+#
+ #
+-# This file is free software; the Free Software Foundation gives
+-# unlimited permission to copy and/or distribute it, with or without
+-# modifications, as long as this notice is preserved.
+-
+-# serial 6 ltsugar.m4
+-
+-# This is to help aclocal find these macros, as it can't see m4_define.
+-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+-
+-
+-# lt_join(SEP, ARG1, [ARG2...])
+-# -----------------------------
+-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+-# associated separator.
+-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+-# versions in m4sugar had bugs.
+-m4_define([lt_join],
+-[m4_if([$#], [1], [],
+- [$#], [2], [[$2]],
+- [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+-m4_define([_lt_join],
+-[m4_if([$#$2], [2], [],
+- [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 10
--# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
--# [ACTION-IF-NOT-FOUND])
--#
--#
--# Note that if there is a possibility the first call to
--# PKG_CHECK_MODULES might not happen, you should be sure to include an
--# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
--#
+-# lt_car(LIST)
+-# lt_cdr(LIST)
+-# ------------
+-# Manipulate m4 lists.
+-# These macros are necessary as long as will still need to support
+-# Autoconf-2.59 which quotes differently.
+-m4_define([lt_car], [[$1]])
+-m4_define([lt_cdr],
+-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+- [$#], 1, [],
+- [m4_dquote(m4_shift($@))])])
+-m4_define([lt_unquote], $1)
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
+
+
+-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+-# ------------------------------------------
+-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+-# Note that neither SEPARATOR nor STRING are expanded; they are appended
+-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+-# than defined and empty).
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
#
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_MODULES],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
--AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+-# This macro is needed until we can rely on Autoconf 2.62, since earlier
+-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+-m4_define([lt_append],
+-[m4_define([$1],
+- m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
@@ -2776,8 +4681,6 @@
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
--pkg_failed=no
--AC_MSG_CHECKING([for $1])
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
@@ -2785,8 +4688,6 @@
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
--_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
--_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -2808,9 +4709,19 @@
+ # directory.
+ mkdir sub
--m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
--and $1[]_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.])
+-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+-# ----------------------------------------------------------
+-# Produce a SEP delimited list of all paired combinations of elements of
+-# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
+-# has the form PREFIXmINFIXSUFFIXn.
+-# Needed until we can rely on m4_combine added in Autoconf 2.62.
+-m4_define([lt_combine],
+-[m4_if(m4_eval([$# > 3]), [1],
+- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+-[[m4_foreach([_Lt_prefix], [$2],
+- [m4_foreach([_Lt_suffix],
+- ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+- [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
@@ -2824,7 +4735,7 @@
+ [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
@@ -2841,7 +4752,17 @@
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
+
+-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+-# -----------------------------------------------------------------------
+-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+-m4_define([lt_if_append_uniq],
+-[m4_ifdef([$1],
+- [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+- [lt_append([$1], [$2], [$3])$4],
+- [$5])],
+- [lt_append([$1], [$2], [$3])$4])])
+ # 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
@@ -2894,7 +4815,7 @@
+ fi
+ fi
+ done
-+
+
+ cd ..
+ rm -rf conftest.dir
+else
@@ -2906,8 +4827,12 @@
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
-+
-+
+
+-# lt_dict_add(DICT, KEY, VALUE)
+-# -----------------------------
+-m4_define([lt_dict_add],
+-[m4_define([$1($2)], [$3])])
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
@@ -2917,18 +4842,11 @@
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
--if test $pkg_failed = yes; then
-- _PKG_SHORT_ERRORS_SUPPORTED
-- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-- ifelse([$4], , [AC_MSG_ERROR(dnl
--[Package requirements ($2) were not met:
+-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+-# --------------------------------------------
+-m4_define([lt_dict_add_subkey],
+-[m4_define([$1($2:$3)], [$4])])
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
@@ -2944,11 +4862,14 @@
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
--$$1_PKG_ERRORS
+-# lt_dict_fetch(DICT, KEY, [SUBKEY])
+-# ----------------------------------
+-m4_define([lt_dict_fetch],
+-[m4_ifval([$3],
+- m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+- m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+# Generate code to set up dependency tracking. -*- Autoconf -*-
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
@@ -2956,18 +4877,14 @@
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
--_PKG_TEXT
--])],
-- [AC_MSG_RESULT([no])
-- $4])
--elif test $pkg_failed = untried; then
-- ifelse([$4], , [AC_MSG_FAILURE(dnl
--[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.
+-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+-# -----------------------------------------------------------------
+-m4_define([lt_if_dict_fetch],
+-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+- [$5],
+- [$6])])
+#serial 5
--_PKG_TEXT
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -3023,46 +4940,26 @@
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-- [$4])
--else
-- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-- AC_MSG_RESULT([yes])
-- ifelse([$3], , :, [$3])
--fi[]dnl
--])# PKG_CHECK_MODULES
-
--# Copyright (C) 1995-2002 Free Software Foundation, Inc.
--# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+-# --------------------------------------------------------------
+-m4_define([lt_dict_filter],
+-[m4_if([$5], [], [],
+- [lt_join(m4_quote(m4_default([$4], [[, ]])),
+- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+- [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+-])
+
+-# ltversion.m4 -- version numbers -*- Autoconf -*-
-#
--# This file is free software, distributed under the terms of the GNU
--# General Public License. As a special exception to the GNU General
--# Public License, this file may be distributed as part of a program
--# that contains a configuration script generated by Autoconf, under
--# the same distribution terms as the rest of that program.
--#
--# This file can be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU Public License
--# but which still want to provide support for the GNU gettext functionality.
--#
--# Macro to add for using GNU gettext.
--# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
--#
--# Modified to never use included libintl.
--# Owen Taylor <otaylor at redhat.com>, 12/15/1998
--#
--# Major rework to remove unused code
--# Owen Taylor <otaylor at redhat.com>, 12/11/2002
--#
--# Added better handling of ALL_LINGUAS from GNU gettext version
--# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+-# Copyright (C) 2004 Free Software Foundation, Inc.
+-# Written by Scott James Remnant, 2004
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
#
--# Modified to require ngettext
--# Matthias Clasen <mclasen at redhat.com> 08/06/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.
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
@@ -3071,85 +4968,40 @@
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
-+
+
+-# Generated from ltversion.in.
+# Do all the work for Automake. -*- Autoconf -*-
-+
+
+-# serial 3017 ltversion.m4
+-# This file is part of GNU Libtool
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
- #
--# We need this here as well, since someone might use autoconf-2.5x
--# to configure GLib then an older version to configure a package
--# using AM_GLIB_GNU_GETTEXT
--AC_PREREQ(2.53)
++#
+# 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.
--dnl
--dnl We go to great lengths to make sure that aclocal won't
--dnl try to pull in the installed version of these macros
--dnl when running aclocal in the glib directory.
--dnl
--m4_copy([AC_DEFUN],[glib_DEFUN])
--m4_copy([AC_REQUIRE],[glib_REQUIRE])
--dnl
--dnl At the end, if we're not within glib, we'll define the public
--dnl definitions in terms of our private definitions.
--dnl
+-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+-m4_define([LT_PACKAGE_REVISION], [1.3017])
+# serial 16
--# GLIB_LC_MESSAGES
--#--------------------
--glib_DEFUN([GLIB_LC_MESSAGES],
-- [AC_CHECK_HEADERS([locale.h])
-- if test $ac_cv_header_locale_h = yes; then
-- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-- if test $am_cv_val_LC_MESSAGES = yes; then
-- AC_DEFINE(HAVE_LC_MESSAGES, 1,
-- [Define if your <locale.h> file defines LC_MESSAGES.])
-- fi
-- fi])
+-AC_DEFUN([LTVERSION_VERSION],
+-[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)
+-])
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
--# GLIB_PATH_PROG_WITH_TEST
--#----------------------------
--dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
--dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
--glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
--[# Extract the first word of "$2", so it can be a program name with args.
--set dummy $2; ac_word=[$]2
--AC_MSG_CHECKING([for $ac_word])
--AC_CACHE_VAL(ac_cv_path_$1,
--[case "[$]$1" in
-- /*)
-- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in ifelse([$5], , $PATH, [$5]); do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if [$3]; then
-- ac_cv_path_$1="$ac_dir/$ac_word"
-- break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
--dnl If no 4th arg is given, leave the cache variable unset,
--dnl so AC_PATH_PROGS will keep looking.
--ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
--])dnl
-- ;;
--esac])dnl
--$1="$ac_cv_path_$1"
--if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-- AC_MSG_RESULT([$]$1)
--else
-- AC_MSG_RESULT(no)
+-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+-#
+-# 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.
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
@@ -3177,7 +5029,8 @@
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+fi
-+
+
+-# serial 4 lt~obsolete.m4
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
@@ -3185,17 +5038,31 @@
+ else
+ CYGPATH_W=echo
+ fi
- fi
--AC_SUBST($1)dnl
--])
++fi
+AC_SUBST([CYGPATH_W])
--# GLIB_WITH_NLS
--#-----------------
--glib_DEFUN([GLIB_WITH_NLS],
-- dnl NLS is obligatory
-- [USE_NLS=yes
-- AC_SUBST(USE_NLS)
+-# These exist entirely to fool aclocal when bootstrapping libtool.
+-#
+-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+-# which have later been changed to m4_define as they aren't part of the
+-# exported API, or moved to Autoconf or Automake where they belong.
+-#
+-# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
+-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+-# using a macro with the same name in our local m4/libtool.m4 it'll
+-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+-# and doesn't know about Autoconf macros at all.)
+-#
+-# So we provide this file, which has a silly filename so it's always
+-# included after everything else. This provides aclocal with the
+-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+-# because those macros already exist, or will be overwritten later.
+-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+-#
+-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+-# Yes, that means every name once taken will need to remain here until
+-# we give up compatibility with versions before 1.7, at which point
+-# we need to keep only those names which we still refer to.
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
@@ -3209,14 +5076,67 @@
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-- gt_cv_have_gettext=no
+-# This is to help aclocal find these macros, as it can't see m4_define.
+-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-- CATOBJEXT=NONE
-- XGETTEXT=:
-- INTLLIBS=
+-m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
+-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+-m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
+-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+-m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
+-m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
+-m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+-m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
+-m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
+-m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
+-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+-m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+-m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
+-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+-m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
+-m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
+-m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+-m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+-m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
+-m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
+-m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
+-m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+-m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+-m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
+-m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
+-m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+-m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
+-m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+-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])])
+-m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+-m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([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])])
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
@@ -3259,14 +5179,548 @@
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
-- AC_CHECK_HEADER(libintl.h,
-- [gt_cv_func_dgettext_libintl="no"
-- libintl_extra_libs=""
+-# nls.m4 serial 3 (gettext-0.15)
+-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-dnl
+-dnl This file can can be used in projects which are not available under
+-dnl the GNU General Public License or the GNU Library General Public
+-dnl License but which still want to provide support for the GNU gettext
+-dnl functionality.
+-dnl Please note that the actual code of the GNU gettext library is covered
+-dnl by the GNU Library General Public License, and the rest of the GNU
+-dnl gettext package package is covered by the GNU General Public License.
+-dnl They are *not* in the public domain.
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+-dnl Authors:
+-dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+-dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated. The stamp files are numbered to have different names.
+
+-AC_DEFUN([AM_NLS],
+-[
+- AC_MSG_CHECKING([whether NLS is requested])
+- dnl Default is enabled NLS
+- AC_ARG_ENABLE(nls,
+- [ --disable-nls do not use Native Language Support],
+- USE_NLS=$enableval, USE_NLS=yes)
+- AC_MSG_RESULT($USE_NLS)
+- AC_SUBST(USE_NLS)
+-])
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_arg=$1
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++ case $_am_header in
++ $_am_arg | $_am_arg:* )
++ break ;;
++ * )
++ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++ esac
++done
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+-#
+-# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+ #
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
++# This file is 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.
+
+-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+-# ----------------------------------
+-AC_DEFUN([PKG_PROG_PKG_CONFIG],
+-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++if test x"${install_sh}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++ *)
++ install_sh="\${SHELL} $am_aux_dir/install-sh"
++ esac
+ fi
+-if test -n "$PKG_CONFIG"; then
+- _pkg_min_version=m4_default([$1], [0.9.0])
+- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_RESULT([no])
+- PKG_CONFIG=""
+- fi
+-
+-fi[]dnl
+-])# PKG_PROG_PKG_CONFIG
++AC_SUBST(install_sh)])
+
+-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+-#
+-# Check to see whether a particular set of modules exists. Similar
+-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+-#
++# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+ #
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
+-# --------------------------------------------------------------
+-AC_DEFUN([PKG_CHECK_EXISTS],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+-if test -n "$PKG_CONFIG" && \
+- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_ifval([$2], [$2], [:])
+-m4_ifvaln([$3], [else
+- $3])dnl
+-fi])
+-
++# 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.
+
+-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+-# ---------------------------------------------
+-m4_define([_PKG_CONFIG],
+-[if test -n "$$1"; then
+- pkg_cv_[]$1="$$1"
+- elif test -n "$PKG_CONFIG"; then
+- PKG_CHECK_EXISTS([$3],
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+- [pkg_failed=yes])
+- else
+- pkg_failed=untried
+-fi[]dnl
+-])# _PKG_CONFIG
++# serial 2
+
+-# _PKG_SHORT_ERRORS_SUPPORTED
+-# -----------------------------
+-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
++# Check whether the underlying file-system supports filenames
++# with a leading dot. For instance MS-DOS doesn't.
++AC_DEFUN([AM_SET_LEADING_DOT],
++[rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++ am__leading_dot=.
+ else
+- _pkg_short_errors_supported=no
+-fi[]dnl
+-])# _PKG_SHORT_ERRORS_SUPPORTED
++ am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
+
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
+
+-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+-# [ACTION-IF-NOT-FOUND])
+-#
+-#
+-# Note that if there is a possibility the first call to
+-# PKG_CHECK_MODULES might not happen, you should be sure to include an
+-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+-#
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
+ #
+-# --------------------------------------------------------------
+-AC_DEFUN([PKG_CHECK_MODULES],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+-
+-pkg_failed=no
+-AC_MSG_CHECKING([for $1])
+-
+-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+-
+-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+-and $1[]_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.])
++# 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.
+
+-if test $pkg_failed = yes; then
+- _PKG_SHORT_ERRORS_SUPPORTED
+- if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+- else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++# serial 5
+
+- ifelse([$4], , [AC_MSG_ERROR(dnl
+-[Package requirements ($2) were not met:
++# AM_MAINTAINER_MODE([DEFAULT-MODE])
++# ----------------------------------
++# Control maintainer-specific portions of Makefiles.
++# Default is to disable them, unless `enable' is passed literally.
++# For symmetry, `disable' may be passed as well. Anyway, the user
++# can override the default with the --enable/--disable switch.
++AC_DEFUN([AM_MAINTAINER_MODE],
++[m4_case(m4_default([$1], [disable]),
++ [enable], [m4_define([am_maintainer_other], [disable])],
++ [disable], [m4_define([am_maintainer_other], [enable])],
++ [m4_define([am_maintainer_other], [enable])
++ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
++ AC_ARG_ENABLE([maintainer-mode],
++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ [USE_MAINTAINER_MODE=$enableval],
++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST([MAINT])dnl
++]
++)
+
+-$$1_PKG_ERRORS
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
++# Check to see how 'make' treats includes. -*- Autoconf -*-
+
+-_PKG_TEXT
+-])],
+- [AC_MSG_RESULT([no])
+- $4])
+-elif test $pkg_failed = untried; then
+- ifelse([$4], , [AC_MSG_FAILURE(dnl
+-[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.
++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-_PKG_TEXT
++# serial 4
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+- [$4])
+-else
+- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+- AC_MSG_RESULT([yes])
+- ifelse([$3], , :, [$3])
+-fi[]dnl
+-])# PKG_CHECK_MODULES
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++ @echo this is the am__doit target
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++ am__include=include
++ am__quote=
++ _am_result=GNU
++ ;;
++esac
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++ echo '.include "confinc"' > confmf
++ case `$am_make -s -f confmf 2> /dev/null` in #(
++ *the\ am__doit\ target*)
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ ;;
++ esac
++fi
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
++])
+
+-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+-#
+-# This file is free software, distributed under the terms of the GNU
+-# General Public License. As a special exception to the GNU General
+-# Public License, this file may be distributed as part of a program
+-# that contains a configuration script generated by Autoconf, under
+-# the same distribution terms as the rest of that program.
+-#
+-# This file can be copied and used freely without restrictions. It can
+-# be used in projects which are not available under the GNU Public License
+-# but which still want to provide support for the GNU gettext functionality.
+-#
+-# Macro to add for using GNU gettext.
+-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
+-#
+-# Modified to never use included libintl.
+-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+-#
+-# Major rework to remove unused code
+-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+-#
+-# Added better handling of ALL_LINGUAS from GNU gettext version
+-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
+ #
+-# Modified to require ngettext
+-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 6
++
++# AM_PROG_CC_C_O
++# --------------
++# Like AC_PROG_CC_C_O, but changed for automake.
++AC_DEFUN([AM_PROG_CC_C_O],
++[AC_REQUIRE([AC_PROG_CC_C_O])dnl
++AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([compile])dnl
++# FIXME: we rely on the cache variable name because
++# there is no other way.
++set dummy $CC
++am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++ # A longer-term fix would be to have automake use am__CC in this case,
++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++ CC="$am_aux_dir/compile $CC"
++fi
++dnl Make sure AC_PROG_CC is never called again, or it will override our
++dnl setting of CC.
++m4_define([AC_PROG_CC],
++ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
++])
++
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
++
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
+ #
+-# We need this here as well, since someone might use autoconf-2.5x
+-# to configure GLib then an older version to configure a package
+-# using AM_GLIB_GNU_GETTEXT
+-AC_PREREQ(2.53)
++# 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.
+
+-dnl
+-dnl We go to great lengths to make sure that aclocal won't
+-dnl try to pull in the installed version of these macros
+-dnl when running aclocal in the glib directory.
+-dnl
+-m4_copy([AC_DEFUN],[glib_DEFUN])
+-m4_copy([AC_REQUIRE],[glib_REQUIRE])
+-dnl
+-dnl At the end, if we're not within glib, we'll define the public
+-dnl definitions in terms of our private definitions.
+-dnl
++# serial 6
+
+-# GLIB_LC_MESSAGES
+-#--------------------
+-glib_DEFUN([GLIB_LC_MESSAGES],
+- [AC_CHECK_HEADERS([locale.h])
+- if test $ac_cv_header_locale_h = yes; then
+- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+- if test $am_cv_val_LC_MESSAGES = yes; then
+- AC_DEFINE(HAVE_LC_MESSAGES, 1,
+- [Define if your <locale.h> file defines LC_MESSAGES.])
+- fi
+- fi])
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
+
+-# GLIB_PATH_PROG_WITH_TEST
+-#----------------------------
+-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+-[# Extract the first word of "$2", so it can be a program name with args.
+-set dummy $2; ac_word=[$]2
+-AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
+-[case "[$]$1" in
+- /*)
+- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+- ;;
++
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
++if test x"${MISSING+set}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in ifelse([$5], , $PATH, [$5]); do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- if [$3]; then
+- ac_cv_path_$1="$ac_dir/$ac_word"
+- break
+- fi
+- fi
+- done
+- IFS="$ac_save_ifs"
+-dnl If no 4th arg is given, leave the cache variable unset,
+-dnl so AC_PATH_PROGS will keep looking.
+-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+-])dnl
+- ;;
+-esac])dnl
+-$1="$ac_cv_path_$1"
+-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+- AC_MSG_RESULT([$]$1)
++ MISSING="\${SHELL} $am_aux_dir/missing" ;;
++ esac
++fi
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++ am_missing_run="$MISSING --run "
+ else
+- AC_MSG_RESULT(no)
++ am_missing_run=
++ AC_MSG_WARN([`missing' script is too old or missing])
+ fi
+-AC_SUBST($1)dnl
+ ])
+
+-# GLIB_WITH_NLS
+-#-----------------
+-glib_DEFUN([GLIB_WITH_NLS],
+- dnl NLS is obligatory
+- [USE_NLS=yes
+- AC_SUBST(USE_NLS)
++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- gt_cv_have_gettext=no
++# AM_PROG_MKDIR_P
++# ---------------
++# Check for `mkdir -p'.
++AC_DEFUN([AM_PROG_MKDIR_P],
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++ [[\\/$]]* | ?:[[\\/]]*) ;;
++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
++
++# Helper functions for option handling. -*- Autoconf -*-
+
+- CATOBJEXT=NONE
+- XGETTEXT=:
+- INTLLIBS=
++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- AC_CHECK_HEADER(libintl.h,
+- [gt_cv_func_dgettext_libintl="no"
+- libintl_extra_libs=""
++# serial 4
- #
- # First check in libc
@@ -3294,6 +5748,10 @@
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
- #
- # If we don't have everything we want, check in libintl
@@ -3306,9 +5764,11 @@
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated. The stamp files are numbered to have different names.
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME. Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
@@ -3320,22 +5780,11 @@
- :,-liconv)],
- :,-liconv)
- fi
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_arg=$1
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+ case $_am_header in
-+ $_am_arg | $_am_arg:* )
-+ break ;;
-+ * )
-+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+ esac
-+done
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
@@ -3348,11 +5797,11 @@
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
-+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
@@ -3364,20 +5813,12 @@
- fi
- fi
- fi
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+if test x"${install_sh}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+ *)
-+ install_sh="\${SHELL} $am_aux_dir/install-sh"
-+ esac
-+fi
-+AC_SUBST(install_sh)])
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -3443,456 +5884,6 @@
- fi
- fi
- ])
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot. For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+ am__leading_dot=.
-+else
-+ am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-
-- if test "$gt_cv_have_gettext" = "yes" ; then
-- AC_DEFINE(ENABLE_NLS, 1,
-- [always defined to indicate that i18n is enabled])
-- fi
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
-
-- dnl Test whether we really found GNU xgettext.
-- if test "$XGETTEXT" != ":"; then
-- dnl If it is not GNU xgettext we define it as : so that the
-- dnl Makefiles still can work.
-- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-- : ;
-- else
-- AC_MSG_RESULT(
-- [found xgettext program is not GNU xgettext; ignore it])
-- XGETTEXT=":"
-- fi
-- fi
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- # We need to process the po/ directory.
-- POSUB=po
-+# serial 5
-
-- AC_OUTPUT_COMMANDS(
-- [case "$CONFIG_FILES" in *po/Makefile.in*)
-- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-- esac])
-+# AM_MAINTAINER_MODE([DEFAULT-MODE])
-+# ----------------------------------
-+# Control maintainer-specific portions of Makefiles.
-+# Default is to disable them, unless `enable' is passed literally.
-+# For symmetry, `disable' may be passed as well. Anyway, the user
-+# can override the default with the --enable/--disable switch.
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[m4_case(m4_default([$1], [disable]),
-+ [enable], [m4_define([am_maintainer_other], [disable])],
-+ [disable], [m4_define([am_maintainer_other], [enable])],
-+ [m4_define([am_maintainer_other], [enable])
-+ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
-+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-+ AC_ARG_ENABLE([maintainer-mode],
-+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ [USE_MAINTAINER_MODE=$enableval],
-+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST([MAINT])dnl
-+]
-+)
-
-- dnl These rules are solely for the distribution goal. While doing this
-- dnl we only have to keep exactly one list of the available catalogs
-- dnl in configure.in.
-- for lang in $ALL_LINGUAS; do
-- GMOFILES="$GMOFILES $lang.gmo"
-- POFILES="$POFILES $lang.po"
-- done
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-- dnl Make all variables we use known to autoconf.
-- AC_SUBST(CATALOGS)
-- AC_SUBST(CATOBJEXT)
-- AC_SUBST(DATADIRNAME)
-- AC_SUBST(GMOFILES)
-- AC_SUBST(INSTOBJEXT)
-- AC_SUBST(INTLLIBS)
-- AC_SUBST(PO_IN_DATADIR_TRUE)
-- AC_SUBST(PO_IN_DATADIR_FALSE)
-- AC_SUBST(POFILES)
-- AC_SUBST(POSUB)
-- ])
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-
--# AM_GLIB_GNU_GETTEXT
--# -------------------
--# Do checks necessary for use of gettext. If a suitable implementation
--# of gettext is found in either in libintl or in the C library,
--# it will set INTLLIBS to the libraries needed for use of gettext
--# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
--# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
--# on various variables needed by the Makefile.in.in installed by
--# glib-gettextize.
--dnl
--glib_DEFUN([GLIB_GNU_GETTEXT],
-- [AC_REQUIRE([AC_PROG_CC])dnl
-- AC_REQUIRE([AC_HEADER_STDC])dnl
--
-- GLIB_LC_MESSAGES
-- GLIB_WITH_NLS
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- if test "$gt_cv_have_gettext" = "yes"; then
-- if test "x$ALL_LINGUAS" = "x"; then
-- LINGUAS=
-- else
-- AC_MSG_CHECKING(for catalogs to be installed)
-- NEW_LINGUAS=
-- for presentlang in $ALL_LINGUAS; do
-- useit=no
-- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-- desiredlanguages="$LINGUAS"
-- else
-- desiredlanguages="$ALL_LINGUAS"
-- fi
-- for desiredlang in $desiredlanguages; do
-- # Use the presentlang catalog if desiredlang is
-- # a. equal to presentlang, or
-- # b. a variant of presentlang (because in this case,
-- # presentlang can be used as a fallback for messages
-- # which are not translated in the desiredlang catalog).
-- case "$desiredlang" in
-- "$presentlang"*) useit=yes;;
-- esac
-- done
-- if test $useit = yes; then
-- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-- fi
-- done
-- LINGUAS=$NEW_LINGUAS
-- AC_MSG_RESULT($LINGUAS)
-- fi
-+# serial 4
-
-- dnl Construct list of names of catalog files to be constructed.
-- if test -n "$LINGUAS"; then
-- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-- fi
-- fi
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+ @echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+ ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+ echo '.include "confinc"' > confmf
-+ case `$am_make -s -f confmf 2> /dev/null` in #(
-+ *the\ am__doit\ target*)
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ ;;
-+ esac
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-
-- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-- dnl Try to locate is.
-- MKINSTALLDIRS=
-- if test -n "$ac_aux_dir"; then
-- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-- fi
-- if test -z "$MKINSTALLDIRS"; then
-- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-- fi
-- AC_SUBST(MKINSTALLDIRS)
-+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- dnl Generate list of files to be processed by xgettext which will
-- dnl be included in po/Makefile.
-- test -d po || mkdir po
-- if test "x$srcdir" != "x."; then
-- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-- posrcprefix="$srcdir/"
-- else
-- posrcprefix="../$srcdir/"
-- fi
-- else
-- posrcprefix="../"
-- fi
-- rm -f po/POTFILES
-- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-- < $srcdir/po/POTFILES.in > po/POTFILES
-- ])
-+# serial 6
-+
-+# AM_PROG_CC_C_O
-+# --------------
-+# Like AC_PROG_CC_C_O, but changed for automake.
-+AC_DEFUN([AM_PROG_CC_C_O],
-+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([compile])dnl
-+# FIXME: we rely on the cache variable name because
-+# there is no other way.
-+set dummy $CC
-+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-+if test "$am_t" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+ # A longer-term fix would be to have automake use am__CC in this case,
-+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+ CC="$am_aux_dir/compile $CC"
-+fi
-+dnl Make sure AC_PROG_CC is never called again, or it will override our
-+dnl setting of CC.
-+m4_define([AC_PROG_CC],
-+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-+])
-+
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
--# -------------------------------
--# Define VARIABLE to the location where catalog files will
--# be installed by po/Makefile.
--glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
--[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
--glib_save_prefix="$prefix"
--glib_save_exec_prefix="$exec_prefix"
--glib_save_datarootdir="$datarootdir"
--test "x$prefix" = xNONE && prefix=$ac_default_prefix
--test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--datarootdir=`eval echo "${datarootdir}"`
--if test "x$CATOBJEXT" = "x.mo" ; then
-- localedir=`eval echo "${libdir}/locale"`
-+# serial 6
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+if test x"${MISSING+set}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+ *)
-+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+ esac
-+fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+ am_missing_run="$MISSING --run "
- else
-- localedir=`eval echo "${datadir}/locale"`
-+ am_missing_run=
-+ AC_MSG_WARN([`missing' script is too old or missing])
- fi
--prefix="$glib_save_prefix"
--exec_prefix="$glib_save_exec_prefix"
--datarootdir="$glib_save_datarootdir"
--AC_DEFINE_UNQUOTED($1, "$localedir",
-- [Define the location where the catalogs will be installed])
- ])
-
--dnl
--dnl Now the definitions that aclocal will find
--dnl
--ifdef(glib_configure_in,[],[
--AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
--AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
--])dnl
-+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
--#
--# Create a temporary file with TEST-FILE as its contents and pass the
--# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
--# 0 and perform ACTION-IF-FAIL for any other exit status.
--AC_DEFUN([GLIB_RUN_PROG],
--[cat >conftest.foo <<_ACEOF
--$2
--_ACEOF
--if AC_RUN_LOG([$1 conftest.foo]); then
-- m4_ifval([$3], [$3], [:])
--m4_ifvaln([$4], [else $4])dnl
--echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
--sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
--fi])
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check for `mkdir -p'.
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+ [[\\/$]]* | ?:[[\\/]]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
-
-+# Helper functions for option handling. -*- Autoconf -*-
-
--# gnome-common.m4
--#
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--dnl GNOME_COMMON_INIT
-+# serial 4
-
--AC_DEFUN([GNOME_COMMON_INIT],
--[
-- dnl this macro should come after AC_CONFIG_MACRO_DIR
-- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-- dnl ensure that when the Automake generated makefile calls aclocal,
-- dnl it honours the $ACLOCAL_FLAGS environment variable
-- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-- if test -n "$ac_macro_dir"; then
-- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-- fi
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME. Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-- AC_SUBST([ACLOCAL_AMFLAGS])
--])
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
--AC_DEFUN([GNOME_DEBUG_CHECK],
--[
-- AC_ARG_ENABLE([debug],
-- AC_HELP_STRING([--enable-debug],
-- [turn on debugging]),,
-- [enable_debug=no])
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-- if test x$enable_debug = xyes ; then
-- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-- [Enable additional debugging at the expense of performance and size])
-- fi
--])
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--dnl GNOME_MAINTAINER_MODE_DEFINES ()
--dnl define DISABLE_DEPRECATED
--dnl
--AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
--[
-- AC_REQUIRE([AM_MAINTAINER_MODE])
+# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# ---------------------------------------------------------------------------
+# Adds support for distributing Python modules and packages. To
@@ -3923,19 +5914,22 @@
+ [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
+python2.1 python2.0])
-- DISABLE_DEPRECATED=""
-- if test $USE_MAINTAINER_MODE = yes; then
-- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-- for DOMAIN in $DOMAINS; do
-- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-- done
-- fi
+- if test "$gt_cv_have_gettext" = "yes" ; then
+- AC_DEFINE(ENABLE_NLS, 1,
+- [always defined to indicate that i18n is enabled])
+ m4_if([$1],[],[
+ dnl No version check is needed.
+ # Find any Python interpreter.
+ if test -z "$PYTHON"; then
+ AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
-+ fi
+ fi
+-
+- dnl Test whether we really found GNU xgettext.
+- if test "$XGETTEXT" != ":"; then
+- dnl If it is not GNU xgettext we define it as : so that the
+- dnl Makefiles still can work.
+- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+- : ;
+ am_display_PYTHON=python
+ ], [
+ dnl A version check is needed.
@@ -3958,78 +5952,91 @@
+ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+ if test "$am_cv_pathless_PYTHON" = none; then
+ PYTHON=:
-+ else
+ else
+- AC_MSG_RESULT(
+- [found xgettext program is not GNU xgettext; ignore it])
+- XGETTEXT=":"
+ AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
-+ fi
+ fi
+ am_display_PYTHON=$am_cv_pathless_PYTHON
-+ fi
+ fi
+ ])
-
-- AC_SUBST(DISABLE_DEPRECATED)
--])
++
+ if test "$PYTHON" = :; then
+ dnl Run any user-specified action, or abort.
+ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+ else
-
--dnl -*- mode: autoconf -*-
++
+ dnl Query Python for its version number. Getting [:3] seems to be
+ dnl the best way to do this; it's what "site.py" does in the standard
+ dnl library.
-
--# serial 1
++
+ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
-
--dnl Usage:
--dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
--AC_DEFUN([GTK_DOC_CHECK],
--[
-- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++
+ dnl Use the values of $prefix and $exec_prefix for the corresponding
+ dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
+ dnl distinct variables so they can be overridden if need be. However,
+ dnl general consensus is that you shouldn't need this ability.
-+
+
+- # We need to process the po/ directory.
+- POSUB=po
+ AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+ AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
-- dnl check for tools we added during development
-- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
+ dnl At times (like when building shared libraries) you may want
+ dnl to know which OS platform Python thinks this is.
-- dnl for overriding the documentation installation directory
-- AC_ARG_WITH([html-dir],
-- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-- [with_html_dir='${datadir}/gtk-doc/html'])
-- HTML_DIR="$with_html_dir"
-- AC_SUBST([HTML_DIR])
+- dnl These rules are solely for the distribution goal. While doing this
+- dnl we only have to keep exactly one list of the available catalogs
+- dnl in configure.in.
+- for lang in $ALL_LINGUAS; do
+- GMOFILES="$GMOFILES $lang.gmo"
+- POFILES="$POFILES $lang.po"
+- done
+ AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
+ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
+ AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
-- dnl enable/disable documentation building
-- AC_ARG_ENABLE([gtk-doc],
-- AS_HELP_STRING([--enable-gtk-doc],
-- [use gtk-doc to build documentation [[default=no]]]),,
-- [enable_gtk_doc=no])
-
-- if test x$enable_gtk_doc = xyes; then
-- ifelse([$1],[],
-- [PKG_CHECK_EXISTS([gtk-doc],,
-- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-- fi
+- dnl Make all variables we use known to autoconf.
+- AC_SUBST(CATALOGS)
+- AC_SUBST(CATOBJEXT)
+- AC_SUBST(DATADIRNAME)
+- AC_SUBST(GMOFILES)
+- AC_SUBST(INSTOBJEXT)
+- AC_SUBST(INTLLIBS)
+- AC_SUBST(PO_IN_DATADIR_TRUE)
+- AC_SUBST(PO_IN_DATADIR_FALSE)
+- AC_SUBST(POFILES)
+- AC_SUBST(POSUB)
+- ])
+
+-# AM_GLIB_GNU_GETTEXT
+-# -------------------
+-# Do checks necessary for use of gettext. If a suitable implementation
+-# of gettext is found in either in libintl or in the C library,
+-# it will set INTLLIBS to the libraries needed for use of gettext
+-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+-# on various variables needed by the Makefile.in.in installed by
+-# glib-gettextize.
+-dnl
+-glib_DEFUN([GLIB_GNU_GETTEXT],
+- [AC_REQUIRE([AC_PROG_CC])dnl
+- AC_REQUIRE([AC_HEADER_STDC])dnl
+-
+- GLIB_LC_MESSAGES
+- GLIB_WITH_NLS
+ dnl Set up 4 directories:
-- AC_MSG_CHECKING([whether to build gtk-doc documentation])
-- AC_MSG_RESULT($enable_gtk_doc)
+- if test "$gt_cv_have_gettext" = "yes"; then
+- if test "x$ALL_LINGUAS" = "x"; then
+- LINGUAS=
+ dnl pythondir -- where to install python scripts. This is the
+ dnl site-packages directory, not the python standard library
+ dnl directory like in previous automake betas. This behavior
@@ -4042,9 +6049,34 @@
+ [if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
-+ else
+ else
+- AC_MSG_CHECKING(for catalogs to be installed)
+- NEW_LINGUAS=
+- for presentlang in $ALL_LINGUAS; do
+- useit=no
+- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+- desiredlanguages="$LINGUAS"
+- else
+- desiredlanguages="$ALL_LINGUAS"
+- fi
+- for desiredlang in $desiredlanguages; do
+- # Use the presentlang catalog if desiredlang is
+- # a. equal to presentlang, or
+- # b. a variant of presentlang (because in this case,
+- # presentlang can be used as a fallback for messages
+- # which are not translated in the desiredlang catalog).
+- case "$desiredlang" in
+- "$presentlang"*) useit=yes;;
+- esac
+- done
+- if test $useit = yes; then
+- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+- fi
+- done
+- LINGUAS=$NEW_LINGUAS
+- AC_MSG_RESULT($LINGUAS)
+ am_py_prefix=$prefix
-+ fi
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pythondir in
@@ -4064,24 +6096,34 @@
+ ])
+ AC_SUBST([pythondir], [$am_cv_python_pythondir])
-- dnl enable/disable output formats
-- AC_ARG_ENABLE([gtk-doc-html],
-- AS_HELP_STRING([--enable-gtk-doc-html],
-- [build documentation in html format [[default=yes]]]),,
-- [enable_gtk_doc_html=yes])
-- AC_ARG_ENABLE([gtk-doc-pdf],
-- AS_HELP_STRING([--enable-gtk-doc-pdf],
-- [build documentation in pdf format [[default=no]]]),,
-- [enable_gtk_doc_pdf=no])
+- dnl Construct list of names of catalog files to be constructed.
+- if test -n "$LINGUAS"; then
+- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+- fi
+- fi
+ dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
+ dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
+ dnl more consistent with the rest of automake.
-- if test -z "$GTKDOC_MKPDF"; then
-- enable_gtk_doc_pdf=no
-- fi
+- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+- dnl Try to locate is.
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
+- AC_SUBST(MKINSTALLDIRS)
+ AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
+- dnl Generate list of files to be processed by xgettext which will
+- dnl be included in po/Makefile.
+- test -d po || mkdir po
+- if test "x$srcdir" != "x."; then
+- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+- posrcprefix="$srcdir/"
+ dnl pyexecdir -- directory for installing python extension modules
+ dnl (shared libraries)
+ dnl Query distutils for this directory. distutils does not exist in
@@ -4092,9 +6134,12 @@
+ [if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
-+ else
+ else
+- posrcprefix="../$srcdir/"
+ am_py_exec_prefix=$exec_prefix
-+ fi
+ fi
+- else
+- posrcprefix="../"
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pyexecdir in
@@ -4113,46 +6158,18 @@
+ esac
+ ])
+ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
-
-- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
-- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
--])
++
+ dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-
++
+ AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
-
--dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
--# serial 40 IT_PROG_INTLTOOL
--AC_DEFUN([IT_PROG_INTLTOOL], [
--AC_PREREQ([2.50])dnl
--AC_REQUIRE([AM_NLS])dnl
++
+ dnl Run any user-specified action.
+ $2
+ fi
-
--case "$am__api_version" in
-- 1.[01234])
-- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-- ;;
-- *)
-- ;;
--esac
++
+])
-
--if test -n "$1"; then
-- AC_MSG_CHECKING([for intltool >= $1])
-
-- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-- [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-- ]
-- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
--fi
++
++
+# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# ---------------------------------------------------------------------------
+# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
@@ -4171,76 +6188,18 @@
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
+sys.exit(sys.hexversion < minverhex)"
+ AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-
--AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
--AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
--AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
--if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-- AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
--fi
++
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
--INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
--INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
-- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-
--_IT_SUBST(INTLTOOL_DESKTOP_RULE)
--_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
--_IT_SUBST(INTLTOOL_KEYS_RULE)
--_IT_SUBST(INTLTOOL_PROP_RULE)
--_IT_SUBST(INTLTOOL_OAF_RULE)
--_IT_SUBST(INTLTOOL_PONG_RULE)
--_IT_SUBST(INTLTOOL_SERVER_RULE)
--_IT_SUBST(INTLTOOL_SHEET_RULE)
--_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
--_IT_SUBST(INTLTOOL_UI_RULE)
--_IT_SUBST(INTLTOOL_XAM_RULE)
--_IT_SUBST(INTLTOOL_KBD_RULE)
--_IT_SUBST(INTLTOOL_XML_RULE)
--_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
--_IT_SUBST(INTLTOOL_CAVES_RULE)
--_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
--_IT_SUBST(INTLTOOL_THEME_RULE)
--_IT_SUBST(INTLTOOL_SERVICE_RULE)
--_IT_SUBST(INTLTOOL_POLICY_RULE)
++
+# serial 5
-
--# Check the gettext tools to make sure they are GNU
--AC_PATH_PROG(XGETTEXT, xgettext)
--AC_PATH_PROG(MSGMERGE, msgmerge)
--AC_PATH_PROG(MSGFMT, msgfmt)
--AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
--if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
--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
-- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
--fi
++
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
@@ -4260,25 +6219,7 @@
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
-
--AC_PATH_PROG(INTLTOOL_PERL, perl)
--if test -z "$INTLTOOL_PERL"; then
-- AC_MSG_ERROR([perl not found])
--fi
--AC_MSG_CHECKING([for perl >= 5.8.1])
--$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
--if test $? -ne 0; then
-- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
--else
-- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-- AC_MSG_RESULT([$IT_PERL_VERSION])
--fi
--if test "x$2" != "xno-xml"; then
-- AC_MSG_CHECKING([for XML::Parser])
-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- AC_MSG_RESULT([ok])
-- else
-- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
@@ -4289,63 +6230,83 @@
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
- fi
--fi
++ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
--# Substitute ALL_LINGUAS so we can use it in po/Makefile
--AC_SUBST(ALL_LINGUAS)
++
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
-+ fi
-
--# Set DATADIRNAME correctly if it is not set yet
--# (copied from glib-gettext.m4)
--if test -z "$DATADIRNAME"; then
-- AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM([[]],
-- [[extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr]])],
-- [DATADIRNAME=share],
-- [case $host in
-- *-*-solaris*)
-- dnl On Solaris, if bind_textdomain_codeset is in libc,
-- dnl GNU format message catalog is always supported,
-- dnl since both are added to the libc all together.
-- dnl Hence, we'd like to go with DATADIRNAME=share
-- dnl in this case.
-- AC_CHECK_FUNC(bind_textdomain_codeset,
-- [DATADIRNAME=share], [DATADIRNAME=lib])
-- ;;
-- *)
-- [DATADIRNAME=lib]
-- ;;
-- esac])
+ fi
+- rm -f po/POTFILES
+- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+- < $srcdir/po/POTFILES.in > po/POTFILES
+- ])
+
+-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+-# -------------------------------
+-# Define VARIABLE to the location where catalog files will
+-# be installed by po/Makefile.
+-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+-glib_save_prefix="$prefix"
+-glib_save_exec_prefix="$exec_prefix"
+-glib_save_datarootdir="$datarootdir"
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+- localedir=`eval echo "${libdir}/locale"`
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
-+else
+ else
+- localedir=`eval echo "${datadir}/locale"`
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
fi
--AC_SUBST(DATADIRNAME)
+-prefix="$glib_save_prefix"
+-exec_prefix="$glib_save_exec_prefix"
+-datarootdir="$glib_save_datarootdir"
+-AC_DEFINE_UNQUOTED($1, "$localedir",
+- [Define the location where the catalogs will be installed])
+-])
+AC_MSG_RESULT(yes)])
--IT_PO_SUBDIR([po])
+-dnl
+-dnl Now the definitions that aclocal will find
+-dnl
+-ifdef(glib_configure_in,[],[
+-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+-])dnl
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-+
+
+-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+-#
+-# Create a temporary file with TEST-FILE as its contents and pass the
+-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+-# 0 and perform ACTION-IF-FAIL for any other exit status.
+-AC_DEFUN([GLIB_RUN_PROG],
+-[cat >conftest.foo <<_ACEOF
+-$2
+-_ACEOF
+-if AC_RUN_LOG([$1 conftest.foo]); then
+- m4_ifval([$3], [$3], [:])
+-m4_ifvaln([$4], [else $4])dnl
+-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+-fi])
+# serial 1
+# AM_SILENT_RULES([DEFAULT])
@@ -4365,19 +6326,18 @@
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
- ])
-
++])
+
+-dnl -*- mode: autoconf -*-
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
--# IT_PO_SUBDIR(DIRNAME)
+-# serial 1
+# AM_PROG_INSTALL_STRIP
- # ---------------------
--# All po subdirs have to be declared with this macro; the subdir "po" is
--# declared by IT_PROG_INTLTOOL.
++# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
@@ -4397,77 +6357,78 @@
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
+
+-dnl Usage:
+-dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
+-AC_DEFUN([GTK_DOC_CHECK],
+-[
+- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
- #
--AC_DEFUN([IT_PO_SUBDIR],
--[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
--dnl
--dnl The following CONFIG_COMMANDS should be exetuted at the very end
--dnl of config.status.
--AC_CONFIG_COMMANDS_PRE([
-- AC_CONFIG_COMMANDS([$1/stamp-it], [
-- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-- fi
-- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-- >"$1/stamp-it.tmp"
-- [sed '/^#/d
-- s/^[[].*] *//
-- /^[ ]*$/d
-- '"s|^| $ac_top_srcdir/|" \
-- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-- ]
-- [sed '/^POTFILES =/,/[^\\]$/ {
-- /^POTFILES =/!d
-- r $1/POTFILES
-- }
-- ' "$1/Makefile.in" >"$1/Makefile"]
-- rm -f "$1/Makefile.tmp"
-- mv "$1/stamp-it.tmp" "$1/stamp-it"
-- ])
--])dnl
--])
++#
+# 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.
--# _IT_SUBST(VARIABLE)
--# -------------------
--# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+- dnl check for tools we added during development
+- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+# serial 2
-+
+
+- dnl for overriding the documentation installation directory
+- AC_ARG_WITH([html-dir],
+- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+- [with_html_dir='${datadir}/gtk-doc/html'])
+- HTML_DIR="$with_html_dir"
+- AC_SUBST([HTML_DIR])
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
+
+- dnl enable/disable documentation building
+- AC_ARG_ENABLE([gtk-doc],
+- AS_HELP_STRING([--enable-gtk-doc],
+- [use gtk-doc to build documentation [[default=no]]]),,
+- [enable_gtk_doc=no])
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-+
+
+- if test x$enable_gtk_doc = xyes; then
+- ifelse([$1],[],
+- [PKG_CHECK_EXISTS([gtk-doc],,
+- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+- fi
+# Check how to create a tarball. -*- Autoconf -*-
-+
+
+- AC_MSG_CHECKING([whether to build gtk-doc documentation])
+- AC_MSG_RESULT($enable_gtk_doc)
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
- #
--AC_DEFUN([_IT_SUBST],
--[
--AC_SUBST([$1])
--m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
--]
--)
++#
+# 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.
--# deprecated macros
--AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
--# A hint is needed for aclocal from Automake <= 1.9.4:
--# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+- dnl enable/disable output formats
+- AC_ARG_ENABLE([gtk-doc-html],
+- AS_HELP_STRING([--enable-gtk-doc-html],
+- [build documentation in html format [[default=yes]]]),,
+- [enable_gtk_doc_html=yes])
+- AC_ARG_ENABLE([gtk-doc-pdf],
+- AS_HELP_STRING([--enable-gtk-doc-pdf],
+- [build documentation in pdf format [[default=no]]]),,
+- [enable_gtk_doc_pdf=no])
+# serial 2
-+
+
+- if test -z "$GTKDOC_MKPDF"; then
+- enable_gtk_doc_pdf=no
+- fi
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
@@ -4530,11 +6491,17 @@
+ am__untar=false
+ ;;
+ esac
-+
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
-+
+
+- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+-])
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
@@ -4547,7 +6514,7 @@
+ fi
+done
+rm -rf conftest.dir
-
++
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
@@ -4555,70 +6522,24 @@
+]) # _AM_PROG_TAR
m4_include([acinclude.m4])
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/compile vte-0.24.1/compile
---- vte-0.24.1.old/compile 2010-03-17 20:52:07.000000000 +0100
-+++ vte-0.24.1/compile 2010-05-03 20:15:31.779106949 +0200
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # Wrapper for compilers which do not understand `-c -o'.
-
--scriptversion=2009-04-28.21; # UTC
-+scriptversion=2009-10-06.20; # UTC
-
- # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
- # Foundation, Inc.
-@@ -124,9 +124,9 @@
- ret=$?
-
- if test -f "$cofile"; then
-- mv "$cofile" "$ofile"
-+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
- elif test -f "${cofile}bj"; then
-- mv "${cofile}bj" "$ofile"
-+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
- fi
-
- rmdir "$lockdir"
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/configure vte-0.24.1/configure
---- vte-0.24.1.old/configure 2010-04-26 13:09:06.000000000 +0200
-+++ vte-0.24.1/configure 2010-05-03 20:15:30.791108195 +0200
-@@ -1,12 +1,14 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for vte 0.24.1.
-+# Generated by GNU Autoconf 2.65 for vte 0.24.1.
- #
- # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=vte>.
- #
-+#
- # 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 Free Software Foundation,
-+# Inc.
-+#
- #
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-@@ -677,7 +679,8 @@
-
-
-
--exec 7<&0 </dev/null 6>&1
-+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,
-@@ -865,6 +868,7 @@
- lt_ECHO
- RANLIB
- AR
-+OBJDUMP
- LN_S
- NM
- ac_ct_DUMPBIN
-@@ -982,6 +986,7 @@
+Index: vte-0.24.3/config.guess
+===================================================================
+Index: vte-0.24.3/config.sub
+===================================================================
+Index: vte-0.24.3/configure
+===================================================================
+--- vte-0.24.3.orig/configure 2010-07-15 20:28:26.533817749 +0200
++++ vte-0.24.3/configure 2010-07-15 20:28:16.969784889 +0200
+@@ -808,6 +808,8 @@
+ GTK_CFLAGS
+ GLIB_LIBS
+ GLIB_CFLAGS
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ ACLOCAL_AMFLAGS
+ PYTHON_LDFLAGS
+@@ -986,6 +988,7 @@
enable_nls
enable_debug
with_default_emulation
@@ -4626,20 +6547,16 @@
enable_python
enable_gnome_pty_helper
enable_glade_catalogue
-@@ -1644,9 +1649,9 @@
- --enable-gnome-pty-helper
- Build a setuid helper for opening ptys default=yes
- --disable-glade Disable installing the glade catalogue
-- --enable-gtk-doc use gtk-doc to build documentation [default=no]
-- --enable-gtk-doc-html build documentation in html format [default=yes]
-- --enable-gtk-doc-pdf build documentation in pdf format [default=no]
-+ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
-+ --enable-gtk-doc-html build documentation in html format [[default=yes]]
-+ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
-
- Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1656,6 +1661,8 @@
+@@ -1004,6 +1007,8 @@
+ CPPFLAGS
+ CPP
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ GLIB_CFLAGS
+ GLIB_LIBS
+ GTK_CFLAGS
+@@ -1660,6 +1665,8 @@
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-default-emulation=xterm
default terminal type to be emulated
@@ -4648,472 +6565,35 @@
--with-html-dir=PATH path to installed docs
Some influential environment variables:
-@@ -1664,7 +1671,7 @@
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
-- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+@@ -1672,6 +1679,10 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1745,7 +1752,7 @@
- if $ac_init_version; then
- cat <<\_ACEOF
- vte configure 0.24.1
--generated by GNU Autoconf 2.64
-+generated by GNU Autoconf 2.65
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1792,7 +1799,7 @@
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_compile
-
-@@ -1838,7 +1845,7 @@
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_link
-
-@@ -1875,7 +1882,7 @@
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_cpp
-
-@@ -1917,7 +1924,7 @@
- fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_run
-
-@@ -2209,7 +2216,7 @@
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by vte $as_me 0.24.1, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- $ $0 $@
-
-@@ -2462,7 +2469,7 @@
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
- test "x$ac_site_file" = xNONE && continue
-- if test -r "$ac_site_file"; then
-+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $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
-@@ -2471,9 +2478,9 @@
- done
-
- if test -r "$cache_file"; then
-- # Some versions of bash will fail to source /dev/null (special
-- # files actually), so we avoid doing that.
-- if test -f "$cache_file"; then
-+ # Some versions of bash will fail to source /dev/null (special files
-+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
-+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-@@ -2896,6 +2903,7 @@
-
- fi
-
-+ test -d ./--version && rmdir ./--version
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
-@@ -2903,7 +2911,6 @@
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
-- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
- fi
- fi
-@@ -3502,32 +3509,30 @@
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <stdio.h>
-+
- int
- main ()
- {
--FILE *f = fopen ("conftest.out", "w");
-- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
- # The possible output files:
-@@ -3589,10 +3594,10 @@
- else
- ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
-- $as_echo "$as_me: failed program was:" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3600,51 +3605,18 @@
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
-
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
-- if { ac_try='./$ac_file'
-- { { 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_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; }; then
-- cross_compiling=no
-- else
-- if test "$cross_compiling" = maybe; then
-- cross_compiling=yes
-- else
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
-- fi
-- fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3677,13 +3649,72 @@
- as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
- fi
--rm -f conftest$ac_cv_exeext
-+rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+ { { ac_try="$ac_link"
-+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_link") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+ if { ac_try='./conftest$ac_cv_exeext'
-+ { { 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_try") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then
-+ cross_compiling=no
-+ else
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+ fi
-+ fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -4453,8 +4484,8 @@
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-@@ -5500,8 +5531,8 @@
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-@@ -5984,8 +6015,8 @@
-
-
-
--macro_version='2.2.4'
--macro_revision='1.2976'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
-
-
-
-@@ -6526,13 +6557,13 @@
++ PKG_CONFIG_PATH
++ directories to add to pkg-config's search path
++ PKG_CONFIG_LIBDIR
++ path overriding pkg-config's built-in search path
+ GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+ GLIB_LIBS linker flags for GLIB, overriding pkg-config
+ GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
+@@ -6554,13 +6565,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6529: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6560: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:6557: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6568: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6532: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6563: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:6560: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6571: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6535: output\"" >&5)
-+ (eval echo "\"\$as_me:6566: output\"" >&5)
+- (eval echo "\"\$as_me:6563: output\"" >&5)
++ (eval echo "\"\$as_me:6574: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -6578,7 +6609,7 @@
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
-- cygwin* | mingw*)
-+ cygwin* | mingw* | cegcc*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -6779,6 +6810,107 @@
-
-
-
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}objdump; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$OBJDUMP"; then
-+ ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_OBJDUMP="${ac_tool_prefix}objdump"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OBJDUMP=$ac_cv_prog_OBJDUMP
-+if test -n "$OBJDUMP"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-+$as_echo "$OBJDUMP" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_OBJDUMP"; then
-+ ac_ct_OBJDUMP=$OBJDUMP
-+ # Extract the first word of "objdump", so it can be a program name with args.
-+set dummy objdump; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$ac_ct_OBJDUMP"; then
-+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_OBJDUMP="objdump"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-+if test -n "$ac_ct_OBJDUMP"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-+$as_echo "$ac_ct_OBJDUMP" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_OBJDUMP" = x; then
-+ OBJDUMP="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ OBJDUMP=$ac_ct_OBJDUMP
-+ fi
-+else
-+ OBJDUMP="$ac_cv_prog_OBJDUMP"
-+fi
-+
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+
-+
-+
-+
-+
-+
-+
-+
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
- $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-@@ -6833,6 +6965,12 @@
- fi
- ;;
-
-+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'
-+ ;;
-+
- darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-@@ -6891,7 +7029,7 @@
+@@ -7026,11 +7037,11 @@
;;
# This must be Linux ELF.
@@ -5122,153 +6602,86 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7371,7 +7509,7 @@
- aix*)
- symcode='[BCDT]'
- ;;
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
- symcode='[ABCDGISTW]'
- ;;
- hpux*)
-@@ -7630,7 +7768,7 @@
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -7765,7 +7776,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7633 "configure"' > conftest.$ac_ext
-+ echo '#line 7771 "configure"' > conftest.$ac_ext
+- echo '#line 7768 "configure"' > conftest.$ac_ext
++ echo '#line 7779 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -8906,11 +9044,11 @@
+@@ -9041,11 +9052,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8909: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9047: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9044: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9055: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8913: \$? = $ac_status" >&5
-+ echo "$as_me:9051: \$? = $ac_status" >&5
+- echo "$as_me:9048: \$? = $ac_status" >&5
++ echo "$as_me:9059: \$? = $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.
-@@ -8978,7 +9116,7 @@
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -8993,10 +9131,11 @@
- ;;
-
- hpux*)
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-+ # 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
-+ # sets the default TLS model and affects inlining.
- case $host_cpu in
-- hppa*64*|ia64*)
-+ hppa*64*)
- # +Z the default
- ;;
- *)
-@@ -9046,7 +9185,7 @@
- fi
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -9074,13 +9213,27 @@
+@@ -9210,7 +9221,7 @@
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
-- icc* | ecc* | ifort*)
-+ # old Intel for x86_64 which still supported -KPIC.
-+ ecc*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-static'
- ;;
-+ # icc used to be incompatible with GCC.
-+ # ICC 10 doesn't accept -KPIC any more.
-+ icc* | ifort*)
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_pic='-fPIC'
-+ lt_prog_compiler_static='-static'
-+ ;;
-+ # Lahey Fortran 8.1.
-+ lf95*)
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_pic='--shared'
-+ lt_prog_compiler_static='--static'
-+ ;;
- pgcc* | pgf77* | pgf90* | pgf95*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
-@@ -9230,11 +9383,11 @@
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -9380,11 +9391,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9233: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9386: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9383: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9394: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9237: \$? = $ac_status" >&5
-+ echo "$as_me:9390: \$? = $ac_status" >&5
+- echo "$as_me:9387: \$? = $ac_status" >&5
++ echo "$as_me:9398: \$? = $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.
-@@ -9335,11 +9488,11 @@
+@@ -9485,11 +9496,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9338: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9491: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9488: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9499: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9342: \$? = $ac_status" >&5
-+ echo "$as_me:9495: \$? = $ac_status" >&5
+- echo "$as_me:9492: \$? = $ac_status" >&5
++ echo "$as_me:9503: \$? = $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
-@@ -9390,11 +9543,11 @@
+@@ -9540,11 +9551,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9393: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9546: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9543: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9554: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9397: \$? = $ac_status" >&5
-+ echo "$as_me:9550: \$? = $ac_status" >&5
+- echo "$as_me:9547: \$? = $ac_status" >&5
++ echo "$as_me:9558: \$? = $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
-@@ -9494,7 +9647,7 @@
- extract_expsyms_cmds=
-
- case $host_os in
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
-@@ -9509,6 +9662,9 @@
+@@ -9659,6 +9670,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -5278,7 +6691,7 @@
esac
ld_shlibs=yes
-@@ -9530,6 +9686,7 @@
+@@ -9680,6 +9694,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -5286,16 +6699,7 @@
*\ [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 ...
-@@ -9581,7 +9738,7 @@
- fi
- ;;
-
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
- # as there is no search path for DLLs.
- hardcode_libdir_flag_spec='-L$libdir'
-@@ -9621,7 +9778,7 @@
+@@ -9771,7 +9786,7 @@
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'
;;
@@ -5304,82 +6708,33 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -9647,6 +9804,9 @@
- tmp_addflag=' -i_dynamic -nofor_main' ;;
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
-+ lf95*) # Lahey Fortran 8.1
-+ whole_archive_flag_spec=
-+ tmp_sharedflag='--shared' ;;
- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
- tmp_sharedflag='-qmkshrobj'
- tmp_addflag= ;;
-@@ -9879,6 +10039,7 @@
+@@ -9841,7 +9856,7 @@
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -10016,6 +10031,7 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
fi
- fi
-
-+ export_dynamic_flag_spec='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols=yes
-@@ -9991,7 +10152,7 @@
- export_dynamic_flag_spec=-rdynamic
++ link_all_deplibs=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -10342,7 +10358,7 @@
+ link_all_deplibs=yes
;;
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -10022,7 +10183,11 @@
- whole_archive_flag_spec=''
- link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
-- if test "$GCC" = "yes"; then
-+ case $cc_basename in
-+ ifort*) _lt_dar_can_shared=yes ;;
-+ *) _lt_dar_can_shared=$GCC ;;
-+ esac
-+ if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-@@ -10114,7 +10279,7 @@
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
-- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-@@ -10830,14 +10995,14 @@
- # libtool to hard-code these into programs
- ;;
-
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$host_os in
-- yes,cygwin* | yes,mingw* | yes,pw32*)
-+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
-@@ -10860,7 +11025,7 @@
- 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*)
-+ 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"`
-@@ -11075,7 +11240,7 @@
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -11232,7 +11248,7 @@
;;
# This must be Linux ELF.
@@ -5388,83 +6743,140 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11313,7 +11478,7 @@
- version_type=linux
+@@ -11272,13 +11288,10 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -11290,6 +11303,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
- need_version=no
-- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-@@ -11490,7 +11655,7 @@
- lt_cv_dlopen_self=yes
- ;;
-
-- mingw* | pw32*)
-+ mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-@@ -11762,7 +11927,7 @@
+@@ -11910,7 +11935,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11765 "configure"
-+#line 11930 "configure"
+-#line 11913 "configure"
++#line 11938 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11803,10 +11968,6 @@
- # endif
- #endif
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -11822,7 +11983,7 @@
- else
- puts (dlerror ());
-
-- exit (status);
-+ return status;
- }
- _LT_EOF
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -11862,7 +12023,7 @@
+@@ -12006,7 +12031,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11865 "configure"
-+#line 12026 "configure"
+-#line 12009 "configure"
++#line 12034 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11903,10 +12064,6 @@
- # endif
- #endif
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -11922,7 +12079,7 @@
- else
- puts (dlerror ());
-
-- exit (status);
-+ return status;
- }
- _LT_EOF
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -14331,9 +14488,19 @@
+@@ -13845,6 +13870,10 @@
+
+
+
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -13957,7 +13986,6 @@
+ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+-
+ fi
+
+ pkg_failed=no
+@@ -14000,6 +14028,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14023,9 +14053,10 @@
+
+ Alternatively, you may set the environment variables GLIB_CFLAGS
+ and GLIB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++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
+@@ -14043,7 +14074,7 @@
+ GLIB_LIBS=$pkg_cv_GLIB_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+ pkg_failed=no
+@@ -14086,6 +14117,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14109,9 +14142,10 @@
+
+ Alternatively, you may set the environment variables GTK_CFLAGS
+ and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++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
+@@ -14129,7 +14163,7 @@
+ GTK_LIBS=$pkg_cv_GTK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+ # Let the user specify the default terminal emulation.
+@@ -14463,9 +14497,19 @@
done
@@ -5486,7 +6898,7 @@
if test "x$ac_cv_func_tgetent" = x""yes; then :
vte_cv_termcap_lib=libc
else
-@@ -14505,11 +14672,11 @@
+@@ -14637,11 +14681,11 @@
fi
@@ -5503,7 +6915,7 @@
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"
-@@ -14540,10 +14707,10 @@
+@@ -14672,10 +14716,10 @@
done
@@ -5518,7 +6930,7 @@
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"
-@@ -14574,15 +14741,15 @@
+@@ -14706,15 +14750,15 @@
done
@@ -5540,7 +6952,7 @@
"
eval as_val=\$$as_ac_Header
if test "x$as_val" = x""yes; then :
-@@ -14596,10 +14763,10 @@
+@@ -14728,10 +14772,10 @@
done
@@ -5555,7 +6967,7 @@
do :
ac_fn_c_check_header_mongrel "$LINENO" "termcap.h" "ac_cv_header_termcap_h" "$ac_includes_default"
if test "x$ac_cv_header_termcap_h" = x""yes; then :
-@@ -14613,10 +14780,11 @@
+@@ -14745,10 +14789,11 @@
done
@@ -5571,1707 +6983,159 @@
# Search for the required modules.
-@@ -14887,6 +15055,14 @@
- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
- ;;
-+ *)
-+ case $am_py_prefix in
-+ /usr|/System*) ;;
-+ *)
-+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
-+ ;;
-+ esac
-+ ;;
- esac
-
+@@ -14805,6 +14850,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14828,9 +14875,10 @@
+
+ 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
++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
+@@ -14848,7 +14896,7 @@
+ VTE_LIBS=$pkg_cv_VTE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
fi
-@@ -14917,6 +15093,14 @@
- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
- ;;
-+ *)
-+ case $am_py_exec_prefix in
-+ /usr|/System*) ;;
-+ *)
-+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
-+ ;;
-+ esac
-+ ;;
- esac
-
+
+
+@@ -15187,6 +15235,8 @@
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -15210,9 +15260,10 @@
+
+ Alternatively, you may set the environment variables PYGTK_CFLAGS
+ and PYGTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++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
+@@ -15230,7 +15281,7 @@
+ PYGTK_LIBS=$pkg_cv_PYGTK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
fi
-@@ -16144,7 +16328,7 @@
- # values after options handling.
- ac_log="
- This file was extended by vte $as_me 0.24.1, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -16184,6 +16368,7 @@
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
-+ --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
-@@ -16206,10 +16391,11 @@
-
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- vte config.status 0.24.1
--configured by $0, generated by GNU Autoconf 2.64,
-- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.65,
-+ with options \\"\$ac_cs_config\\"
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
-@@ -16247,6 +16433,8 @@
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
-+ --config | --confi | --conf | --con | --co | --c )
-+ $as_echo "$ac_cs_config"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
-@@ -16356,6 +16544,7 @@
- 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"`'
-@@ -16461,6 +16650,7 @@
- lt_SP2NL \
- lt_NL2SP \
- reload_flag \
-+OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
- AR \
-@@ -16705,7 +16895,7 @@
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -16719,7 +16909,7 @@
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-@@ -17403,6 +17593,9 @@
- reload_flag=$lt_reload_flag
- reload_cmds=$lt_reload_cmds
-
-+# An object symbol dumper.
-+OBJDUMP=$lt_OBJDUMP
-+
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/doc/Makefile.in vte-0.24.1/doc/Makefile.in
---- vte-0.24.1.old/doc/Makefile.in 2010-04-26 13:09:01.000000000 +0200
-+++ vte-0.24.1/doc/Makefile.in 2010-05-03 20:15:31.867106117 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -172,6 +172,7 @@
- MSGMERGE = @MSGMERGE@
- NM = @NM@
- NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
-@@ -325,7 +326,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -350,7 +351,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/doc/openi18n/Makefile.in vte-0.24.1/doc/openi18n/Makefile.in
---- vte-0.24.1.old/doc/openi18n/Makefile.in 2010-04-26 13:09:02.000000000 +0200
-+++ vte-0.24.1/doc/openi18n/Makefile.in 2010-05-03 20:15:31.947112297 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -163,6 +163,7 @@
- MSGMERGE = @MSGMERGE@
- NM = @NM@
- NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/doc/reference/Makefile.in vte-0.24.1/doc/reference/Makefile.in
---- vte-0.24.1.old/doc/reference/Makefile.in 2010-04-26 13:09:02.000000000 +0200
-+++ vte-0.24.1/doc/reference/Makefile.in 2010-05-03 20:15:32.027108361 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -139,6 +139,7 @@
- MSGMERGE = @MSGMERGE@
- NM = @NM@
- NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/glade/Makefile.in vte-0.24.1/glade/Makefile.in
---- vte-0.24.1.old/glade/Makefile.in 2010-04-26 13:09:02.000000000 +0200
-+++ vte-0.24.1/glade/Makefile.in 2010-05-03 20:15:32.091106511 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -156,6 +156,7 @@
- MSGMERGE = @MSGMERGE@
- NM = @NM@
- NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/gnome-pty-helper/aclocal.m4 vte-0.24.1/gnome-pty-helper/aclocal.m4
---- vte-0.24.1.old/gnome-pty-helper/aclocal.m4 2010-04-26 13:11:34.000000000 +0200
-+++ vte-0.24.1/gnome-pty-helper/aclocal.m4 2010-05-03 20:15:24.335107290 +0200
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-@@ -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.64],,
--[m4_warning([this file was generated for autoconf 2.64.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf. It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -34,7 +34,7 @@
- [am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.11], [],
-+m4_if([$1], [1.11.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -50,7 +50,7 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/gnome-pty-helper/configure vte-0.24.1/gnome-pty-helper/configure
---- vte-0.24.1.old/gnome-pty-helper/configure 2010-04-26 13:11:36.000000000 +0200
-+++ vte-0.24.1/gnome-pty-helper/configure 2010-05-03 20:15:24.927106753 +0200
-@@ -1,12 +1,14 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for gnome-pty-helper 1.95.0.
-+# Generated by GNU Autoconf 2.65 for gnome-pty-helper 1.95.0.
- #
- # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=vte>.
- #
-+#
- # 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 Free Software Foundation,
-+# Inc.
-+#
- #
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-@@ -528,7 +530,8 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--exec 7<&0 </dev/null 6>&1
-+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,
-@@ -1333,7 +1336,7 @@
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
-- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
-
-@@ -1404,7 +1407,7 @@
- if $ac_init_version; then
- cat <<\_ACEOF
- gnome-pty-helper configure 1.95.0
--generated by GNU Autoconf 2.64
-+generated by GNU Autoconf 2.65
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1451,7 +1454,7 @@
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_compile
-
-@@ -1497,7 +1500,7 @@
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_link
-
-@@ -1534,7 +1537,7 @@
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_cpp
-
-@@ -1576,7 +1579,7 @@
- fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_run
-
-@@ -1775,7 +1778,7 @@
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by gnome-pty-helper $as_me 1.95.0, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- $ $0 $@
-
-@@ -2028,7 +2031,7 @@
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
- test "x$ac_site_file" = xNONE && continue
-- if test -r "$ac_site_file"; then
-+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $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
-@@ -2037,9 +2040,9 @@
- done
-
- if test -r "$cache_file"; then
-- # Some versions of bash will fail to source /dev/null (special
-- # files actually), so we avoid doing that.
-- if test -f "$cache_file"; then
-+ # Some versions of bash will fail to source /dev/null (special files
-+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
-+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-@@ -2459,6 +2462,7 @@
-
- fi
-
-+ test -d ./--version && rmdir ./--version
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
-@@ -2466,7 +2470,6 @@
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
-- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
- fi
- fi
-@@ -3012,32 +3015,30 @@
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <stdio.h>
-+
- int
- main ()
- {
--FILE *f = fopen ("conftest.out", "w");
-- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
- # The possible output files:
-@@ -3099,10 +3100,10 @@
- else
- ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
-- $as_echo "$as_me: failed program was:" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3110,51 +3111,18 @@
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
-
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
-- if { ac_try='./$ac_file'
-- { { 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_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; }; then
-- cross_compiling=no
-- else
-- if test "$cross_compiling" = maybe; then
-- cross_compiling=yes
-- else
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
-- fi
-- fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3187,13 +3155,72 @@
- as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
- fi
--rm -f conftest$ac_cv_exeext
-+rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+ { { ac_try="$ac_link"
-+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_link") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+ if { ac_try='./conftest$ac_cv_exeext'
-+ { { 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_try") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then
-+ cross_compiling=no
-+ else
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+ fi
-+ fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -3963,8 +3990,8 @@
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-@@ -5010,8 +5037,8 @@
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-@@ -6821,7 +6848,7 @@
- # values after options handling.
- ac_log="
- This file was extended by gnome-pty-helper $as_me 1.95.0, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -6861,6 +6888,7 @@
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
-+ --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
-@@ -6883,10 +6911,11 @@
-
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- gnome-pty-helper config.status 1.95.0
--configured by $0, generated by GNU Autoconf 2.64,
-- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.65,
-+ with options \\"\$ac_cs_config\\"
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
-@@ -6924,6 +6953,8 @@
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
-+ --config | --confi | --conf | --con | --co | --c )
-+ $as_echo "$ac_cs_config"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
-@@ -7111,7 +7142,7 @@
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -7125,7 +7156,7 @@
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/gnome-pty-helper/Makefile.in vte-0.24.1/gnome-pty-helper/Makefile.in
---- vte-0.24.1.old/gnome-pty-helper/Makefile.in 2010-04-26 13:11:36.000000000 +0200
-+++ vte-0.24.1/gnome-pty-helper/Makefile.in 2010-05-03 20:15:26.028106742 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -403,7 +403,8 @@
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ || find "$(distdir)" -type d ! -perm -755 \
-+ -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -446,17 +447,17 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/ltmain.sh vte-0.24.1/ltmain.sh
---- vte-0.24.1.old/ltmain.sh 2010-03-17 20:51:45.000000000 +0100
-+++ vte-0.24.1/ltmain.sh 2010-05-03 20:15:26.331106712 +0200
-@@ -1,6 +1,6 @@
- # Generated from ltmain.m4sh.
-
--# ltmain.sh (GNU libtool) 2.2.4
-+# ltmain.sh (GNU libtool) 2.2.6b
- # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+
+ # Extract the first word of "pygtk-codegen-2.0", so it can be a program name with args.
+Index: vte-0.24.3/doc/Makefile.in
+===================================================================
+--- vte-0.24.3.orig/doc/Makefile.in 2010-07-15 20:28:27.349796324 +0200
++++ vte-0.24.3/doc/Makefile.in 2010-07-15 20:28:18.016784651 +0200
+@@ -185,6 +185,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: vte-0.24.3/doc/openi18n/Makefile.in
+===================================================================
+--- vte-0.24.3.orig/doc/openi18n/Makefile.in 2010-07-15 20:28:27.297787483 +0200
++++ vte-0.24.3/doc/openi18n/Makefile.in 2010-07-15 20:28:18.084784915 +0200
+@@ -176,6 +176,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: vte-0.24.3/doc/reference/Makefile.in
+===================================================================
+--- vte-0.24.3.orig/doc/reference/Makefile.in 2010-07-15 20:28:27.497800672 +0200
++++ vte-0.24.3/doc/reference/Makefile.in 2010-07-15 20:28:18.152784764 +0200
+@@ -152,6 +152,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: vte-0.24.3/glade/Makefile.in
+===================================================================
+--- vte-0.24.3.orig/glade/Makefile.in 2010-07-15 20:28:27.673798190 +0200
++++ vte-0.24.3/glade/Makefile.in 2010-07-15 20:28:18.309785510 +0200
+@@ -169,6 +169,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: vte-0.24.3/gnome-pty-helper/config.guess
+===================================================================
+Index: vte-0.24.3/gnome-pty-helper/config.sub
+===================================================================
+Index: vte-0.24.3/ltmain.sh
+===================================================================
+--- vte-0.24.3.orig/ltmain.sh 2010-07-15 20:28:26.425801292 +0200
++++ vte-0.24.3/ltmain.sh 2010-07-15 20:28:12.921786752 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu4
+-# $progname: (GNU libtool) 2.2.6b
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
# automake: $automake_version
# autoconf: $autoconf_version
#
-@@ -73,9 +73,9 @@
+@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION="2.2.4 Debian-2.2.4-0ubuntu4"
+-VERSION=2.2.6b
+VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
--package_revision=1.2976
-+package_revision=1.3017
-
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -805,7 +805,7 @@
-
-
- case $host in
-- *cygwin* | *mingw* | *pw32*)
-+ *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
-@@ -893,8 +893,9 @@
- # determined imposters.
- func_lalib_p ()
- {
-- $SED -e 4q "$1" 2>/dev/null \
-- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-+ test -f "$1" &&
-+ $SED -e 4q "$1" 2>/dev/null \
-+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
- }
-
- # func_lalib_unsafe_p file
-@@ -907,7 +908,7 @@
- func_lalib_unsafe_p ()
- {
- lalib_p=no
-- if test -r "$1" && exec 5<&0 <"$1"; then
-+ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
- for lalib_p_l in 1 2 3 4
- do
- read lalib_p_line
-@@ -1275,7 +1276,7 @@
-
- # On Cygwin there's no "real" PIC flag so we must build both object types
- case $host_os in
-- cygwin* | mingw* | pw32* | os2*)
-+ cygwin* | mingw* | pw32* | os2* | cegcc*)
- pic_mode=default
- ;;
- esac
-@@ -2046,7 +2047,7 @@
- 'exit $?'
- tstripme="$stripme"
- case $host_os in
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- case $realname in
- *.dll.a)
- tstripme=""
-@@ -2152,7 +2153,7 @@
-
- # Do a test to see if this is really a libtool program.
- case $host in
-- *cygwin*|*mingw*)
-+ *cygwin* | *mingw*)
- if func_ltwrapper_executable_p "$file"; then
- func_ltwrapper_scriptname "$file"
- wrapper=$func_ltwrapper_scriptname_result
-@@ -2358,7 +2359,7 @@
- $RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- case $host in
-- *cygwin* | *mingw* )
-+ *cygwin* | *mingw* | *cegcc* )
- eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
- ;;
-@@ -2370,7 +2371,7 @@
- eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- eval '$MV "$nlist"T "$nlist"'
- case $host in
-- *cygwin | *mingw* )
-+ *cygwin | *mingw* | *cegcc* )
- eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- ;;
-@@ -2426,7 +2427,7 @@
- } lt_dlsymlist;
- "
- case $host in
-- *cygwin* | *mingw* )
-+ *cygwin* | *mingw* | *cegcc* )
- $ECHO >> "$output_objdir/$my_dlsyms" "\
- /* DATA imports from DLLs on WIN32 con't be const, because
- runtime relocations are performed -- see ld's documentation
-@@ -2512,7 +2513,7 @@
- # Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
- case $host in
-- *cygwin* | *mingw* )
-+ *cygwin* | *mingw* | *cegcc* )
- if test -f "$output_objdir/$my_outputname.def"; then
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-@@ -2691,25 +2692,16 @@
-
-
-
--# func_emit_wrapper arg
-+# func_emit_wrapper_part1 [arg=no]
- #
--# emit a libtool wrapper script on stdout
--# don't directly open a file because we may want to
--# incorporate the script contents within a cygwin/mingw
--# wrapper executable. Must ONLY be called from within
--# func_mode_link because it depends on a number of variable
--# set therein.
--#
--# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
--# variable will take. If 'yes', then the emitted script
--# will assume that the directory in which it is stored is
--# the '.lib' directory. This is a cygwin/mingw-specific
--# behavior.
--func_emit_wrapper ()
-+# Emit the first part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part1 ()
- {
-- func_emit_wrapper_arg1=no
-+ func_emit_wrapper_part1_arg1=no
- if test -n "$1" ; then
-- func_emit_wrapper_arg1=$1
-+ func_emit_wrapper_part1_arg1=$1
- fi
-
- $ECHO "\
-@@ -2794,10 +2786,27 @@
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
- done
-+"
-+}
-+# end: func_emit_wrapper_part1
-+
-+# func_emit_wrapper_part2 [arg=no]
-+#
-+# Emit the second part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part2 ()
-+{
-+ func_emit_wrapper_part2_arg1=no
-+ if test -n "$1" ; then
-+ func_emit_wrapper_part2_arg1=$1
-+ fi
-+
-+ $ECHO "\
-
- # Usually 'no', except on cygwin/mingw when embedded into
- # the cwrapper.
-- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
- if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
- # special case for '.'
- if test \"\$thisdir\" = \".\"; then
-@@ -2888,7 +2897,7 @@
- "
- case $host in
- # Backslashes separate directories on plain windows
-- *-*-mingw | *-*-os2*)
-+ *-*-mingw | *-*-os2* | *-cegcc*)
- $ECHO "\
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
-@@ -2914,7 +2923,207 @@
- fi\
- "
- }
--# end: func_emit_wrapper
-+# end: func_emit_wrapper_part2
-+
-+
-+# func_emit_wrapper [arg=no]
-+#
-+# Emit a libtool wrapper script on stdout.
-+# Don't directly open a file because we may want to
-+# incorporate the script contents within a cygwin/mingw
-+# wrapper executable. Must ONLY be called from within
-+# func_mode_link because it depends on a number of variables
-+# set therein.
-+#
-+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-+# variable will take. If 'yes', then the emitted script
-+# will assume that the directory in which it is stored is
-+# the $objdir directory. This is a cygwin/mingw-specific
-+# behavior.
-+func_emit_wrapper ()
-+{
-+ func_emit_wrapper_arg1=no
-+ if test -n "$1" ; then
-+ func_emit_wrapper_arg1=$1
-+ fi
-+
-+ # split this up so that func_emit_cwrapperexe_src
-+ # can call each part independently.
-+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-+}
-+
-+
-+# func_to_host_path arg
-+#
-+# Convert paths to host format when used with build tools.
-+# Intended for use with "native" mingw (where libtool itself
-+# is running under the msys shell), or in the following cross-
-+# build environments:
-+# $build $host
-+# mingw (msys) mingw [e.g. native]
-+# cygwin mingw
-+# *nix + wine mingw
-+# where wine is equipped with the `winepath' executable.
-+# In the native mingw case, the (msys) shell automatically
-+# converts paths for any non-msys applications it launches,
-+# but that facility isn't available from inside the cwrapper.
-+# Similar accommodations are necessary for $host mingw and
-+# $build cygwin. Calling this function does no harm for other
-+# $host/$build combinations not listed above.
-+#
-+# ARG is the path (on $build) that should be converted to
-+# the proper representation for $host. The result is stored
-+# in $func_to_host_path_result.
-+func_to_host_path ()
-+{
-+ func_to_host_path_result="$1"
-+ if test -n "$1" ; then
-+ case $host in
-+ *mingw* )
-+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+ case $build in
-+ *mingw* ) # actually, msys
-+ # awkward: cmd appends spaces to result
-+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+ $SED -e "$lt_sed_naive_backslashify"`
-+ ;;
-+ *cygwin* )
-+ func_to_host_path_tmp1=`cygpath -w "$1"`
-+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+ $SED -e "$lt_sed_naive_backslashify"`
-+ ;;
-+ * )
-+ # Unfortunately, winepath does not exit with a non-zero
-+ # error code, so we are forced to check the contents of
-+ # stdout. On the other hand, if the command is not
-+ # found, the shell will set an exit code of 127 and print
-+ # *an error message* to stdout. So we must check for both
-+ # error code of zero AND non-empty stdout, which explains
-+ # the odd construction:
-+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+ $SED -e "$lt_sed_naive_backslashify"`
-+ else
-+ # Allow warning below.
-+ func_to_host_path_result=""
-+ fi
-+ ;;
-+ esac
-+ if test -z "$func_to_host_path_result" ; then
-+ func_error "Could not determine host path corresponding to"
-+ func_error " '$1'"
-+ func_error "Continuing, but uninstalled executables may not work."
-+ # Fallback:
-+ func_to_host_path_result="$1"
-+ fi
-+ ;;
-+ esac
-+ fi
-+}
-+# end: func_to_host_path
-+
-+# func_to_host_pathlist arg
-+#
-+# Convert pathlists to host format when used with build tools.
-+# See func_to_host_path(), above. This function supports the
-+# following $build/$host combinations (but does no harm for
-+# combinations not listed here):
-+# $build $host
-+# mingw (msys) mingw [e.g. native]
-+# cygwin mingw
-+# *nix + wine mingw
-+#
-+# Path separators are also converted from $build format to
-+# $host format. If ARG begins or ends with a path separator
-+# character, it is preserved (but converted to $host format)
-+# on output.
-+#
-+# ARG is a pathlist (on $build) that should be converted to
-+# the proper representation on $host. The result is stored
-+# in $func_to_host_pathlist_result.
-+func_to_host_pathlist ()
-+{
-+ func_to_host_pathlist_result="$1"
-+ if test -n "$1" ; then
-+ case $host in
-+ *mingw* )
-+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+ # Remove leading and trailing path separator characters from
-+ # ARG. msys behavior is inconsistent here, cygpath turns them
-+ # into '.;' and ';.', and winepath ignores them completely.
-+ func_to_host_pathlist_tmp2="$1"
-+ # Once set for this call, this variable should not be
-+ # reassigned. It is used in tha fallback case.
-+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-+ $SED -e 's|^:*||' -e 's|:*$||'`
-+ case $build in
-+ *mingw* ) # Actually, msys.
-+ # Awkward: cmd appends spaces to result.
-+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-+ $SED -e "$lt_sed_naive_backslashify"`
-+ ;;
-+ *cygwin* )
-+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-+ $SED -e "$lt_sed_naive_backslashify"`
-+ ;;
-+ * )
-+ # unfortunately, winepath doesn't convert pathlists
-+ func_to_host_pathlist_result=""
-+ func_to_host_pathlist_oldIFS=$IFS
-+ IFS=:
-+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-+ IFS=$func_to_host_pathlist_oldIFS
-+ if test -n "$func_to_host_pathlist_f" ; then
-+ func_to_host_path "$func_to_host_pathlist_f"
-+ if test -n "$func_to_host_path_result" ; then
-+ if test -z "$func_to_host_pathlist_result" ; then
-+ func_to_host_pathlist_result="$func_to_host_path_result"
-+ else
-+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-+ fi
-+ fi
-+ fi
-+ IFS=:
-+ done
-+ IFS=$func_to_host_pathlist_oldIFS
-+ ;;
-+ esac
-+ if test -z "$func_to_host_pathlist_result" ; then
-+ func_error "Could not determine the host path(s) corresponding to"
-+ func_error " '$1'"
-+ func_error "Continuing, but uninstalled executables may not work."
-+ # Fallback. This may break if $1 contains DOS-style drive
-+ # specifications. The fix is not to complicate the expression
-+ # below, but for the user to provide a working wine installation
-+ # with winepath so that path translation in the cross-to-mingw
-+ # case works properly.
-+ lt_replace_pathsep_nix_to_dos="s|:|;|g"
-+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-+ $SED -e "$lt_replace_pathsep_nix_to_dos"`
-+ fi
-+ # Now, add the leading and trailing path separators back
-+ case "$1" in
-+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-+ ;;
-+ esac
-+ case "$1" in
-+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ fi
-+}
-+# end: func_to_host_pathlist
-
- # func_emit_cwrapperexe_src
- # emit the source code for a wrapper executable on stdout
-@@ -2951,6 +3160,12 @@
- # include <stdint.h>
- # ifdef __CYGWIN__
- # include <io.h>
-+# define HAVE_SETENV
-+# ifdef __STRICT_ANSI__
-+char *realpath (const char *, char *);
-+int putenv (char *);
-+int setenv (const char *, const char *, int);
-+# endif
- # endif
- #endif
- #include <malloc.h>
-@@ -3057,29 +3272,105 @@
- int check_executable (const char *path);
- char *strendzap (char *str, const char *pat);
- void lt_fatal (const char *message, ...);
-+void lt_setenv (const char *name, const char *value);
-+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-+void lt_opt_process_env_set (const char *arg);
-+void lt_opt_process_env_prepend (const char *arg);
-+void lt_opt_process_env_append (const char *arg);
-+int lt_split_name_value (const char *arg, char** name, char** value);
-+void lt_update_exe_path (const char *name, const char *value);
-+void lt_update_lib_path (const char *name, const char *value);
-
--static const char *script_text =
-+static const char *script_text_part1 =
- EOF
-
-- func_emit_wrapper yes |
-+ func_emit_wrapper_part1 yes |
-+ $SED -e 's/\([\\"]\)/\\\1/g' \
-+ -e 's/^/ "/' -e 's/$/\\n"/'
-+ echo ";"
-+ cat <<EOF
-+
-+static const char *script_text_part2 =
-+EOF
-+ func_emit_wrapper_part2 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
-
- cat <<EOF
- const char * MAGIC_EXE = "$magic_exe";
-+const char * LIB_PATH_VARNAME = "$shlibpath_var";
-+EOF
-+
-+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+ func_to_host_pathlist "$temp_rpath"
-+ cat <<EOF
-+const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
-+EOF
-+ else
-+ cat <<"EOF"
-+const char * LIB_PATH_VALUE = "";
-+EOF
-+ fi
-+
-+ if test -n "$dllsearchpath"; then
-+ func_to_host_pathlist "$dllsearchpath:"
-+ cat <<EOF
-+const char * EXE_PATH_VARNAME = "PATH";
-+const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
-+EOF
-+ else
-+ cat <<"EOF"
-+const char * EXE_PATH_VARNAME = "";
-+const char * EXE_PATH_VALUE = "";
-+EOF
-+ fi
-+
-+ if test "$fast_install" = yes; then
-+ cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-+EOF
-+ else
-+ cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-+EOF
-+ fi
-+
-+
-+ cat <<"EOF"
-+
-+#define LTWRAPPER_OPTION_PREFIX "--lt-"
-+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
-+
-+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
-+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-+
-+static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
-+
-+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
-+ /* argument is putenv-style "foo=bar", value of foo is set to bar */
-+
-+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
-+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-+
-+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
-+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
-
- int
- main (int argc, char *argv[])
- {
- char **newargz;
-+ int newargc;
- char *tmp_pathspec;
- char *actual_cwrapper_path;
-- char *shwrapper_name;
-+ char *actual_cwrapper_name;
-+ char *target_name;
-+ char *lt_argv_zero;
- intptr_t rval = 127;
-- FILE *shwrapper;
-
-- const char *dumpscript_opt = "--lt-dump-script";
- int i;
-
- program_name = (char *) xstrdup (base_name (argv[0]));
-@@ -3099,38 +3390,14 @@
- ;;
- esac
-
-- cat <<EOF
-- printf ("%s", script_text);
-+ cat <<"EOF"
-+ printf ("%s", script_text_part1);
-+ printf ("%s", script_text_part2);
- return 0;
- }
- }
-
-- newargz = XMALLOC (char *, argc + 2);
--EOF
--
-- if test -n "$TARGETSHELL" ; then
-- # no path translation at all
-- lt_newargv0=$TARGETSHELL
-- else
-- case "$host" in
-- *mingw* )
-- # awkward: cmd appends spaces to result
-- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-- lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`
-- case $lt_newargv0 in
-- *.exe | *.EXE) ;;
-- *) lt_newargv0=$lt_newargv0.exe ;;
-- esac
-- ;;
-- * ) lt_newargv0=$SHELL ;;
-- esac
-- fi
--
-- cat <<EOF
-- newargz[0] = (char *) xstrdup ("$lt_newargv0");
--EOF
--
-- cat <<"EOF"
-+ newargz = XMALLOC (char *, argc + 1);
- tmp_pathspec = find_executable (argv[0]);
- if (tmp_pathspec == NULL)
- lt_fatal ("Couldn't find %s", argv[0]);
-@@ -3142,39 +3409,60 @@
- actual_cwrapper_path));
- XFREE (tmp_pathspec);
-
-- shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));
-- strendzap (actual_cwrapper_path, shwrapper_name);
-+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-+ strendzap (actual_cwrapper_path, actual_cwrapper_name);
-+
-+ /* wrapper name transforms */
-+ strendzap (actual_cwrapper_name, ".exe");
-+ tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-+ XFREE (actual_cwrapper_name);
-+ actual_cwrapper_name = tmp_pathspec;
-+ tmp_pathspec = 0;
-
-- /* shwrapper_name transforms */
-- strendzap (shwrapper_name, ".exe");
-- tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +
-- strlen ("_ltshwrapperTMP") + 1));
-- strcpy (tmp_pathspec, shwrapper_name);
-- strcat (tmp_pathspec, "_ltshwrapperTMP");
-- XFREE (shwrapper_name);
-- shwrapper_name = tmp_pathspec;
-+ /* target_name transforms -- use actual target program name; might have lt- prefix */
-+ target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-+ strendzap (target_name, ".exe");
-+ tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-+ XFREE (target_name);
-+ target_name = tmp_pathspec;
- tmp_pathspec = 0;
-- LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n",
-- shwrapper_name));
-+
-+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-+ target_name));
- EOF
-
- cat <<EOF
-- newargz[1] =
-+ newargz[0] =
- XMALLOC (char, (strlen (actual_cwrapper_path) +
-- strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));
-- strcpy (newargz[1], actual_cwrapper_path);
-- strcat (newargz[1], "$objdir");
-- strcat (newargz[1], "/");
-- strcat (newargz[1], shwrapper_name);
-+ strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-+ strcpy (newargz[0], actual_cwrapper_path);
-+ strcat (newargz[0], "$objdir");
-+ strcat (newargz[0], "/");
- EOF
-
-+ cat <<"EOF"
-+ /* stop here, and copy so we don't have to do this twice */
-+ tmp_pathspec = xstrdup (newargz[0]);
-+
-+ /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-+ strcat (newargz[0], actual_cwrapper_name);
-+
-+ /* DO want the lt- prefix here if it exists, so use target_name */
-+ lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-+ XFREE (tmp_pathspec);
-+ tmp_pathspec = NULL;
-+EOF
-
- case $host_os in
- mingw*)
- cat <<"EOF"
- {
- char* p;
-- while ((p = strchr (newargz[1], '\\')) != NULL)
-+ while ((p = strchr (newargz[0], '\\')) != NULL)
-+ {
-+ *p = '/';
-+ }
-+ while ((p = strchr (lt_argv_zero, '\\')) != NULL)
- {
- *p = '/';
- }
-@@ -3184,55 +3472,114 @@
- esac
-
- cat <<"EOF"
-- XFREE (shwrapper_name);
-+ XFREE (target_name);
- XFREE (actual_cwrapper_path);
-+ XFREE (actual_cwrapper_name);
-
-- /* always write in binary mode */
-- if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)
-- {
-- lt_fatal ("Could not open %s for writing", newargz[1]);
-- }
-- fprintf (shwrapper, "%s", script_text);
-- fclose (shwrapper);
--
-- make_executable (newargz[1]);
-+ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-+ lt_setenv ("DUALCASE", "1"); /* for MSK sh */
-+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-
-+ newargc=0;
- for (i = 1; i < argc; i++)
-- newargz[i + 1] = xstrdup (argv[i]);
-- newargz[argc + 1] = NULL;
-+ {
-+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-+ {
-+ if (argv[i][env_set_opt_len] == '=')
-+ {
-+ const char *p = argv[i] + env_set_opt_len + 1;
-+ lt_opt_process_env_set (p);
-+ }
-+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-+ {
-+ lt_opt_process_env_set (argv[++i]); /* don't copy */
-+ }
-+ else
-+ lt_fatal ("%s missing required argument", env_set_opt);
-+ continue;
-+ }
-+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-+ {
-+ if (argv[i][env_prepend_opt_len] == '=')
-+ {
-+ const char *p = argv[i] + env_prepend_opt_len + 1;
-+ lt_opt_process_env_prepend (p);
-+ }
-+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-+ {
-+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-+ }
-+ else
-+ lt_fatal ("%s missing required argument", env_prepend_opt);
-+ continue;
-+ }
-+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-+ {
-+ if (argv[i][env_append_opt_len] == '=')
-+ {
-+ const char *p = argv[i] + env_append_opt_len + 1;
-+ lt_opt_process_env_append (p);
-+ }
-+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-+ {
-+ lt_opt_process_env_append (argv[++i]); /* don't copy */
-+ }
-+ else
-+ lt_fatal ("%s missing required argument", env_append_opt);
-+ continue;
-+ }
-+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-+ {
-+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-+ namespace, but it is not one of the ones we know about and
-+ have already dealt with, above (inluding dump-script), then
-+ report an error. Otherwise, targets might begin to believe
-+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-+ namespace. The first time any user complains about this, we'll
-+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-+ or a configure.ac-settable value.
-+ */
-+ lt_fatal ("Unrecognized option in %s namespace: '%s'",
-+ ltwrapper_option_prefix, argv[i]);
-+ }
-+ /* otherwise ... */
-+ newargz[++newargc] = xstrdup (argv[i]);
-+ }
-+ newargz[++newargc] = NULL;
-
-- for (i = 0; i < argc + 1; i++)
-+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-+ for (i = 0; i < newargc; i++)
- {
-- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, newargz[i]));
-+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
- }
-
- EOF
-
- case $host_os in
- mingw*)
-- cat <<EOF
-+ cat <<"EOF"
- /* execv doesn't actually work on mingw as expected on unix */
-- rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);
-+ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
- if (rval == -1)
- {
- /* failed to start process */
-- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno));
-+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
- return 127;
- }
- return rval;
--}
- EOF
- ;;
- *)
-- cat <<EOF
-- execv ("$lt_newargv0", newargz);
-+ cat <<"EOF"
-+ execv (lt_argv_zero, newargz);
- return rval; /* =127, but avoids unused variable warning */
--}
- EOF
- ;;
- esac
-
- cat <<"EOF"
-+}
-
- void *
- xmalloc (size_t num)
-@@ -3506,6 +3853,177 @@
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
- va_end (ap);
- }
-+
-+void
-+lt_setenv (const char *name, const char *value)
-+{
-+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-+ (name ? name : "<NULL>"),
-+ (value ? value : "<NULL>")));
-+ {
-+#ifdef HAVE_SETENV
-+ /* always make a copy, for consistency with !HAVE_SETENV */
-+ char *str = xstrdup (value);
-+ setenv (name, str, 1);
-+#else
-+ int len = strlen (name) + 1 + strlen (value) + 1;
-+ char *str = XMALLOC (char, len);
-+ sprintf (str, "%s=%s", name, value);
-+ if (putenv (str) != EXIT_SUCCESS)
-+ {
-+ XFREE (str);
-+ }
-+#endif
-+ }
-+}
-+
-+char *
-+lt_extend_str (const char *orig_value, const char *add, int to_end)
-+{
-+ char *new_value;
-+ if (orig_value && *orig_value)
-+ {
-+ int orig_value_len = strlen (orig_value);
-+ int add_len = strlen (add);
-+ new_value = XMALLOC (char, add_len + orig_value_len + 1);
-+ if (to_end)
-+ {
-+ strcpy (new_value, orig_value);
-+ strcpy (new_value + orig_value_len, add);
-+ }
-+ else
-+ {
-+ strcpy (new_value, add);
-+ strcpy (new_value + add_len, orig_value);
-+ }
-+ }
-+ else
-+ {
-+ new_value = xstrdup (add);
-+ }
-+ return new_value;
-+}
-+
-+int
-+lt_split_name_value (const char *arg, char** name, char** value)
-+{
-+ const char *p;
-+ int len;
-+ if (!arg || !*arg)
-+ return 1;
-+
-+ p = strchr (arg, (int)'=');
-+
-+ if (!p)
-+ return 1;
-+
-+ *value = xstrdup (++p);
-+
-+ len = strlen (arg) - strlen (*value);
-+ *name = XMALLOC (char, len);
-+ strncpy (*name, arg, len-1);
-+ (*name)[len - 1] = '\0';
-+
-+ return 0;
-+}
-+
-+void
-+lt_opt_process_env_set (const char *arg)
-+{
-+ char *name = NULL;
-+ char *value = NULL;
-+
-+ if (lt_split_name_value (arg, &name, &value) != 0)
-+ {
-+ XFREE (name);
-+ XFREE (value);
-+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-+ }
-+
-+ lt_setenv (name, value);
-+ XFREE (name);
-+ XFREE (value);
-+}
-+
-+void
-+lt_opt_process_env_prepend (const char *arg)
-+{
-+ char *name = NULL;
-+ char *value = NULL;
-+ char *new_value = NULL;
-+
-+ if (lt_split_name_value (arg, &name, &value) != 0)
-+ {
-+ XFREE (name);
-+ XFREE (value);
-+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-+ }
-+
-+ new_value = lt_extend_str (getenv (name), value, 0);
-+ lt_setenv (name, new_value);
-+ XFREE (new_value);
-+ XFREE (name);
-+ XFREE (value);
-+}
-+
-+void
-+lt_opt_process_env_append (const char *arg)
-+{
-+ char *name = NULL;
-+ char *value = NULL;
-+ char *new_value = NULL;
-+
-+ if (lt_split_name_value (arg, &name, &value) != 0)
-+ {
-+ XFREE (name);
-+ XFREE (value);
-+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-+ }
-+
-+ new_value = lt_extend_str (getenv (name), value, 1);
-+ lt_setenv (name, new_value);
-+ XFREE (new_value);
-+ XFREE (name);
-+ XFREE (value);
-+}
-+
-+void
-+lt_update_exe_path (const char *name, const char *value)
-+{
-+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-+ (name ? name : "<NULL>"),
-+ (value ? value : "<NULL>")));
-+
-+ if (name && *name && value && *value)
-+ {
-+ char *new_value = lt_extend_str (getenv (name), value, 0);
-+ /* some systems can't cope with a ':'-terminated path #' */
-+ int len = strlen (new_value);
-+ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-+ {
-+ new_value[len-1] = '\0';
-+ }
-+ lt_setenv (name, new_value);
-+ XFREE (new_value);
-+ }
-+}
-+
-+void
-+lt_update_lib_path (const char *name, const char *value)
-+{
-+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-+ (name ? name : "<NULL>"),
-+ (value ? value : "<NULL>")));
-+
-+ if (name && *name && value && *value)
-+ {
-+ char *new_value = lt_extend_str (getenv (name), value, 0);
-+ lt_setenv (name, new_value);
-+ XFREE (new_value);
-+ }
-+}
-+
-+
- EOF
- }
- # end: func_emit_cwrapperexe_src
-@@ -3515,7 +4033,7 @@
- {
- $opt_debug
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- # It is impossible to link a dll without this setting, and
- # we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
-@@ -3959,6 +4477,13 @@
- -L*)
- func_stripname '-L' '' "$arg"
- dir=$func_stripname_result
-+ if test -z "$dir"; then
-+ if test "$#" -gt 0; then
-+ func_fatal_error "require no space between \`-L' and \`$1'"
-+ else
-+ func_fatal_error "need path for \`-L' option"
-+ fi
-+ fi
- # We need an absolute path.
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -3977,14 +4502,16 @@
- ;;
+ package_revision=1.3017
+
+@@ -5033,7 +5033,10 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
esac
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
- case :$dllsearchpath: in
- *":$dir:"*) ;;
-+ ::) dllsearchpath=$dir;;
- *) dllsearchpath="$dllsearchpath:$dir";;
- esac
- case :$dllsearchpath: in
- *":$testbindir:"*) ;;
-+ ::) dllsearchpath=$testbindir;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
- esac
- ;;
-@@ -3995,7 +4522,7 @@
- -l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
- # These systems don't actually have a C or math library (as such)
- continue
- ;;
-@@ -4072,7 +4599,7 @@
-
- -no-install)
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
- # The PATH hackery in wrapper scripts is required on Windows
- # and Darwin in order for the loader to find any dlls it needs.
- func_warning "\`-no-install' is ignored for $host"
-@@ -4820,19 +5347,19 @@
+ fi
+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+@@ -5344,19 +5347,19 @@
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -7301,25 +7165,7 @@
continue
fi # $pass = conv
-@@ -5032,7 +5559,7 @@
- if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
- case $host in
-- *cygwin* | *mingw*)
-+ *cygwin* | *mingw* | *cegcc*)
- # No point in relinking DLLs because paths are not encoded
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=no
-@@ -5102,7 +5629,7 @@
- elif test -n "$soname_spec"; then
- # bleh windows
- case $host in
-- *cygwin* | mingw*)
-+ *cygwin* | mingw* | *cegcc*)
- func_arith $current - $age
- major=$func_arith_result
- versuffix="-$major"
-@@ -5369,6 +5896,7 @@
+@@ -5893,6 +5896,7 @@
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
@@ -7327,219 +7173,65 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-@@ -5884,7 +6412,7 @@
- tempremovelist=`$ECHO "$output_objdir/*"`
- for p in $tempremovelist; do
- case $p in
-- *.$objext)
-+ *.$objext | *.gcno)
- ;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
-@@ -5955,7 +6483,7 @@
- if test "$build_libtool_libs" = yes; then
- if test -n "$rpath"; then
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
- # these systems don't actually have a c library (as such)!
+@@ -6206,6 +6210,9 @@
+ revision="$number_minor"
+ lt_irix_increment=no
;;
- *-*-rhapsody* | *-*-darwin1.[012])
-@@ -6454,7 +6982,7 @@
-
- orig_export_symbols=
- case $host_os in
-- cygwin* | mingw*)
-+ cygwin* | mingw* | cegcc*)
- if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
- # exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-@@ -7079,14 +7607,16 @@
- esac
- fi
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
- case :$dllsearchpath: in
- *":$libdir:"*) ;;
-+ ::) dllsearchpath=$libdir;;
- *) dllsearchpath="$dllsearchpath:$libdir";;
- esac
- case :$dllsearchpath: in
- *":$testbindir:"*) ;;
-+ ::) dllsearchpath=$testbindir;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
++ *)
++ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
++ ;;
esac
;;
-@@ -7156,6 +7686,10 @@
- wrappers_required=no
- fi
- ;;
-+ *cegcc)
-+ # Disable wrappers for cegcc, we are cross compiling anyway.
-+ wrappers_required=no
-+ ;;
- *)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
-@@ -7308,11 +7842,10 @@
-
- func_emit_cwrapperexe_src > $cwrappersource
-
-- # we should really use a build-platform specific compiler
-- # here, but OTOH, the wrappers (shell script and this C one)
-- # are only useful if you want to execute the "real" binary.
-- # Since the "real" binary is built for $host, then this
-- # wrapper might as well be built for $host, too.
-+ # The wrapper executable is built using the $host compiler,
-+ # because it contains $host paths and files. If cross-
-+ # compiling, it, like the target executable, must be
-+ # executed on the $host or under an emulation environment.
- $opt_dry_run || {
- $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
- $STRIP $cwrapper
-@@ -7597,7 +8130,7 @@
- # place dlname in correct position for cygwin
- tdlname=$dlname
- case $host,$output,$installed,$module,$dlname in
-- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
- esac
- $ECHO > $output "\
- # $outputname - a libtool library file
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/Makefile.in vte-0.24.1/Makefile.in
---- vte-0.24.1.old/Makefile.in 2010-04-26 13:09:04.000000000 +0200
-+++ vte-0.24.1/Makefile.in 2010-05-03 20:15:32.867110377 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -215,6 +215,7 @@
- MSGMERGE = @MSGMERGE@
- NM = @NM@
- NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
-@@ -449,7 +450,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -474,7 +475,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -638,7 +639,8 @@
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ || find "$(distdir)" -type d ! -perm -755 \
-+ -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -681,17 +683,17 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/perf/Makefile.in vte-0.24.1/perf/Makefile.in
---- vte-0.24.1.old/perf/Makefile.in 2010-04-26 13:09:02.000000000 +0200
-+++ vte-0.24.1/perf/Makefile.in 2010-05-03 20:15:32.163108194 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -132,6 +132,7 @@
- MSGMERGE = @MSGMERGE@
- NM = @NM@
- NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/python/Makefile.in vte-0.24.1/python/Makefile.in
---- vte-0.24.1.old/python/Makefile.in 2010-04-26 13:09:02.000000000 +0200
-+++ vte-0.24.1/python/Makefile.in 2010-05-03 20:15:32.259111740 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -203,6 +203,7 @@
- MSGMERGE = @MSGMERGE@
- NM = @NM@
- NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/src/Makefile.in vte-0.24.1/src/Makefile.in
---- vte-0.24.1.old/src/Makefile.in 2010-04-26 13:09:04.000000000 +0200
-+++ vte-0.24.1/src/Makefile.in 2010-05-03 20:15:32.699106487 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -324,6 +324,7 @@
- MSGMERGE = @MSGMERGE@
- NM = @NM@
- NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
-diff '-x*config.guess' '-x*config.sub' -Naur vte-0.24.1.old/termcaps/Makefile.in vte-0.24.1/termcaps/Makefile.in
---- vte-0.24.1.old/termcaps/Makefile.in 2010-04-26 13:09:04.000000000 +0200
-+++ vte-0.24.1/termcaps/Makefile.in 2010-05-03 20:15:32.787110620 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -157,6 +157,7 @@
- MSGMERGE = @MSGMERGE@
- NM = @NM@
- NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
+ no)
+Index: vte-0.24.3/perf/Makefile.in
+===================================================================
+--- vte-0.24.3.orig/perf/Makefile.in 2010-07-15 20:28:27.837801155 +0200
++++ vte-0.24.3/perf/Makefile.in 2010-07-15 20:28:18.377785068 +0200
+@@ -145,6 +145,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: vte-0.24.3/python/Makefile.in
+===================================================================
+--- vte-0.24.3.orig/python/Makefile.in 2010-07-15 20:28:26.153801011 +0200
++++ vte-0.24.3/python/Makefile.in 2010-07-15 20:28:18.461784708 +0200
+@@ -216,6 +216,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: vte-0.24.3/src/Makefile.in
+===================================================================
+--- vte-0.24.3.orig/src/Makefile.in 2010-07-15 20:28:26.809789076 +0200
++++ vte-0.24.3/src/Makefile.in 2010-07-15 20:28:18.877786050 +0200
+@@ -337,6 +337,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: vte-0.24.3/termcaps/Makefile.in
+===================================================================
+--- vte-0.24.3.orig/termcaps/Makefile.in 2010-07-15 20:28:26.573786238 +0200
++++ vte-0.24.3/termcaps/Makefile.in 2010-07-15 20:28:18.933786041 +0200
+@@ -170,6 +170,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
More information about the pkg-gnome-commits
mailing list