[SCM] saga branch, master, updated. 910347419afce9d900616c2ba720289357216f03
Francesco Paolo Lovergine
frankie at debian.org
Mon Jan 9 13:30:34 UTC 2012
The following commit has been merged in the master branch:
commit f89946350dfc12bbf7348dbfbd4292474307e3f0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Mon Jan 9 14:11:51 2012 +0100
Refreshed autoreconf patch.
diff --git a/debian/patches/0005-autoreconf-fi.patch b/debian/patches/0005-autoreconf-fi.patch
index 2ac0061..14d6828 100644
--- a/debian/patches/0005-autoreconf-fi.patch
+++ b/debian/patches/0005-autoreconf-fi.patch
@@ -123,11 +123,11 @@ Subject: autoreconf -fi
117 files changed, 7196 insertions(+), 4811 deletions(-)
mode change 100755 => 100644 ltmain.sh
-diff --git a/Makefile.in b/Makefile.in
-index 8200f70..17b99b6 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/Makefile.in
+===================================================================
+--- saga.orig/Makefile.in 2012-01-09 14:09:39.000000000 +0100
++++ saga/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -130,6 +130,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -135,7 +135,7 @@ index 8200f70..17b99b6 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -156,6 +157,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -143,7 +143,7 @@ index 8200f70..17b99b6 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -151,7 +151,7 @@ index 8200f70..17b99b6 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@ libdir = @libdir@
+@@ -227,7 +230,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -159,10 +159,10 @@ index 8200f70..17b99b6 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/aclocal.m4 b/aclocal.m4
-index c36d800..ba0eced 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
+Index: saga/aclocal.m4
+===================================================================
+--- saga.orig/aclocal.m4 2012-01-09 14:09:39.000000000 +0100
++++ saga/aclocal.m4 2012-01-09 14:10:07.000000000 +0100
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -174,10 +174,10 @@ index c36d800..ba0eced 100644
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'.])])
-diff --git a/configure b/configure
-index 6f0f083..8e6a822 100755
---- a/configure
-+++ b/configure
+Index: saga/configure
+===================================================================
+--- saga.orig/configure 2012-01-09 14:09:39.000000000 +0100
++++ saga/configure 2012-01-09 14:10:07.000000000 +0100
@@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -195,7 +195,7 @@ index 6f0f083..8e6a822 100755
#
#
# This configure script is free software; the Free Software Foundation
-@@ -91,6 +91,7 @@ fi
+@@ -91,6 +91,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -203,7 +203,7 @@ index 6f0f083..8e6a822 100755
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -173,6 +174,14 @@ test x\$exitcode = x0 || exit 1"
+@@ -173,6 +174,14 @@
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
@@ -218,7 +218,7 @@ index 6f0f083..8e6a822 100755
test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
-@@ -216,11 +225,18 @@ IFS=$as_save_IFS
+@@ -216,11 +225,18 @@
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
@@ -238,7 +238,7 @@ index 6f0f083..8e6a822 100755
fi
if test x$as_have_required = xno; then :
-@@ -319,7 +335,7 @@ $as_echo X"$as_dir" |
+@@ -319,7 +335,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -247,7 +247,7 @@ index 6f0f083..8e6a822 100755
} # as_fn_mkdir_p
-@@ -359,19 +375,19 @@ else
+@@ -359,19 +375,19 @@
fi # as_fn_arith
@@ -275,7 +275,7 @@ index 6f0f083..8e6a822 100755
as_fn_exit $as_status
} # as_fn_error
-@@ -528,161 +544,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -528,161 +544,14 @@
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -438,7 +438,7 @@ index 6f0f083..8e6a822 100755
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-@@ -795,9 +664,11 @@ OTOOL
+@@ -795,9 +664,11 @@
LIPO
NMEDIT
DSYMUTIL
@@ -451,7 +451,7 @@ index 6f0f083..8e6a822 100755
OBJDUMP
LN_S
NM
-@@ -909,6 +780,7 @@ enable_static
+@@ -909,6 +780,7 @@
with_pic
enable_fast_install
with_gnu_ld
@@ -459,7 +459,7 @@ index 6f0f083..8e6a822 100755
enable_libtool_lock
with_local
enable_debug
-@@ -993,8 +865,9 @@ do
+@@ -993,8 +865,9 @@
fi
case $ac_option in
@@ -471,7 +471,7 @@ index 6f0f083..8e6a822 100755
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1039,7 +912,7 @@ do
+@@ -1039,7 +912,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -480,7 +480,7 @@ index 6f0f083..8e6a822 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1065,7 +938,7 @@ do
+@@ -1065,7 +938,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -489,7 +489,7 @@ index 6f0f083..8e6a822 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1269,7 +1142,7 @@ do
+@@ -1269,7 +1142,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -498,7 +498,7 @@ index 6f0f083..8e6a822 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1285,7 +1158,7 @@ do
+@@ -1285,7 +1158,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -507,7 +507,7 @@ index 6f0f083..8e6a822 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1315,8 +1188,8 @@ do
+@@ -1315,8 +1188,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -518,7 +518,7 @@ index 6f0f083..8e6a822 100755
;;
*=*)
-@@ -1324,7 +1197,7 @@ Try \`$0 --help' for more information."
+@@ -1324,7 +1197,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
@@ -527,7 +527,7 @@ index 6f0f083..8e6a822 100755
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1334,7 +1207,7 @@ Try \`$0 --help' for more information."
+@@ -1334,7 +1207,7 @@
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
@@ -536,7 +536,7 @@ index 6f0f083..8e6a822 100755
;;
esac
-@@ -1342,13 +1215,13 @@ done
+@@ -1342,13 +1215,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -552,7 +552,7 @@ index 6f0f083..8e6a822 100755
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1371,7 +1244,7 @@ do
+@@ -1371,7 +1244,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -561,7 +561,7 @@ index 6f0f083..8e6a822 100755
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1385,8 +1258,8 @@ target=$target_alias
+@@ -1385,8 +1258,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -572,7 +572,7 @@ index 6f0f083..8e6a822 100755
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1401,9 +1274,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1401,9 +1274,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -584,7 +584,7 @@ index 6f0f083..8e6a822 100755
# Find the source files, if location was not specified.
-@@ -1442,11 +1315,11 @@ else
+@@ -1442,11 +1315,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -598,7 +598,7 @@ index 6f0f083..8e6a822 100755
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1486,7 +1359,7 @@ Configuration:
+@@ -1486,7 +1359,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
@@ -607,7 +607,7 @@ index 6f0f083..8e6a822 100755
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
-@@ -1566,9 +1439,11 @@ Optional Features:
+@@ -1566,9 +1439,11 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -620,7 +620,7 @@ index 6f0f083..8e6a822 100755
--with-local=dir search /usr/local or other directory for includes and libs
Some influential environment variables:
-@@ -1655,9 +1530,9 @@ test -n "$ac_init_help" && exit $ac_status
+@@ -1655,9 +1530,9 @@
if $ac_init_version; then
cat <<\_ACEOF
saga configure 2.0.8
@@ -632,7 +632,7 @@ index 6f0f083..8e6a822 100755
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
-@@ -1701,7 +1576,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1701,7 +1576,7 @@
ac_retval=1
fi
@@ -641,7 +641,7 @@ index 6f0f083..8e6a822 100755
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
-@@ -1739,7 +1614,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1739,7 +1614,7 @@
ac_retval=1
fi
@@ -650,7 +650,7 @@ index 6f0f083..8e6a822 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
-@@ -1785,7 +1660,7 @@ fi
+@@ -1785,7 +1660,7 @@
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
@@ -659,7 +659,7 @@ index 6f0f083..8e6a822 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
-@@ -1799,7 +1674,7 @@ ac_fn_c_check_header_compile ()
+@@ -1799,7 +1674,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -668,7 +668,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1817,7 +1692,7 @@ fi
+@@ -1817,7 +1692,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -677,7 +677,7 @@ index 6f0f083..8e6a822 100755
} # ac_fn_c_check_header_compile
-@@ -1842,7 +1717,7 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -1842,7 +1717,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -686,7 +686,7 @@ index 6f0f083..8e6a822 100755
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -1853,7 +1728,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1853,7 +1728,7 @@
ac_retval=1
fi
@@ -695,7 +695,7 @@ index 6f0f083..8e6a822 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
-@@ -1895,7 +1770,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1895,7 +1770,7 @@
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
@@ -704,7 +704,7 @@ index 6f0f083..8e6a822 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
-@@ -1908,7 +1783,7 @@ ac_fn_c_check_func ()
+@@ -1908,7 +1783,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -713,7 +713,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1963,7 +1838,7 @@ fi
+@@ -1963,7 +1838,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -722,7 +722,7 @@ index 6f0f083..8e6a822 100755
} # ac_fn_c_check_func
-@@ -1988,7 +1863,7 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -1988,7 +1863,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -731,7 +731,7 @@ index 6f0f083..8e6a822 100755
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -1999,7 +1874,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1999,7 +1874,7 @@
ac_retval=1
fi
@@ -740,7 +740,7 @@ index 6f0f083..8e6a822 100755
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_cpp
-@@ -2045,7 +1920,7 @@ fi
+@@ -2045,7 +1920,7 @@
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
@@ -749,7 +749,7 @@ index 6f0f083..8e6a822 100755
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
-@@ -2058,10 +1933,10 @@ fi
+@@ -2058,10 +1933,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -762,7 +762,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
-@@ -2097,7 +1972,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -2097,7 +1972,7 @@
else
ac_header_preproc=no
fi
@@ -771,7 +771,7 @@ index 6f0f083..8e6a822 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
-@@ -2120,17 +1995,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+@@ -2120,17 +1995,15 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
@@ -792,7 +792,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
-@@ -2139,7 +2012,7 @@ eval ac_res=\$$3
+@@ -2139,7 +2012,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
@@ -801,7 +801,7 @@ index 6f0f083..8e6a822 100755
} # ac_fn_c_check_header_mongrel
-@@ -2152,7 +2025,7 @@ ac_fn_c_check_type ()
+@@ -2152,7 +2025,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -810,7 +810,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
eval "$3=no"
-@@ -2193,7 +2066,7 @@ fi
+@@ -2193,7 +2066,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -819,7 +819,7 @@ index 6f0f083..8e6a822 100755
} # ac_fn_c_check_type
cat >config.log <<_ACEOF
-@@ -2201,7 +2074,7 @@ This file contains any messages produced by compilers while
+@@ -2201,7 +2074,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by saga $as_me 2.0.8, which was
@@ -828,7 +828,7 @@ index 6f0f083..8e6a822 100755
$ $0 $@
-@@ -2311,11 +2184,9 @@ trap 'exit_status=$?
+@@ -2311,11 +2184,9 @@
{
echo
@@ -842,7 +842,7 @@ index 6f0f083..8e6a822 100755
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -2349,11 +2220,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+@@ -2349,11 +2220,9 @@
)
echo
@@ -856,7 +856,7 @@ index 6f0f083..8e6a822 100755
echo
for ac_var in $ac_subst_vars
do
-@@ -2366,11 +2235,9 @@ _ASBOX
+@@ -2366,11 +2235,9 @@
echo
if test -n "$ac_subst_files"; then
@@ -870,7 +870,7 @@ index 6f0f083..8e6a822 100755
echo
for ac_var in $ac_subst_files
do
-@@ -2384,11 +2251,9 @@ _ASBOX
+@@ -2384,11 +2251,9 @@
fi
if test -s confdefs.h; then
@@ -884,7 +884,7 @@ index 6f0f083..8e6a822 100755
echo
cat confdefs.h
echo
-@@ -2443,7 +2308,12 @@ _ACEOF
+@@ -2443,7 +2308,12 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
@@ -898,7 +898,7 @@ index 6f0f083..8e6a822 100755
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
-@@ -2458,7 +2328,11 @@ do
+@@ -2458,7 +2328,11 @@
{ $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
@@ -911,7 +911,7 @@ index 6f0f083..8e6a822 100755
fi
done
-@@ -2534,7 +2408,7 @@ if $ac_cache_corrupted; then
+@@ -2534,7 +2408,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
@@ -920,7 +920,7 @@ index 6f0f083..8e6a822 100755
fi
## -------------------- ##
## Main body of script. ##
-@@ -2555,16 +2429,22 @@ am__api_version='1.11'
+@@ -2555,16 +2429,22 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -951,7 +951,7 @@ index 6f0f083..8e6a822 100755
fi
# These three variables are undocumented and unsupported,
-@@ -2593,7 +2473,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+@@ -2593,7 +2473,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
@@ -960,7 +960,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2680,11 +2560,11 @@ am_lf='
+@@ -2680,11 +2560,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -974,7 +974,7 @@ index 6f0f083..8e6a822 100755
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2706,7 +2586,7 @@ if (
+@@ -2706,7 +2586,7 @@
# 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".
@@ -983,7 +983,7 @@ index 6f0f083..8e6a822 100755
alias in your environment" "$LINENO" 5
fi
-@@ -2716,7 +2596,7 @@ then
+@@ -2716,7 +2596,7 @@
# Ok.
:
else
@@ -992,7 +992,7 @@ index 6f0f083..8e6a822 100755
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -2770,7 +2650,7 @@ if test "$cross_compiling" != no; then
+@@ -2770,7 +2650,7 @@
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1001,7 +1001,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2810,7 +2690,7 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2810,7 +2690,7 @@
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1010,7 +1010,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2863,7 +2743,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+@@ -2863,7 +2743,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
@@ -1019,7 +1019,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2914,7 +2794,7 @@ do
+@@ -2914,7 +2794,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1028,7 +1028,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2954,7 +2834,7 @@ done
+@@ -2954,7 +2834,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
@@ -1037,7 +1037,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2962,7 +2842,7 @@ SHELL = /bin/sh
+@@ -2962,7 +2842,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
@@ -1046,7 +1046,7 @@ index 6f0f083..8e6a822 100755
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -2996,7 +2876,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+@@ -2996,7 +2876,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -1055,7 +1055,7 @@ index 6f0f083..8e6a822 100755
fi
fi
-@@ -3120,7 +3000,7 @@ do
+@@ -3120,7 +3000,7 @@
done
rm -rf conftest.dir
@@ -1064,7 +1064,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
am_cv_prog_tar_ustar=$_am_tool
-@@ -3151,7 +3031,7 @@ if test -z "$CXX"; then
+@@ -3151,7 +3031,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1073,7 +1073,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -3195,7 +3075,7 @@ do
+@@ -3195,7 +3075,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1082,7 +1082,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -3358,9 +3238,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3358,9 +3238,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1094,7 +1094,7 @@ index 6f0f083..8e6a822 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3402,8 +3281,8 @@ done
+@@ -3402,8 +3281,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1105,7 +1105,7 @@ index 6f0f083..8e6a822 100755
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3460,9 +3339,9 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -3460,9 +3339,9 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1117,7 +1117,7 @@ index 6f0f083..8e6a822 100755
fi
fi
fi
-@@ -3473,7 +3352,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+@@ -3473,7 +3352,7 @@
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
@@ -1126,7 +1126,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3513,8 +3392,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3513,8 +3392,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1137,7 +1137,7 @@ index 6f0f083..8e6a822 100755
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -3524,7 +3403,7 @@ OBJEXT=$ac_cv_objext
+@@ -3524,7 +3403,7 @@
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
@@ -1146,7 +1146,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3561,7 +3440,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
+@@ -3561,7 +3440,7 @@
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
@@ -1155,7 +1155,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-@@ -3709,7 +3588,7 @@ depcc="$CXX" am_compiler_list=
+@@ -3709,7 +3588,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
@@ -1164,7 +1164,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3842,7 +3721,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -3842,7 +3721,7 @@
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1173,7 +1173,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3882,7 +3761,7 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -3882,7 +3761,7 @@
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1182,7 +1182,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3935,7 +3814,7 @@ if test -z "$CC"; then
+@@ -3935,7 +3814,7 @@
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1191,7 +1191,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3975,7 +3854,7 @@ if test -z "$CC"; then
+@@ -3975,7 +3854,7 @@
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1200,7 +1200,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4034,7 +3913,7 @@ if test -z "$CC"; then
+@@ -4034,7 +3913,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1209,7 +1209,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4078,7 +3957,7 @@ do
+@@ -4078,7 +3957,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1218,7 +1218,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4132,8 +4011,8 @@ fi
+@@ -4132,8 +4011,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1229,7 +1229,7 @@ index 6f0f083..8e6a822 100755
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4162,7 +4041,7 @@ done
+@@ -4162,7 +4041,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
@@ -1238,7 +1238,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4199,7 +4078,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+@@ -4199,7 +4078,7 @@
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
@@ -1247,7 +1247,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -4277,7 +4156,7 @@ else
+@@ -4277,7 +4156,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
@@ -1256,7 +1256,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
-@@ -4376,7 +4255,7 @@ depcc="$CC" am_compiler_list=
+@@ -4376,7 +4255,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
@@ -1265,7 +1265,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4508,8 +4387,8 @@ esac
+@@ -4508,8 +4387,8 @@
@@ -1276,7 +1276,7 @@ index 6f0f083..8e6a822 100755
-@@ -4527,27 +4406,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -4527,27 +4406,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -1309,7 +1309,7 @@ index 6f0f083..8e6a822 100755
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -4565,14 +4444,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+@@ -4565,14 +4444,14 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
@@ -1326,7 +1326,7 @@ index 6f0f083..8e6a822 100755
fi
fi
-@@ -4580,7 +4459,7 @@ fi
+@@ -4580,7 +4459,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
@@ -1335,7 +1335,7 @@ index 6f0f083..8e6a822 100755
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -4596,9 +4475,78 @@ IFS=$ac_save_IFS
+@@ -4596,9 +4475,78 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -1415,7 +1415,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4653,7 +4601,7 @@ esac
+@@ -4653,7 +4601,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
@@ -1424,7 +1424,7 @@ index 6f0f083..8e6a822 100755
fi
else
ac_cv_path_SED=$SED
-@@ -4680,7 +4628,7 @@ Xsed="$SED -e 1s/^X//"
+@@ -4680,7 +4628,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
@@ -1433,7 +1433,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4729,7 +4677,7 @@ esac
+@@ -4729,7 +4677,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
@@ -1442,7 +1442,7 @@ index 6f0f083..8e6a822 100755
fi
else
ac_cv_path_GREP=$GREP
-@@ -4743,7 +4691,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
+@@ -4743,7 +4691,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
@@ -1451,7 +1451,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4795,7 +4743,7 @@ esac
+@@ -4795,7 +4743,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
@@ -1460,7 +1460,7 @@ index 6f0f083..8e6a822 100755
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4810,7 +4758,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+@@ -4810,7 +4758,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
@@ -1469,7 +1469,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4862,7 +4810,7 @@ esac
+@@ -4862,7 +4810,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
@@ -1478,7 +1478,7 @@ index 6f0f083..8e6a822 100755
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4941,7 +4889,7 @@ else
+@@ -4941,7 +4889,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
@@ -1487,7 +1487,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4978,10 +4926,10 @@ else
+@@ -4978,10 +4926,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -1500,7 +1500,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -5008,7 +4956,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -5008,7 +4956,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
@@ -1509,7 +1509,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -5061,14 +5009,17 @@ if test "$lt_cv_path_NM" != "no"; then
+@@ -5061,14 +5009,17 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -1530,7 +1530,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -5106,13 +5057,13 @@ fi
+@@ -5106,13 +5057,13 @@
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -1546,7 +1546,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -5161,6 +5112,15 @@ esac
+@@ -5161,6 +5112,15 @@
fi
fi
@@ -1562,7 +1562,7 @@ index 6f0f083..8e6a822 100755
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -5175,18 +5135,18 @@ test -z "$NM" && NM=nm
+@@ -5175,18 +5135,18 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
@@ -1585,7 +1585,7 @@ index 6f0f083..8e6a822 100755
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5210,7 +5170,7 @@ fi
+@@ -5210,7 +5170,7 @@
# find the maximum length of command line arguments
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
@@ -1594,7 +1594,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
i=0
-@@ -5243,6 +5203,11 @@ else
+@@ -5243,6 +5203,11 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -1606,7 +1606,7 @@ index 6f0f083..8e6a822 100755
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -5268,6 +5233,11 @@ else
+@@ -5268,6 +5233,11 @@
lt_cv_sys_max_cmd_len=196608
;;
@@ -1618,7 +1618,7 @@ index 6f0f083..8e6a822 100755
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-@@ -5307,8 +5277,8 @@ else
+@@ -5307,8 +5277,8 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
@@ -1629,7 +1629,7 @@ index 6f0f083..8e6a822 100755
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -5350,8 +5320,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
+@@ -5350,8 +5320,8 @@
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
@@ -1640,7 +1640,7 @@ index 6f0f083..8e6a822 100755
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-@@ -5400,9 +5370,83 @@ esac
+@@ -5400,9 +5370,83 @@
@@ -1725,7 +1725,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
-@@ -5416,6 +5460,11 @@ case $reload_flag in
+@@ -5416,6 +5460,11 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
@@ -1737,7 +1737,7 @@ index 6f0f083..8e6a822 100755
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -5438,7 +5487,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -5438,7 +5487,7 @@
set dummy ${ac_tool_prefix}objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1746,7 +1746,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5478,7 +5527,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -5478,7 +5527,7 @@
set dummy objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -1755,7 +1755,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5537,7 +5586,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -5537,7 +5586,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
@@ -1764,7 +1764,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5579,16 +5628,18 @@ mingw* | pw32*)
+@@ -5579,16 +5628,18 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -1786,7 +1786,7 @@ index 6f0f083..8e6a822 100755
# 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'
-@@ -5618,6 +5669,10 @@ gnu*)
+@@ -5618,6 +5669,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1797,7 +1797,7 @@ index 6f0f083..8e6a822 100755
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -5626,11 +5681,11 @@ hpux10.20* | hpux11*)
+@@ -5626,11 +5681,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -1811,7 +1811,7 @@ index 6f0f083..8e6a822 100755
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -5651,7 +5706,7 @@ irix5* | irix6* | nonstopux*)
+@@ -5651,7 +5706,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1820,7 +1820,7 @@ index 6f0f083..8e6a822 100755
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5733,6 +5788,21 @@ esac
+@@ -5733,6 +5788,21 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -1842,7 +1842,7 @@ index 6f0f083..8e6a822 100755
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -5748,16 +5818,26 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -5748,16 +5818,26 @@
@@ -1874,7 +1874,7 @@ index 6f0f083..8e6a822 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5766,7 +5846,7 @@ do
+@@ -5766,7 +5846,7 @@
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
@@ -1883,7 +1883,7 @@ index 6f0f083..8e6a822 100755
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5776,10 +5856,10 @@ IFS=$as_save_IFS
+@@ -5776,10 +5856,10 @@
fi
fi
@@ -1898,7 +1898,7 @@ index 6f0f083..8e6a822 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -5787,17 +5867,17 @@ fi
+@@ -5787,17 +5867,17 @@
fi
@@ -1923,7 +1923,7 @@ index 6f0f083..8e6a822 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5806,7 +5886,7 @@ do
+@@ -5806,7 +5886,7 @@
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
@@ -1932,7 +1932,7 @@ index 6f0f083..8e6a822 100755
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5816,17 +5896,17 @@ IFS=$as_save_IFS
+@@ -5816,17 +5896,17 @@
fi
fi
@@ -1956,7 +1956,7 @@ index 6f0f083..8e6a822 100755
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -5834,18 +5914,55 @@ yes:)
+@@ -5834,19 +5914,56 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -1976,7 +1976,7 @@ index 6f0f083..8e6a822 100755
+
+
+
-+
+
@@ -2013,10 +2013,11 @@ index 6f0f083..8e6a822 100755
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
++
-@@ -5854,15 +5971,17 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -5854,15 +5971,17 @@
if test -n "$ac_tool_prefix"; then
@@ -2039,7 +2040,7 @@ index 6f0f083..8e6a822 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5871,7 +5990,7 @@ do
+@@ -5871,7 +5990,7 @@
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
@@ -2048,7 +2049,7 @@ index 6f0f083..8e6a822 100755
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5881,28 +6000,32 @@ IFS=$as_save_IFS
+@@ -5881,28 +6000,197 @@
fi
fi
@@ -2089,14 +2090,14 @@ index 6f0f083..8e6a822 100755
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -5911,7 +6034,172 @@ do
- 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_STRIP="strip"
++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_AR="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -2254,19 +2255,10 @@ index 6f0f083..8e6a822 100755
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_STRIP="strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -5957,7 +6245,7 @@ if test -n "$ac_tool_prefix"; then
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -5957,7 +6245,7 @@
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2275,7 +2267,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5997,7 +6285,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -5997,7 +6285,7 @@
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2284,7 +2276,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -6059,15 +6347,27 @@ old_postuninstall_cmds=
+@@ -6059,15 +6347,27 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -2315,7 +2307,7 @@ index 6f0f083..8e6a822 100755
-@@ -6114,7 +6414,7 @@ compiler=$CC
+@@ -6114,7 +6414,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
@@ -2324,7 +2316,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
-@@ -6175,8 +6475,8 @@ esac
+@@ -6175,8 +6475,8 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
@@ -2335,7 +2327,7 @@ index 6f0f083..8e6a822 100755
# Handle CRLF in mingw tool chain
opt_cr=
-@@ -6200,6 +6500,7 @@ for ac_symprfx in "" "_"; do
+@@ -6200,6 +6500,7 @@
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
@@ -2343,7 +2335,7 @@ index 6f0f083..8e6a822 100755
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-@@ -6212,6 +6513,7 @@ for ac_symprfx in "" "_"; do
+@@ -6212,6 +6513,7 @@
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
@@ -2351,7 +2343,7 @@ index 6f0f083..8e6a822 100755
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -6237,8 +6539,8 @@ _LT_EOF
+@@ -6237,8 +6539,8 @@
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -2362,7 +2354,7 @@ index 6f0f083..8e6a822 100755
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -6253,6 +6555,18 @@ _LT_EOF
+@@ -6253,6 +6555,18 @@
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
@@ -2381,7 +2373,7 @@ index 6f0f083..8e6a822 100755
#ifdef __cplusplus
extern "C" {
#endif
-@@ -6264,7 +6578,7 @@ _LT_EOF
+@@ -6264,7 +6578,7 @@
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
@@ -2390,7 +2382,7 @@ index 6f0f083..8e6a822 100755
const char *name;
void *address;
}
-@@ -6290,8 +6604,8 @@ static const void *lt_preloaded_setup() {
+@@ -6290,8 +6604,8 @@
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
@@ -2401,7 +2393,7 @@ index 6f0f083..8e6a822 100755
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -6301,8 +6615,8 @@ _LT_EOF
+@@ -6301,8 +6615,8 @@
test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
@@ -2412,7 +2404,7 @@ index 6f0f083..8e6a822 100755
else
echo "cannot find nm_test_func in $nlist" >&5
fi
-@@ -6339,6 +6653,19 @@ else
+@@ -6339,6 +6653,20 @@
$as_echo "ok" >&6; }
fi
@@ -2429,10 +2421,11 @@ index 6f0f083..8e6a822 100755
+
+
+
++
-@@ -6359,6 +6686,41 @@ fi
+@@ -6358,6 +6686,40 @@
@@ -2470,11 +2463,10 @@ index 6f0f083..8e6a822 100755
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
-+
- # Check whether --enable-libtool-lock was given.
-@@ -6392,7 +6754,7 @@ ia64-*-hpux*)
+
+@@ -6392,7 +6754,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -2483,7 +2475,7 @@ index 6f0f083..8e6a822 100755
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6486,7 +6848,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+@@ -6486,7 +6848,7 @@
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -2492,7 +2484,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6527,7 +6889,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -6527,7 +6889,7 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -2501,7 +2493,7 @@ index 6f0f083..8e6a822 100755
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-@@ -6538,7 +6900,20 @@ sparc*-*solaris*)
+@@ -6538,7 +6900,20 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
@@ -2523,7 +2515,7 @@ index 6f0f083..8e6a822 100755
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
-@@ -6554,6 +6929,123 @@ esac
+@@ -6554,6 +6929,123 @@
need_locks="$enable_libtool_lock"
@@ -2647,7 +2639,7 @@ index 6f0f083..8e6a822 100755
case $host_os in
rhapsody* | darwin*)
-@@ -6562,7 +7054,7 @@ need_locks="$enable_libtool_lock"
+@@ -6562,7 +7054,7 @@
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2656,7 +2648,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6602,7 +7094,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -6602,7 +7094,7 @@
set dummy dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2665,7 +2657,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6654,7 +7146,7 @@ fi
+@@ -6654,7 +7146,7 @@
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2674,7 +2666,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6694,7 +7186,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -6694,7 +7186,7 @@
set dummy nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2683,7 +2675,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6746,7 +7238,7 @@ fi
+@@ -6746,7 +7238,7 @@
set dummy ${ac_tool_prefix}lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2692,7 +2684,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6786,7 +7278,7 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -6786,7 +7278,7 @@
set dummy lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2701,7 +2693,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6838,7 +7330,7 @@ fi
+@@ -6838,7 +7330,7 @@
set dummy ${ac_tool_prefix}otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2710,7 +2702,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6878,7 +7370,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -6878,7 +7370,7 @@
set dummy otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2719,7 +2711,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6930,7 +7422,7 @@ fi
+@@ -6930,7 +7422,7 @@
set dummy ${ac_tool_prefix}otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2728,7 +2720,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6970,7 +7462,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -6970,7 +7462,7 @@
set dummy otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2737,7 +2729,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -7045,7 +7537,7 @@ fi
+@@ -7045,7 +7537,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
@@ -2746,7 +2738,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -7061,7 +7553,13 @@ else
+@@ -7061,7 +7553,13 @@
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
@@ -2761,7 +2753,7 @@ index 6f0f083..8e6a822 100755
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
-@@ -7072,9 +7570,10 @@ else
+@@ -7072,9 +7570,10 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
@@ -2773,12 +2765,13 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
-@@ -7104,8 +7603,43 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -7104,9 +7603,44 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
- case $host_os in
- rhapsody* | darwin1.[012])
+- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
@@ -2816,10 +2809,11 @@ index 6f0f083..8e6a822 100755
+$as_echo "$lt_cv_ld_force_load" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
darwin1.*)
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-@@ -7131,7 +7665,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ darwin*) # darwin 5.x on
+@@ -7131,7 +7665,7 @@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -2828,7 +2822,7 @@ index 6f0f083..8e6a822 100755
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -7151,7 +7685,7 @@ if test -n "$CPP" && test -d "$CPP"; then
+@@ -7151,7 +7685,7 @@
CPP=
fi
if test -z "$CPP"; then
@@ -2837,7 +2831,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -7181,7 +7715,7 @@ else
+@@ -7181,7 +7715,7 @@
# Broken: fails on valid input.
continue
fi
@@ -2846,7 +2840,7 @@ index 6f0f083..8e6a822 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -7197,11 +7731,11 @@ else
+@@ -7197,11 +7731,11 @@
ac_preproc_ok=:
break
fi
@@ -2860,7 +2854,7 @@ index 6f0f083..8e6a822 100755
if $ac_preproc_ok; then :
break
fi
-@@ -7240,7 +7774,7 @@ else
+@@ -7240,7 +7774,7 @@
# Broken: fails on valid input.
continue
fi
@@ -2869,7 +2863,7 @@ index 6f0f083..8e6a822 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -7256,18 +7790,18 @@ else
+@@ -7256,18 +7790,18 @@
ac_preproc_ok=:
break
fi
@@ -2892,7 +2886,7 @@ index 6f0f083..8e6a822 100755
fi
ac_ext=c
-@@ -7279,7 +7813,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -7279,7 +7813,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
@@ -2901,7 +2895,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -7396,8 +7930,7 @@ do :
+@@ -7396,8 +7930,7 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
@@ -2911,7 +2905,7 @@ index 6f0f083..8e6a822 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -7411,539 +7944,25 @@ for ac_header in dlfcn.h
+@@ -7411,539 +7944,25 @@
do :
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
@@ -3461,7 +3455,7 @@ index 6f0f083..8e6a822 100755
-@@ -8024,7 +8043,22 @@ fi
+@@ -8024,7 +8043,22 @@
# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then :
@@ -3485,7 +3479,7 @@ index 6f0f083..8e6a822 100755
else
pic_mode=default
fi
-@@ -8101,6 +8135,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8101,6 +8135,11 @@
@@ -3497,7 +3491,7 @@ index 6f0f083..8e6a822 100755
test -z "$LN_S" && LN_S="ln -s"
-@@ -8122,7 +8161,7 @@ fi
+@@ -8122,7 +8161,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
@@ -3506,7 +3500,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -8150,19 +8189,6 @@ _ACEOF
+@@ -8150,19 +8189,6 @@
@@ -3526,7 +3520,7 @@ index 6f0f083..8e6a822 100755
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
-@@ -8175,23 +8201,6 @@ aix3*)
+@@ -8175,23 +8201,6 @@
;;
esac
@@ -3550,7 +3544,7 @@ index 6f0f083..8e6a822 100755
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -8220,7 +8229,7 @@ for cc_temp in $compiler""; do
+@@ -8220,7 +8229,7 @@
*) break;;
esac
done
@@ -3559,7 +3553,7 @@ index 6f0f083..8e6a822 100755
# Only perform the check for file, if the check method requires it
-@@ -8230,7 +8239,7 @@ file_magic*)
+@@ -8230,7 +8239,7 @@
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
@@ -3568,7 +3562,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8296,7 +8305,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -8296,7 +8305,7 @@
if test -n "$ac_tool_prefix"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
@@ -3577,7 +3571,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8429,11 +8438,16 @@ if test -n "$compiler"; then
+@@ -8429,11 +8438,16 @@
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
@@ -3596,7 +3590,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -8449,15 +8463,15 @@ else
+@@ -8449,15 +8463,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3615,7 +3609,7 @@ index 6f0f083..8e6a822 100755
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -8486,8 +8500,6 @@ fi
+@@ -8486,8 +8500,6 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -3624,7 +3618,7 @@ index 6f0f083..8e6a822 100755
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -8535,6 +8547,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8535,6 +8547,12 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -3637,7 +3631,7 @@ index 6f0f083..8e6a822 100755
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8577,6 +8595,15 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8577,6 +8595,15 @@
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -3653,7 +3647,7 @@ index 6f0f083..8e6a822 100755
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8639,7 +8666,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8639,7 +8666,13 @@
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
@@ -3668,7 +3662,7 @@ index 6f0f083..8e6a822 100755
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8651,25 +8684,40 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8651,25 +8684,40 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -3715,7 +3709,7 @@ index 6f0f083..8e6a822 100755
;;
esac
;;
-@@ -8701,7 +8749,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8701,7 +8749,7 @@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
@@ -3724,7 +3718,7 @@ index 6f0f083..8e6a822 100755
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -8758,13 +8806,17 @@ case $host_os in
+@@ -8758,13 +8806,17 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -3748,7 +3742,7 @@ index 6f0f083..8e6a822 100755
#
# Check to make sure the PIC flag actually works.
-@@ -8772,7 +8824,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -8772,7 +8824,7 @@
if test -n "$lt_prog_compiler_pic"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
@@ -3757,7 +3751,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8788,15 +8840,15 @@ else
+@@ -8788,15 +8840,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3776,7 +3770,7 @@ index 6f0f083..8e6a822 100755
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
-@@ -8825,13 +8877,18 @@ fi
+@@ -8825,13 +8877,18 @@
@@ -3796,7 +3790,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8844,7 +8901,7 @@ else
+@@ -8844,7 +8901,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -3805,7 +3799,7 @@ index 6f0f083..8e6a822 100755
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -8874,7 +8931,7 @@ fi
+@@ -8874,7 +8931,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
@@ -3814,7 +3808,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8893,16 +8950,16 @@ else
+@@ -8893,16 +8950,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3834,7 +3828,7 @@ index 6f0f083..8e6a822 100755
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -8929,7 +8986,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+@@ -8929,7 +8986,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
@@ -3843,7 +3837,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8948,16 +9005,16 @@ else
+@@ -8948,16 +9005,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3863,7 +3857,7 @@ index 6f0f083..8e6a822 100755
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -9023,7 +9080,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -9023,7 +9080,6 @@
hardcode_direct=no
hardcode_direct_absolute=no
hardcode_libdir_flag_spec=
@@ -3871,7 +3865,7 @@ index 6f0f083..8e6a822 100755
hardcode_libdir_separator=
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
-@@ -9067,13 +9123,39 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -9067,13 +9123,39 @@
openbsd*)
with_gnu_ld=no
;;
@@ -3912,7 +3906,7 @@ index 6f0f083..8e6a822 100755
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9107,11 +9189,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -9107,11 +9189,12 @@
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -3928,7 +3922,7 @@ index 6f0f083..8e6a822 100755
_LT_EOF
fi
-@@ -9147,10 +9230,12 @@ _LT_EOF
+@@ -9147,10 +9230,12 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -3942,7 +3936,7 @@ index 6f0f083..8e6a822 100755
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9168,6 +9253,11 @@ _LT_EOF
+@@ -9168,6 +9253,11 @@
fi
;;
@@ -3954,7 +3948,7 @@ index 6f0f083..8e6a822 100755
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -9193,15 +9283,16 @@ _LT_EOF
+@@ -9193,15 +9283,16 @@
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
@@ -3975,7 +3969,7 @@ index 6f0f083..8e6a822 100755
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -9212,13 +9303,17 @@ _LT_EOF
+@@ -9212,13 +9303,17 @@
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -3995,7 +3989,7 @@ index 6f0f083..8e6a822 100755
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -9234,17 +9329,16 @@ _LT_EOF
+@@ -9234,17 +9329,16 @@
fi
case $cc_basename in
@@ -4017,7 +4011,7 @@ index 6f0f083..8e6a822 100755
fi
;;
esac
-@@ -9258,8 +9352,8 @@ _LT_EOF
+@@ -9258,8 +9352,8 @@
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -4028,7 +4022,7 @@ index 6f0f083..8e6a822 100755
fi
;;
-@@ -9277,8 +9371,8 @@ _LT_EOF
+@@ -9277,8 +9371,8 @@
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4039,7 +4033,7 @@ index 6f0f083..8e6a822 100755
else
ld_shlibs=no
fi
-@@ -9324,8 +9418,8 @@ _LT_EOF
+@@ -9324,8 +9418,8 @@
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4050,7 +4044,7 @@ index 6f0f083..8e6a822 100755
else
ld_shlibs=no
fi
-@@ -9365,8 +9459,10 @@ _LT_EOF
+@@ -9365,8 +9459,10 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -4062,7 +4056,7 @@ index 6f0f083..8e6a822 100755
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -9454,7 +9550,13 @@ _LT_EOF
+@@ -9454,7 +9550,13 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -4077,7 +4071,7 @@ index 6f0f083..8e6a822 100755
/* end confdefs.h. */
int
-@@ -9467,25 +9569,32 @@ main ()
+@@ -9467,25 +9569,32 @@
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -4124,7 +4118,7 @@ index 6f0f083..8e6a822 100755
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9494,7 +9603,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9494,7 +9603,13 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -4139,7 +4133,7 @@ index 6f0f083..8e6a822 100755
/* end confdefs.h. */
int
-@@ -9507,30 +9622,42 @@ main ()
+@@ -9507,30 +9622,42 @@
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -4197,7 +4191,7 @@ index 6f0f083..8e6a822 100755
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -9562,20 +9689,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9562,20 +9689,64 @@
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
@@ -4276,7 +4270,7 @@ index 6f0f083..8e6a822 100755
;;
darwin* | rhapsody*)
-@@ -9585,7 +9756,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9585,7 +9756,12 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -4290,7 +4284,7 @@ index 6f0f083..8e6a822 100755
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -9593,7 +9769,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9593,7 +9769,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -4299,7 +4293,7 @@ index 6f0f083..8e6a822 100755
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -9611,10 +9787,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9611,10 +9787,6 @@
hardcode_shlibpath_var=no
;;
@@ -4310,7 +4304,7 @@ index 6f0f083..8e6a822 100755
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little
-@@ -9627,7 +9799,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9627,7 +9799,7 @@
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -4319,7 +4313,7 @@ index 6f0f083..8e6a822 100755
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
-@@ -9636,7 +9808,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9636,7 +9808,7 @@
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
@@ -4328,7 +4322,7 @@ index 6f0f083..8e6a822 100755
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9644,7 +9816,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9644,7 +9816,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4337,7 +4331,7 @@ index 6f0f083..8e6a822 100755
else
archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -9659,14 +9831,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9659,14 +9831,13 @@
;;
hpux10*)
@@ -4354,7 +4348,7 @@ index 6f0f083..8e6a822 100755
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
-@@ -9678,16 +9849,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9678,16 +9849,16 @@
;;
hpux11*)
@@ -4374,7 +4368,7 @@ index 6f0f083..8e6a822 100755
;;
esac
else
-@@ -9699,7 +9870,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9699,7 +9870,46 @@
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -4422,7 +4416,7 @@ index 6f0f083..8e6a822 100755
;;
esac
fi
-@@ -9727,26 +9937,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9727,26 +9937,39 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4472,7 +4466,7 @@ index 6f0f083..8e6a822 100755
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9808,17 +10031,17 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9808,17 +10031,17 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -4493,7 +4487,7 @@ index 6f0f083..8e6a822 100755
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9828,13 +10051,13 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9828,13 +10051,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -4510,7 +4504,7 @@ index 6f0f083..8e6a822 100755
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -9847,9 +10070,9 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9847,9 +10070,9 @@
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
@@ -4522,7 +4516,7 @@ index 6f0f083..8e6a822 100755
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -10037,44 +10260,50 @@ x|xyes)
+@@ -10037,44 +10260,50 @@
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -4602,7 +4596,7 @@ index 6f0f083..8e6a822 100755
;;
esac
fi
-@@ -10232,11 +10461,6 @@ esac
+@@ -10232,11 +10461,6 @@
@@ -4614,7 +4608,7 @@ index 6f0f083..8e6a822 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-@@ -10245,16 +10469,23 @@ if test "$GCC" = yes; then
+@@ -10245,16 +10469,23 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -4644,7 +4638,7 @@ index 6f0f083..8e6a822 100755
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -10267,7 +10498,7 @@ if test "$GCC" = yes; then
+@@ -10267,7 +10498,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -4653,7 +4647,7 @@ index 6f0f083..8e6a822 100755
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -10287,7 +10518,13 @@ BEGIN {RS=" "; FS="/|\n";} {
+@@ -10287,7 +10518,13 @@
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -4668,7 +4662,7 @@ index 6f0f083..8e6a822 100755
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10313,7 +10550,7 @@ need_version=unknown
+@@ -10313,7 +10550,7 @@
case $host_os in
aix3*)
@@ -4677,7 +4671,7 @@ index 6f0f083..8e6a822 100755
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
-@@ -10322,7 +10559,7 @@ aix3*)
+@@ -10322,7 +10559,7 @@
;;
aix[4-9]*)
@@ -4686,7 +4680,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
-@@ -10375,7 +10612,7 @@ amigaos*)
+@@ -10375,7 +10612,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4695,7 +4689,7 @@ index 6f0f083..8e6a822 100755
;;
esac
;;
-@@ -10387,7 +10624,7 @@ beos*)
+@@ -10387,7 +10624,7 @@
;;
bsdi[45]*)
@@ -4704,7 +4698,7 @@ index 6f0f083..8e6a822 100755
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'
-@@ -10406,8 +10643,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -10406,8 +10643,9 @@
need_version=no
need_lib_prefix=no
@@ -4716,7 +4710,7 @@ index 6f0f083..8e6a822 100755
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -10428,36 +10666,83 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -10428,36 +10666,83 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -4728,23 +4722,12 @@ index 6f0f083..8e6a822 100755
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-- # It is most probably a Windows format PATH printed by
-- # mingw gcc, but we are running on Cygwin. Gcc prints its search
-- # path with ; separators, and with drive letters. We can handle the
-- # drive letters (cygwin fileutils understands them), so leave them,
-- # especially as we might pass files found there to a mingw objdump,
-- # which wouldn't understand a cygwinified path. Ahh.
-- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
++ ;;
++ pw32*)
++ # pw32 DLLs use 'pw' prefix rather than 'lib'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ ;;
++ esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
@@ -4780,16 +4763,27 @@ index 6f0f083..8e6a822 100755
+ ;;
+ *)
+ sys_lib_search_path_spec="$LIB"
-+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+- # It is most probably a Windows format PATH printed by
+- # mingw gcc, but we are running on Cygwin. Gcc prints its search
+- # path with ; separators, and with drive letters. We can handle the
+- # drive letters (cygwin fileutils understands them), so leave them,
+- # especially as we might pass files found there to a mingw objdump,
+- # which wouldn't understand a cygwinified path. Ahh.
+ # It is most probably a Windows format PATH.
-+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
+ fi
+- ;;
+- pw32*)
+- # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
-+ ;;
-+ esac
+ ;;
+ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
@@ -4814,7 +4808,7 @@ index 6f0f083..8e6a822 100755
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -10478,7 +10763,7 @@ darwin* | rhapsody*)
+@@ -10478,7 +10763,7 @@
;;
dgux*)
@@ -4823,7 +4817,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-@@ -10486,10 +10771,6 @@ dgux*)
+@@ -10486,10 +10771,6 @@
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -4834,7 +4828,7 @@ index 6f0f083..8e6a822 100755
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -10497,7 +10778,7 @@ freebsd* | dragonfly*)
+@@ -10497,7 +10778,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -4843,7 +4837,7 @@ index 6f0f083..8e6a822 100755
*) objformat=elf ;;
esac
fi
-@@ -10515,7 +10796,7 @@ freebsd* | dragonfly*)
+@@ -10515,7 +10796,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -4852,7 +4846,7 @@ index 6f0f083..8e6a822 100755
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -10535,12 +10816,26 @@ freebsd* | dragonfly*)
+@@ -10535,12 +10816,26 @@
;;
gnu*)
@@ -4880,7 +4874,7 @@ index 6f0f083..8e6a822 100755
hardcode_into_libs=yes
;;
-@@ -10586,12 +10881,14 @@ hpux9* | hpux10* | hpux11*)
+@@ -10586,12 +10881,14 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -4897,7 +4891,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-@@ -10607,7 +10904,7 @@ irix5* | irix6* | nonstopux*)
+@@ -10607,7 +10904,7 @@
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
@@ -4906,7 +4900,7 @@ index 6f0f083..8e6a822 100755
else
version_type=irix
fi ;;
-@@ -10644,9 +10941,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+@@ -10644,9 +10941,9 @@
dynamic_linker=no
;;
@@ -4918,7 +4912,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10654,12 +10951,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -10654,12 +10951,17 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -4941,7 +4935,7 @@ index 6f0f083..8e6a822 100755
/* end confdefs.h. */
int
-@@ -10672,13 +10974,17 @@ main ()
+@@ -10672,13 +10974,17 @@
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -4962,7 +4956,7 @@ index 6f0f083..8e6a822 100755
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
-@@ -10687,7 +10993,7 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -10687,7 +10993,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -4971,7 +4965,7 @@ index 6f0f083..8e6a822 100755
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -10731,7 +11037,7 @@ netbsd*)
+@@ -10731,7 +11037,7 @@
;;
newsos6)
@@ -4980,7 +4974,7 @@ index 6f0f083..8e6a822 100755
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
-@@ -10800,7 +11106,7 @@ rdos*)
+@@ -10800,7 +11106,7 @@
;;
solaris*)
@@ -4989,7 +4983,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10825,7 +11131,7 @@ sunos4*)
+@@ -10825,7 +11131,7 @@
;;
sysv4 | sysv4.3*)
@@ -4998,7 +4992,7 @@ index 6f0f083..8e6a822 100755
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
-@@ -10849,7 +11155,7 @@ sysv4 | sysv4.3*)
+@@ -10849,7 +11155,7 @@
sysv4*MP*)
if test -d /usr/nec ;then
@@ -5007,7 +5001,7 @@ index 6f0f083..8e6a822 100755
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
-@@ -10880,7 +11186,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+@@ -10880,7 +11186,7 @@
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
@@ -5016,7 +5010,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10890,7 +11196,7 @@ tpf*)
+@@ -10890,7 +11196,7 @@
;;
uts4*)
@@ -5025,7 +5019,7 @@ index 6f0f083..8e6a822 100755
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
-@@ -11002,6 +11308,11 @@ fi
+@@ -11002,6 +11308,11 @@
@@ -5037,7 +5031,7 @@ index 6f0f083..8e6a822 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
-@@ -11074,7 +11385,7 @@ else
+@@ -11074,7 +11385,7 @@
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -5046,7 +5040,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11108,7 +11419,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11108,7 +11419,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
@@ -5055,7 +5049,7 @@ index 6f0f083..8e6a822 100755
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11122,12 +11433,12 @@ fi
+@@ -11122,12 +11433,12 @@
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
@@ -5070,7 +5064,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11161,16 +11472,16 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11161,16 +11472,16 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
@@ -5090,7 +5084,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11204,12 +11515,12 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11204,12 +11515,12 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
@@ -5105,7 +5099,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11243,12 +11554,12 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11243,12 +11554,12 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
@@ -5120,7 +5114,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11282,7 +11593,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11282,7 +11593,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
@@ -5129,7 +5123,7 @@ index 6f0f083..8e6a822 100755
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11323,7 +11634,7 @@ fi
+@@ -11323,7 +11634,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
@@ -5138,7 +5132,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11332,7 +11643,7 @@ else
+@@ -11332,7 +11643,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -5147,7 +5141,7 @@ index 6f0f083..8e6a822 100755
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11373,7 +11684,13 @@ else
+@@ -11373,7 +11684,13 @@
# endif
#endif
@@ -5162,7 +5156,7 @@ index 6f0f083..8e6a822 100755
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11382,7 +11699,11 @@ int main ()
+@@ -11382,7 +11699,11 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -5175,7 +5169,7 @@ index 6f0f083..8e6a822 100755
/* dlclose (self); */
}
else
-@@ -11419,7 +11740,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
+@@ -11419,7 +11740,7 @@
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
@@ -5184,7 +5178,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11428,7 +11749,7 @@ else
+@@ -11428,7 +11749,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -5193,7 +5187,7 @@ index 6f0f083..8e6a822 100755
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11469,7 +11790,13 @@ else
+@@ -11469,7 +11790,13 @@
# endif
#endif
@@ -5208,7 +5202,7 @@ index 6f0f083..8e6a822 100755
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11478,7 +11805,11 @@ int main ()
+@@ -11478,7 +11805,11 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -5221,7 +5215,7 @@ index 6f0f083..8e6a822 100755
/* dlclose (self); */
}
else
-@@ -11635,6 +11966,145 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -11635,6 +11966,145 @@
CC="$lt_save_CC"
@@ -5367,7 +5361,7 @@ index 6f0f083..8e6a822 100755
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -11651,7 +12121,6 @@ export_dynamic_flag_spec_CXX=
+@@ -11651,7 +12121,6 @@
hardcode_direct_CXX=no
hardcode_direct_absolute_CXX=no
hardcode_libdir_flag_spec_CXX=
@@ -5375,7 +5369,7 @@ index 6f0f083..8e6a822 100755
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
hardcode_shlibpath_var_CXX=unsupported
-@@ -11661,6 +12130,8 @@ module_cmds_CXX=
+@@ -11661,6 +12130,8 @@
module_expsym_cmds_CXX=
link_all_deplibs_CXX=unknown
old_archive_cmds_CXX=$old_archive_cmds
@@ -5384,7 +5378,7 @@ index 6f0f083..8e6a822 100755
no_undefined_flag_CXX=
whole_archive_flag_spec_CXX=
enable_shared_with_static_runtimes_CXX=no
-@@ -11716,6 +12187,7 @@ $RM -r conftest*
+@@ -11716,6 +12187,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
@@ -5392,7 +5386,7 @@ index 6f0f083..8e6a822 100755
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
-@@ -11733,6 +12205,7 @@ $RM -r conftest*
+@@ -11733,6 +12205,7 @@
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
@@ -5400,7 +5394,7 @@ index 6f0f083..8e6a822 100755
compiler=$CC
compiler_CXX=$CC
for cc_temp in $compiler""; do
-@@ -11743,7 +12216,7 @@ $RM -r conftest*
+@@ -11743,7 +12216,7 @@
*) break;;
esac
done
@@ -5409,7 +5403,7 @@ index 6f0f083..8e6a822 100755
if test -n "$compiler"; then
-@@ -11806,7 +12279,7 @@ else
+@@ -11806,7 +12279,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
@@ -5418,7 +5412,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -11843,10 +12316,10 @@ else
+@@ -11843,10 +12316,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5431,7 +5425,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -11872,8 +12345,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -11872,8 +12345,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -5442,7 +5436,7 @@ index 6f0f083..8e6a822 100755
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -11905,7 +12378,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -11905,7 +12378,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -5451,7 +5445,7 @@ index 6f0f083..8e6a822 100755
else
GXX=no
-@@ -12015,7 +12488,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -12015,7 +12488,13 @@
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -5466,7 +5460,7 @@ index 6f0f083..8e6a822 100755
/* end confdefs.h. */
int
-@@ -12028,26 +12507,33 @@ main ()
+@@ -12028,26 +12507,33 @@
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
@@ -5514,7 +5508,7 @@ index 6f0f083..8e6a822 100755
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -12056,7 +12542,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12056,7 +12542,13 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5529,7 +5523,7 @@ index 6f0f083..8e6a822 100755
/* end confdefs.h. */
int
-@@ -12069,30 +12561,42 @@ main ()
+@@ -12069,30 +12561,42 @@
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
@@ -5587,7 +5581,7 @@ index 6f0f083..8e6a822 100755
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -12122,28 +12626,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12122,28 +12626,75 @@
;;
cygwin* | mingw* | pw32* | cegcc*)
@@ -5685,7 +5679,7 @@ index 6f0f083..8e6a822 100755
darwin* | rhapsody*)
-@@ -12151,7 +12702,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12151,7 +12702,12 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
@@ -5699,7 +5693,7 @@ index 6f0f083..8e6a822 100755
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -12159,7 +12715,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12159,7 +12715,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -5708,7 +5702,7 @@ index 6f0f083..8e6a822 100755
archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -12193,7 +12749,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12193,7 +12749,7 @@
esac
;;
@@ -5717,7 +5711,7 @@ index 6f0f083..8e6a822 100755
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
-@@ -12212,6 +12768,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12212,6 +12768,11 @@
gnu*)
;;
@@ -5729,7 +5723,7 @@ index 6f0f083..8e6a822 100755
hpux9*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12236,11 +12797,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12236,11 +12797,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -5743,7 +5737,7 @@ index 6f0f083..8e6a822 100755
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12301,7 +12862,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12301,7 +12862,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -5752,7 +5746,7 @@ index 6f0f083..8e6a822 100755
;;
*)
if test "$GXX" = yes; then
-@@ -12311,10 +12872,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12311,10 +12872,10 @@
archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
@@ -5765,7 +5759,7 @@ index 6f0f083..8e6a822 100755
;;
esac
fi
-@@ -12344,7 +12905,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12344,7 +12905,7 @@
case $cc_basename in
CC*)
# SGI C++
@@ -5774,7 +5768,7 @@ index 6f0f083..8e6a822 100755
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -12355,9 +12916,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12355,9 +12916,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -5786,7 +5780,7 @@ index 6f0f083..8e6a822 100755
fi
fi
link_all_deplibs_CXX=yes
-@@ -12386,7 +12947,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12386,7 +12947,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -5795,7 +5789,7 @@ index 6f0f083..8e6a822 100755
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12423,26 +12984,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12423,26 +12984,26 @@
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -5828,7 +5822,7 @@ index 6f0f083..8e6a822 100755
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
-@@ -12450,7 +13011,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12450,7 +13011,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -5837,7 +5831,7 @@ index 6f0f083..8e6a822 100755
;;
cxx*)
# Compaq C++
-@@ -12469,9 +13030,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12469,9 +13030,9 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -5849,7 +5843,7 @@ index 6f0f083..8e6a822 100755
# IBM XL 8.0 on PPC, with GNU ld
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12491,13 +13052,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12491,13 +13052,13 @@
archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
hardcode_libdir_flag_spec_CXX='-R$libdir'
@@ -5865,7 +5859,7 @@ index 6f0f083..8e6a822 100755
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -12566,7 +13127,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12566,7 +13127,7 @@
export_dynamic_flag_spec_CXX='${wl}-E'
whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -5874,7 +5868,7 @@ index 6f0f083..8e6a822 100755
else
ld_shlibs_CXX=no
fi
-@@ -12601,15 +13162,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12601,15 +13162,15 @@
case $host in
osf3*)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -5893,7 +5887,7 @@ index 6f0f083..8e6a822 100755
$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
-@@ -12625,17 +13186,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12625,17 +13186,17 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -5914,7 +5908,7 @@ index 6f0f083..8e6a822 100755
;;
esac
-@@ -12645,7 +13206,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12645,7 +13206,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -5923,7 +5917,7 @@ index 6f0f083..8e6a822 100755
else
# FIXME: insert proper C++ library support
-@@ -12681,7 +13242,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12681,7 +13242,7 @@
solaris*)
case $cc_basename in
@@ -5932,7 +5926,7 @@ index 6f0f083..8e6a822 100755
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
-@@ -12702,7 +13263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12702,7 +13263,7 @@
esac
link_all_deplibs_CXX=yes
@@ -5941,7 +5935,7 @@ index 6f0f083..8e6a822 100755
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -12722,14 +13283,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12722,14 +13283,14 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -5959,7 +5953,7 @@ index 6f0f083..8e6a822 100755
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -12740,7 +13301,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12740,7 +13301,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -5968,7 +5962,7 @@ index 6f0f083..8e6a822 100755
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -12794,6 +13355,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12794,6 +13355,10 @@
CC*)
archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -5979,7 +5973,7 @@ index 6f0f083..8e6a822 100755
;;
*)
archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -12855,6 +13420,14 @@ private:
+@@ -12855,6 +13420,14 @@
};
_LT_EOF
@@ -5994,7 +5988,7 @@ index 6f0f083..8e6a822 100755
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -12868,7 +13441,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -12868,7 +13441,7 @@
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
@@ -6003,7 +5997,7 @@ index 6f0f083..8e6a822 100755
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
-@@ -12877,13 +13450,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -12877,13 +13450,22 @@
test $p = "-R"; then
prev=$p
continue
@@ -6030,7 +6024,7 @@ index 6f0f083..8e6a822 100755
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
-@@ -12903,8 +13485,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -12903,8 +13485,10 @@
postdeps_CXX="${postdeps_CXX} ${prev}${p}"
fi
fi
@@ -6041,7 +6035,7 @@ index 6f0f083..8e6a822 100755
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
-@@ -12940,6 +13524,7 @@ else
+@@ -12940,6 +13524,7 @@
fi
$RM -f confest.$objext
@@ -6049,7 +6043,7 @@ index 6f0f083..8e6a822 100755
# PORTME: override above test on systems where it is broken
case $host_os in
-@@ -12975,7 +13560,7 @@ linux*)
+@@ -12975,7 +13560,7 @@
solaris*)
case $cc_basename in
@@ -6058,7 +6052,7 @@ index 6f0f083..8e6a822 100755
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -13040,8 +13625,6 @@ fi
+@@ -13040,8 +13625,6 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -6067,7 +6061,7 @@ index 6f0f083..8e6a822 100755
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13091,6 +13674,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -13091,6 +13674,11 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -6079,7 +6073,7 @@ index 6f0f083..8e6a822 100755
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -13140,6 +13728,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -13140,6 +13728,11 @@
;;
esac
;;
@@ -6091,7 +6085,7 @@ index 6f0f083..8e6a822 100755
dgux*)
case $cc_basename in
ec++*)
-@@ -13229,8 +13822,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -13229,8 +13822,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
@@ -6102,7 +6096,7 @@ index 6f0f083..8e6a822 100755
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-qpic'
lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -13292,7 +13885,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -13292,7 +13885,7 @@
;;
solaris*)
case $cc_basename in
@@ -6111,7 +6105,7 @@ index 6f0f083..8e6a822 100755
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
-@@ -13357,10 +13950,17 @@ case $host_os in
+@@ -13357,10 +13950,17 @@
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -6132,7 +6126,7 @@ index 6f0f083..8e6a822 100755
#
# Check to make sure the PIC flag actually works.
-@@ -13368,7 +13968,7 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+@@ -13368,7 +13968,7 @@
if test -n "$lt_prog_compiler_pic_CXX"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
@@ -6141,7 +6135,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -13384,15 +13984,15 @@ else
+@@ -13384,15 +13984,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6160,7 +6154,7 @@ index 6f0f083..8e6a822 100755
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works_CXX=yes
-@@ -13418,13 +14018,15 @@ fi
+@@ -13418,13 +14018,15 @@
@@ -6177,7 +6171,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -13437,7 +14039,7 @@ else
+@@ -13437,7 +14039,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -6186,7 +6180,7 @@ index 6f0f083..8e6a822 100755
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works_CXX=yes
-@@ -13464,7 +14066,7 @@ fi
+@@ -13464,7 +14066,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
@@ -6195,7 +6189,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -13483,16 +14085,16 @@ else
+@@ -13483,16 +14085,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6215,7 +6209,7 @@ index 6f0f083..8e6a822 100755
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
-@@ -13516,7 +14118,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+@@ -13516,7 +14118,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
@@ -6224,7 +6218,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -13535,16 +14137,16 @@ else
+@@ -13535,16 +14137,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6244,7 +6238,7 @@ index 6f0f083..8e6a822 100755
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
-@@ -13595,30 +14197,40 @@ fi
+@@ -13595,30 +14197,40 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -6293,7 +6287,7 @@ index 6f0f083..8e6a822 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
-@@ -13650,44 +14262,50 @@ x|xyes)
+@@ -13650,44 +14262,50 @@
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -6373,7 +6367,7 @@ index 6f0f083..8e6a822 100755
;;
esac
fi
-@@ -13755,8 +14373,6 @@ esac
+@@ -13755,8 +14373,6 @@
@@ -6382,7 +6376,7 @@ index 6f0f083..8e6a822 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-@@ -13782,7 +14398,7 @@ need_version=unknown
+@@ -13782,7 +14398,7 @@
case $host_os in
aix3*)
@@ -6391,7 +6385,7 @@ index 6f0f083..8e6a822 100755
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
-@@ -13791,7 +14407,7 @@ aix3*)
+@@ -13791,7 +14407,7 @@
;;
aix[4-9]*)
@@ -6400,7 +6394,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
-@@ -13844,7 +14460,7 @@ amigaos*)
+@@ -13844,7 +14460,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6409,7 +6403,7 @@ index 6f0f083..8e6a822 100755
;;
esac
;;
-@@ -13856,7 +14472,7 @@ beos*)
+@@ -13856,7 +14472,7 @@
;;
bsdi[45]*)
@@ -6418,7 +6412,7 @@ index 6f0f083..8e6a822 100755
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'
-@@ -13875,8 +14491,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -13875,8 +14491,9 @@
need_version=no
need_lib_prefix=no
@@ -6430,7 +6424,7 @@ index 6f0f083..8e6a822 100755
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -13897,36 +14514,82 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -13897,36 +14514,82 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -6527,7 +6521,7 @@ index 6f0f083..8e6a822 100755
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -13946,7 +14609,7 @@ darwin* | rhapsody*)
+@@ -13946,7 +14609,7 @@
;;
dgux*)
@@ -6536,7 +6530,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-@@ -13954,10 +14617,6 @@ dgux*)
+@@ -13954,10 +14617,6 @@
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -6547,7 +6541,7 @@ index 6f0f083..8e6a822 100755
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -13965,7 +14624,7 @@ freebsd* | dragonfly*)
+@@ -13965,7 +14624,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -6556,7 +6550,7 @@ index 6f0f083..8e6a822 100755
*) objformat=elf ;;
esac
fi
-@@ -13983,7 +14642,7 @@ freebsd* | dragonfly*)
+@@ -13983,7 +14642,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -6565,7 +6559,7 @@ index 6f0f083..8e6a822 100755
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -14003,12 +14662,26 @@ freebsd* | dragonfly*)
+@@ -14003,12 +14662,26 @@
;;
gnu*)
@@ -6593,7 +6587,7 @@ index 6f0f083..8e6a822 100755
hardcode_into_libs=yes
;;
-@@ -14054,12 +14727,14 @@ hpux9* | hpux10* | hpux11*)
+@@ -14054,12 +14727,14 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -6610,7 +6604,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-@@ -14075,7 +14750,7 @@ irix5* | irix6* | nonstopux*)
+@@ -14075,7 +14750,7 @@
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
@@ -6619,7 +6613,7 @@ index 6f0f083..8e6a822 100755
else
version_type=irix
fi ;;
-@@ -14112,9 +14787,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+@@ -14112,9 +14787,9 @@
dynamic_linker=no
;;
@@ -6631,7 +6625,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14122,12 +14797,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -14122,12 +14797,17 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -6654,7 +6648,7 @@ index 6f0f083..8e6a822 100755
/* end confdefs.h. */
int
-@@ -14140,13 +14820,17 @@ main ()
+@@ -14140,13 +14820,17 @@
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -6675,7 +6669,7 @@ index 6f0f083..8e6a822 100755
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
-@@ -14155,7 +14839,7 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -14155,7 +14839,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -6684,7 +6678,7 @@ index 6f0f083..8e6a822 100755
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -14199,7 +14883,7 @@ netbsd*)
+@@ -14199,7 +14883,7 @@
;;
newsos6)
@@ -6693,7 +6687,7 @@ index 6f0f083..8e6a822 100755
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
-@@ -14268,7 +14952,7 @@ rdos*)
+@@ -14268,7 +14952,7 @@
;;
solaris*)
@@ -6702,7 +6696,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14293,7 +14977,7 @@ sunos4*)
+@@ -14293,7 +14977,7 @@
;;
sysv4 | sysv4.3*)
@@ -6711,7 +6705,7 @@ index 6f0f083..8e6a822 100755
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
-@@ -14317,7 +15001,7 @@ sysv4 | sysv4.3*)
+@@ -14317,7 +15001,7 @@
sysv4*MP*)
if test -d /usr/nec ;then
@@ -6720,7 +6714,7 @@ index 6f0f083..8e6a822 100755
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14348,7 +15032,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+@@ -14348,7 +15032,7 @@
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
@@ -6729,7 +6723,7 @@ index 6f0f083..8e6a822 100755
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14358,7 +15042,7 @@ tpf*)
+@@ -14358,7 +15042,7 @@
;;
uts4*)
@@ -6738,7 +6732,7 @@ index 6f0f083..8e6a822 100755
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
-@@ -14419,6 +15103,8 @@ fi
+@@ -14419,6 +15103,8 @@
@@ -6747,7 +6741,7 @@ index 6f0f083..8e6a822 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
-@@ -14466,6 +15152,7 @@ fi
+@@ -14466,6 +15152,7 @@
fi # test -n "$compiler"
CC=$lt_save_CC
@@ -6755,7 +6749,7 @@ index 6f0f083..8e6a822 100755
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
-@@ -14494,6 +15181,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -14494,6 +15181,8 @@
@@ -6764,7 +6758,7 @@ index 6f0f083..8e6a822 100755
ac_config_commands="$ac_config_commands libtool"
-@@ -14506,7 +15195,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -14506,7 +15195,7 @@
# Checks for libraries.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cvGetRows in -lcv" >&5
$as_echo_n "checking for cvGetRows in -lcv... " >&6; }
@@ -6773,7 +6767,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14540,13 +15229,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14540,13 +15229,13 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cv_cvGetRows" >&5
$as_echo "$ac_cv_lib_cv_cvGetRows" >&6; }
@@ -6789,7 +6783,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14580,7 +15269,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14580,7 +15269,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_geotrans_Set_Mercator_Coordinates" >&5
$as_echo "$ac_cv_lib_geotrans_Set_Mercator_Coordinates" >&6; }
@@ -6798,7 +6792,7 @@ index 6f0f083..8e6a822 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGEOTRANS 1
_ACEOF
-@@ -14591,7 +15280,7 @@ fi
+@@ -14591,7 +15280,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5
$as_echo_n "checking for fftw_execute in -lfftw3... " >&6; }
@@ -6807,7 +6801,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14625,13 +15314,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14625,13 +15314,13 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5
$as_echo "$ac_cv_lib_fftw3_fftw_execute" >&6; }
@@ -6823,7 +6817,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14665,13 +15354,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14665,13 +15354,13 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_jas_calloc" >&5
$as_echo "$ac_cv_lib_jasper_jas_calloc" >&6; }
@@ -6839,7 +6833,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14705,13 +15394,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14705,13 +15394,13 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_las_LAS_GetVersion" >&5
$as_echo "$ac_cv_lib_las_LAS_GetVersion" >&6; }
@@ -6855,7 +6849,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14745,13 +15434,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14745,13 +15434,13 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hpdf_HPDF_Pages_New" >&5
$as_echo "$ac_cv_lib_hpdf_HPDF_Pages_New" >&6; }
@@ -6871,7 +6865,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14785,7 +15474,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14785,7 +15474,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLFetch" >&5
$as_echo "$ac_cv_lib_odbc_SQLFetch" >&6; }
@@ -6880,7 +6874,7 @@ index 6f0f083..8e6a822 100755
ODBCFOUND=1
else
ODBC \(libodbc\) library not found
-@@ -14793,7 +15482,7 @@ fi
+@@ -14793,7 +15482,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_is_latlong in -lproj" >&5
$as_echo_n "checking for pj_is_latlong in -lproj... " >&6; }
@@ -6889,7 +6883,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14827,13 +15516,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14827,13 +15516,13 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_proj_pj_is_latlong" >&5
$as_echo "$ac_cv_lib_proj_pj_is_latlong" >&6; }
@@ -6905,7 +6899,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14867,7 +15556,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14867,7 +15556,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" >&5
$as_echo "$ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" >&6; }
@@ -6914,7 +6908,7 @@ index 6f0f083..8e6a822 100755
VIGRAFOUND=1
fi
-@@ -14875,7 +15564,7 @@ fi
+@@ -14875,7 +15564,7 @@
# Checks for header files.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
@@ -6923,7 +6917,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14989,8 +15678,7 @@ for ac_header in float.h malloc.h memory.h stdlib.h string.h unistd.h
+@@ -14989,8 +15678,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"
@@ -6933,7 +6927,7 @@ index 6f0f083..8e6a822 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -15002,7 +15690,7 @@ done
+@@ -15002,7 +15690,7 @@
for ac_header in wchar.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
@@ -6942,7 +6936,7 @@ index 6f0f083..8e6a822 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_WCHAR_H 1
_ACEOF
-@@ -15016,7 +15704,7 @@ done
+@@ -15016,7 +15704,7 @@
# Checks for typedefs, structures, and compiler characteristics.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
@@ -6951,7 +6945,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15048,7 +15736,7 @@ else
+@@ -15048,7 +15736,7 @@
char b[false == 0 ? 1 : -1];
char c[__bool_true_false_are_defined == 1 ? 1 : -1];
char d[(bool) 0.5 == true ? 1 : -1];
@@ -6960,7 +6954,7 @@ index 6f0f083..8e6a822 100755
char f[(_Bool) 0.0 == false ? 1 : -1];
char g[true];
char h[sizeof (_Bool)];
-@@ -15059,25 +15747,6 @@ else
+@@ -15059,25 +15747,6 @@
_Bool n[m];
char o[sizeof n == m * sizeof n[0] ? 1 : -1];
char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
@@ -6986,7 +6980,7 @@ index 6f0f083..8e6a822 100755
/* Catch a bug in an HP-UX C compiler. See
http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-@@ -15089,6 +15758,7 @@ int
+@@ -15089,6 +15758,7 @@
main ()
{
@@ -6994,7 +6988,7 @@ index 6f0f083..8e6a822 100755
*pq |= q;
*pq |= ! q;
/* Refer to every declared value, to avoid compiler optimizations. */
-@@ -15109,7 +15779,7 @@ fi
+@@ -15109,7 +15779,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
$as_echo "$ac_cv_header_stdbool_h" >&6; }
ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
@@ -7003,7 +6997,7 @@ index 6f0f083..8e6a822 100755
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
-@@ -15126,7 +15796,7 @@ fi
+@@ -15126,7 +15796,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
@@ -7012,7 +7006,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15206,7 +15876,7 @@ fi
+@@ -15206,7 +15876,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
$as_echo_n "checking for inline... " >&6; }
@@ -7021,7 +7015,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
-@@ -15247,7 +15917,7 @@ _ACEOF
+@@ -15247,7 +15917,7 @@
esac
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
@@ -7030,7 +7024,7 @@ index 6f0f083..8e6a822 100755
else
-@@ -15259,7 +15929,7 @@ fi
+@@ -15259,7 +15929,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
@@ -7039,7 +7033,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15297,7 +15967,7 @@ fi
+@@ -15297,7 +15967,7 @@
for ac_header in stdlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
@@ -7048,7 +7042,7 @@ index 6f0f083..8e6a822 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
-@@ -15308,7 +15978,7 @@ done
+@@ -15308,7 +15978,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
@@ -7057,7 +7051,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15363,7 +16033,7 @@ fi
+@@ -15363,7 +16033,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
$as_echo_n "checking for working memcmp... " >&6; }
@@ -7066,7 +7060,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15426,7 +16096,7 @@ esac
+@@ -15426,7 +16096,7 @@
for ac_header in stdlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
@@ -7075,7 +7069,7 @@ index 6f0f083..8e6a822 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
-@@ -15437,7 +16107,7 @@ done
+@@ -15437,7 +16107,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
@@ -7084,7 +7078,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15492,7 +16162,7 @@ fi
+@@ -15492,7 +16162,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
@@ -7093,7 +7087,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
rm -f conftest.sym conftest.file
-@@ -15554,7 +16224,7 @@ fi
+@@ -15554,7 +16224,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
$as_echo_n "checking whether stat accepts an empty string... " >&6; }
@@ -7102,7 +7096,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15600,7 +16270,7 @@ fi
+@@ -15600,7 +16270,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
$as_echo_n "checking for working strtod... " >&6; }
@@ -7111,7 +7105,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15659,14 +16329,14 @@ if test $ac_cv_func_strtod = no; then
+@@ -15659,14 +16329,14 @@
esac
ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
@@ -7128,7 +7122,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -15700,7 +16370,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -15700,7 +16370,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
$as_echo "$ac_cv_lib_m_pow" >&6; }
@@ -7137,7 +7131,7 @@ index 6f0f083..8e6a822 100755
POW_LIB=-lm
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
-@@ -15714,13 +16384,13 @@ fi
+@@ -15714,13 +16384,13 @@
for ac_func in vprintf
do :
ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
@@ -7153,7 +7147,7 @@ index 6f0f083..8e6a822 100755
$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-@@ -15734,8 +16404,7 @@ for ac_func in floor memmove memset modf pow sqrt strchr strdup strerror strrchr
+@@ -15734,8 +16404,7 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -7163,7 +7157,7 @@ index 6f0f083..8e6a822 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15784,7 +16453,7 @@ if test "${enable_debug+set}" = set; then :
+@@ -15784,7 +16453,7 @@
enableval=$enable_debug; case "${enableval}" in
yes) debug=true ;;
no) debug=false ;;
@@ -7172,7 +7166,7 @@ index 6f0f083..8e6a822 100755
esac
else
debug=false
-@@ -15804,7 +16473,7 @@ if test "${enable_unicode+set}" = set; then :
+@@ -15804,7 +16473,7 @@
enableval=$enable_unicode; case "${enableval}" in
yes) unicode=true ;;
no) unicode=false ;;
@@ -7181,7 +7175,7 @@ index 6f0f083..8e6a822 100755
esac
else
unicode=false
-@@ -15824,7 +16493,7 @@ if test "${enable_gui+set}" = set; then :
+@@ -15824,7 +16493,7 @@
enableval=$enable_gui; case "${enableval}" in
yes) gui=true ;;
no) gui=false ;;
@@ -7190,7 +7184,7 @@ index 6f0f083..8e6a822 100755
esac
else
gui=true
-@@ -15855,7 +16524,7 @@ if test "${enable_odbc+set}" = set; then :
+@@ -15855,7 +16524,7 @@
enableval=$enable_odbc; case "${enableval}" in
yes) odbc=true ;;
no) odbc=false ;;
@@ -7199,7 +7193,7 @@ index 6f0f083..8e6a822 100755
esac
else
odbc=true
-@@ -15936,7 +16605,7 @@ if test "${enable_python+set}" = set; then :
+@@ -15936,7 +16605,7 @@
enableval=$enable_python; case "${enableval}" in
yes) python=true ;;
no) python=false ;;
@@ -7208,7 +7202,7 @@ index 6f0f083..8e6a822 100755
esac
else
python=false
-@@ -15963,7 +16632,7 @@ do
+@@ -15963,7 +16632,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -7217,7 +7211,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -16008,13 +16677,13 @@ test -n "$PYTHON" || PYTHON=":"
+@@ -16008,13 +16677,13 @@
if test "$PYTHON" = :; then
@@ -7233,7 +7227,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-@@ -16033,7 +16702,7 @@ $as_echo "$am_cv_python_version" >&6; }
+@@ -16033,7 +16702,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
@@ -7242,7 +7236,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
-@@ -16047,7 +16716,7 @@ $as_echo "$am_cv_python_platform" >&6; }
+@@ -16047,7 +16716,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
@@ -7251,7 +7245,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -16085,7 +16754,7 @@ $as_echo "$am_cv_python_pythondir" >&6; }
+@@ -16085,7 +16754,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
@@ -7260,7 +7254,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -16135,7 +16804,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
+@@ -16135,7 +16804,7 @@
set dummy python$PYTHON_VERSION; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -7269,7 +7263,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -16172,7 +16841,7 @@ fi
+@@ -16172,7 +16841,7 @@
if test -z "$PYTHON"; then
@@ -7278,7 +7272,7 @@ index 6f0f083..8e6a822 100755
PYTHON_VERSION=""
fi
-@@ -16190,7 +16859,7 @@ $as_echo_n "checking for a version of Python >= '2.1.0'... " >&6; }
+@@ -16190,7 +16859,7 @@
$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;}
@@ -7287,7 +7281,7 @@ index 6f0f083..8e6a822 100755
This version of the AC_PYTHON_DEVEL macro
doesn't work properly with versions of Python before
2.1.0. You may need to re-run configure, setting the
-@@ -16199,7 +16868,7 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+@@ -16199,7 +16868,7 @@
Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
to something else than an empty string.
@@ -7296,7 +7290,7 @@ index 6f0f083..8e6a822 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5
$as_echo "skip at user request" >&6; }
-@@ -16224,7 +16893,7 @@ $as_echo "yes" >&6; }
+@@ -16224,7 +16893,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7305,7 +7299,7 @@ index 6f0f083..8e6a822 100755
If you have it installed, but it isn't the default Python
interpreter in your system path, please pass the PYTHON_VERSION
variable to configure. See \`\`configure --help'' for reference.
-@@ -16245,7 +16914,7 @@ $as_echo "yes" >&6; }
+@@ -16245,7 +16914,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7314,7 +7308,7 @@ index 6f0f083..8e6a822 100755
Please check your Python installation. The error was:
$ac_distutils_result" "$LINENO" 5
PYTHON_VERSION=""
-@@ -16350,7 +17019,7 @@ EOD`
+@@ -16350,7 +17019,7 @@
fi
if test -z "PYTHON_LDFLAGS"; then
@@ -7323,7 +7317,7 @@ index 6f0f083..8e6a822 100755
Cannot determine location of your Python DSO. Please check it was installed with
dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
" "$LINENO" 5
-@@ -16453,7 +17122,7 @@ $as_echo "$pythonexists" >&6; }
+@@ -16453,7 +17122,7 @@
if test ! "x$pythonexists" = "xyes"; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -7332,7 +7326,7 @@ index 6f0f083..8e6a822 100755
Could not link test program to Python. Maybe the main Python library has been
installed in some non-standard library path. If so, pass it to configure,
via the LDFLAGS environment variable.
-@@ -16464,7 +17133,7 @@ as_fn_error "
+@@ -16464,7 +17133,7 @@
for your distribution. The exact name of this package varies among them.
============================================================================
@@ -7341,7 +7335,7 @@ index 6f0f083..8e6a822 100755
PYTHON_VERSION=""
fi
-@@ -16478,7 +17147,7 @@ See \`config.log' for more details." "$LINENO" 5; }
+@@ -16478,7 +17147,7 @@
set dummy swig; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -7350,7 +7344,7 @@ index 6f0f083..8e6a822 100755
$as_echo_n "(cached) " >&6
else
case $SWIG in
-@@ -16601,7 +17270,7 @@ $as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
+@@ -16601,7 +17270,7 @@
fi
#AC_CONFIG_FILES([Makefile])
@@ -7359,7 +7353,7 @@ index 6f0f083..8e6a822 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -16667,10 +17336,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+@@ -16667,10 +17336,21 @@
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
@@ -7383,7 +7377,7 @@ index 6f0f083..8e6a822 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-@@ -16686,6 +17366,7 @@ DEFS=-DHAVE_CONFIG_H
+@@ -16686,6 +17366,7 @@
ac_libobjs=
ac_ltlibobjs=
@@ -7391,7 +7385,7 @@ index 6f0f083..8e6a822 100755
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -16709,59 +17390,55 @@ else
+@@ -16709,59 +17390,55 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -7464,7 +7458,7 @@ index 6f0f083..8e6a822 100755
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-@@ -16862,6 +17539,7 @@ fi
+@@ -16862,6 +17539,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -7472,7 +7466,7 @@ index 6f0f083..8e6a822 100755
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -16907,19 +17585,19 @@ export LANGUAGE
+@@ -16907,19 +17585,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -7500,7 +7494,7 @@ index 6f0f083..8e6a822 100755
as_fn_exit $as_status
} # as_fn_error
-@@ -17115,7 +17793,7 @@ $as_echo X"$as_dir" |
+@@ -17115,7 +17793,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -7509,7 +7503,7 @@ index 6f0f083..8e6a822 100755
} # as_fn_mkdir_p
-@@ -17169,7 +17847,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+@@ -17169,7 +17847,7 @@
# values after options handling.
ac_log="
This file was extended by saga $as_me 2.0.8, which was
@@ -7518,7 +7512,7 @@ index 6f0f083..8e6a822 100755
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17235,10 +17913,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -17235,10 +17913,10 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
saga config.status 2.0.8
@@ -7531,7 +7525,7 @@ index 6f0f083..8e6a822 100755
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -17256,11 +17934,16 @@ ac_need_defaults=:
+@@ -17256,11 +17934,16 @@
while test $# != 0
do
case $1 in
@@ -7549,7 +7543,7 @@ index 6f0f083..8e6a822 100755
*)
ac_option=$1
ac_optarg=$2
-@@ -17282,6 +17965,7 @@ do
+@@ -17282,6 +17965,7 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -7557,7 +7551,7 @@ index 6f0f083..8e6a822 100755
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
-@@ -17294,7 +17978,7 @@ do
+@@ -17294,7 +17978,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
@@ -7566,7 +7560,7 @@ index 6f0f083..8e6a822 100755
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-@@ -17303,7 +17987,7 @@ Try \`$0 --help' for more information.";;
+@@ -17303,7 +17987,7 @@
ac_cs_silent=: ;;
# This is an error.
@@ -7575,7 +7569,7 @@ index 6f0f083..8e6a822 100755
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
-@@ -17357,184 +18041,208 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+@@ -17357,184 +18041,208 @@
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -7956,7 +7950,7 @@ index 6f0f083..8e6a822 100755
GREP \
EGREP \
FGREP \
-@@ -17547,8 +18255,13 @@ reload_flag \
+@@ -17547,8 +18255,13 @@
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
@@ -7970,7 +7964,7 @@ index 6f0f083..8e6a822 100755
STRIP \
RANLIB \
CC \
-@@ -17558,14 +18271,14 @@ lt_cv_sys_global_symbol_pipe \
+@@ -17558,14 +18271,14 @@
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7988,7 +7982,7 @@ index 6f0f083..8e6a822 100755
DSYMUTIL \
NMEDIT \
LIPO \
-@@ -17579,9 +18292,7 @@ with_gnu_ld \
+@@ -17579,9 +18292,7 @@
allow_undefined_flag \
no_undefined_flag \
hardcode_libdir_flag_spec \
@@ -7998,7 +7992,7 @@ index 6f0f083..8e6a822 100755
exclude_expsyms \
include_expsyms \
file_list_spec \
-@@ -17589,6 +18300,7 @@ variables_saved_for_relink \
+@@ -17589,6 +18300,7 @@
libname_spec \
library_names_spec \
soname_spec \
@@ -8006,7 +8000,7 @@ index 6f0f083..8e6a822 100755
finish_eval \
old_striplib \
striplib \
-@@ -17599,10 +18311,11 @@ predeps \
+@@ -17599,10 +18311,11 @@
postdeps \
compiler_lib_search_path \
LD_CXX \
@@ -8019,7 +8013,7 @@ index 6f0f083..8e6a822 100755
lt_prog_compiler_static_CXX \
lt_cv_prog_compiler_c_o_CXX \
export_dynamic_flag_spec_CXX \
-@@ -17612,9 +18325,7 @@ with_gnu_ld_CXX \
+@@ -17612,9 +18325,7 @@
allow_undefined_flag_CXX \
no_undefined_flag_CXX \
hardcode_libdir_flag_spec_CXX \
@@ -8029,7 +8023,7 @@ index 6f0f083..8e6a822 100755
exclude_expsyms_CXX \
include_expsyms_CXX \
file_list_spec_CXX \
-@@ -17624,9 +18335,9 @@ postdep_objects_CXX \
+@@ -17624,9 +18335,9 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
@@ -8041,7 +8035,7 @@ index 6f0f083..8e6a822 100755
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17648,11 +18359,13 @@ module_cmds \
+@@ -17648,11 +18359,13 @@
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
@@ -8055,7 +8049,7 @@ index 6f0f083..8e6a822 100755
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
-@@ -17661,10 +18374,11 @@ archive_expsym_cmds_CXX \
+@@ -17661,10 +18374,11 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
@@ -8070,7 +8064,7 @@ index 6f0f083..8e6a822 100755
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17672,12 +18386,6 @@ prelink_cmds_CXX; do
+@@ -17672,12 +18386,6 @@
esac
done
@@ -8083,7 +8077,7 @@ index 6f0f083..8e6a822 100755
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -17812,8 +18520,6 @@ do
+@@ -17812,8 +18520,6 @@
"src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile" ;;
"src/modules_simulation/ecosystems/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/ecosystems/Makefile" ;;
"src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile" ;;
@@ -8092,7 +8086,7 @@ index 6f0f083..8e6a822 100755
"src/modules_terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/Makefile" ;;
"src/modules_terrain_analysis/terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/Makefile" ;;
"src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile" ;;
-@@ -17824,7 +18530,7 @@ do
+@@ -17824,7 +18530,7 @@
"src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile" ;;
"src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile" ;;
@@ -8101,7 +8095,7 @@ index 6f0f083..8e6a822 100755
esac
done
-@@ -17847,9 +18553,10 @@ fi
+@@ -17847,9 +18553,10 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
@@ -8114,7 +8108,7 @@ index 6f0f083..8e6a822 100755
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
-@@ -17857,12 +18564,13 @@ $debug ||
+@@ -17857,12 +18564,13 @@
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
@@ -8130,7 +8124,7 @@ index 6f0f083..8e6a822 100755
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -17879,12 +18587,12 @@ if test "x$ac_cr" = x; then
+@@ -17879,12 +18587,12 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
@@ -8145,7 +8139,7 @@ index 6f0f083..8e6a822 100755
_ACEOF
-@@ -17893,18 +18601,18 @@ _ACEOF
+@@ -17893,18 +18601,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -8168,7 +8162,7 @@ index 6f0f083..8e6a822 100755
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -17912,7 +18620,7 @@ done
+@@ -17912,7 +18620,7 @@
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -8177,7 +8171,7 @@ index 6f0f083..8e6a822 100755
_ACEOF
sed -n '
h
-@@ -17960,7 +18668,7 @@ t delim
+@@ -17960,7 +18668,7 @@
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
@@ -8186,7 +8180,7 @@ index 6f0f083..8e6a822 100755
for (key in S) S_is_set[key] = 1
FS = ""
-@@ -17992,21 +18700,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+@@ -17992,21 +18700,29 @@
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
@@ -8225,7 +8219,7 @@ index 6f0f083..8e6a822 100755
s/^[^=]*=[ ]*$//
}'
fi
-@@ -18018,7 +18734,7 @@ fi # test -n "$CONFIG_FILES"
+@@ -18018,7 +18734,7 @@
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
@@ -8234,7 +8228,7 @@ index 6f0f083..8e6a822 100755
BEGIN {
_ACEOF
-@@ -18030,11 +18746,11 @@ _ACEOF
+@@ -18030,11 +18746,11 @@
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
@@ -8249,7 +8243,7 @@ index 6f0f083..8e6a822 100755
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -18119,7 +18835,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -18119,7 +18835,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -8258,7 +8252,7 @@ index 6f0f083..8e6a822 100755
fi # test -n "$CONFIG_HEADERS"
-@@ -18132,7 +18848,7 @@ do
+@@ -18132,7 +18848,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -8267,7 +8261,7 @@ index 6f0f083..8e6a822 100755
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -18151,7 +18867,7 @@ do
+@@ -18151,7 +18867,7 @@
for ac_f
do
case $ac_f in
@@ -8276,7 +8270,7 @@ index 6f0f083..8e6a822 100755
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
-@@ -18160,7 +18876,7 @@ do
+@@ -18160,7 +18876,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -8285,7 +8279,7 @@ index 6f0f083..8e6a822 100755
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -18186,8 +18902,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
+@@ -18186,8 +18902,8 @@
esac
case $ac_tag in
@@ -8296,7 +8290,7 @@ index 6f0f083..8e6a822 100755
esac
;;
esac
-@@ -18323,23 +19039,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
+@@ -18323,23 +19039,24 @@
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
@@ -8331,7 +8325,7 @@ index 6f0f083..8e6a822 100755
;;
:H)
#
-@@ -18348,21 +19065,21 @@ which seems to be undefined. Please make sure it is defined." >&2;}
+@@ -18348,21 +19065,21 @@
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
@@ -8361,7 +8355,7 @@ index 6f0f083..8e6a822 100755
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -18523,7 +19240,8 @@ $as_echo X"$file" |
+@@ -18523,7 +19240,8 @@
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -8371,7 +8365,7 @@ index 6f0f083..8e6a822 100755
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -18571,6 +19289,15 @@ pic_mode=$pic_mode
+@@ -18571,6 +19289,15 @@
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -8387,7 +8381,7 @@ index 6f0f083..8e6a822 100755
# The host system.
host_alias=$host_alias
host=$host
-@@ -18620,9 +19347,11 @@ SP2NL=$lt_lt_SP2NL
+@@ -18620,9 +19347,11 @@
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -8402,7 +8396,7 @@ index 6f0f083..8e6a822 100755
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
-@@ -18630,13 +19359,30 @@ OBJDUMP=$lt_OBJDUMP
+@@ -18630,13 +19359,30 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -8434,7 +8428,7 @@ index 6f0f083..8e6a822 100755
# A symbol stripping program.
STRIP=$lt_STRIP
-@@ -18645,6 +19391,9 @@ RANLIB=$lt_RANLIB
+@@ -18645,6 +19391,9 @@
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -8444,7 +8438,7 @@ index 6f0f083..8e6a822 100755
# A C compiler.
LTCC=$lt_CC
-@@ -18663,14 +19412,14 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+@@ -18663,14 +19412,14 @@
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
@@ -8465,7 +8459,7 @@ index 6f0f083..8e6a822 100755
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -18678,6 +19427,9 @@ MAGIC_CMD=$MAGIC_CMD
+@@ -18678,6 +19427,9 @@
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
@@ -8475,7 +8469,7 @@ index 6f0f083..8e6a822 100755
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
-@@ -18734,6 +19486,9 @@ library_names_spec=$lt_library_names_spec
+@@ -18734,6 +19486,9 @@
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -8485,7 +8479,7 @@ index 6f0f083..8e6a822 100755
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -18773,6 +19528,10 @@ striplib=$lt_striplib
+@@ -18773,6 +19528,10 @@
# The linker used to build libraries.
LD=$lt_LD
@@ -8496,7 +8490,7 @@ index 6f0f083..8e6a822 100755
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -18785,12 +19544,12 @@ with_gcc=$GCC
+@@ -18785,12 +19544,12 @@
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
@@ -8512,7 +8506,7 @@ index 6f0f083..8e6a822 100755
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
-@@ -18840,10 +19599,6 @@ no_undefined_flag=$lt_no_undefined_flag
+@@ -18840,10 +19599,6 @@
# This must work even if \$libdir does not exist
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
@@ -8523,7 +8517,7 @@ index 6f0f083..8e6a822 100755
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
-@@ -18877,9 +19632,6 @@ inherit_rpath=$inherit_rpath
+@@ -18877,9 +19632,6 @@
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
@@ -8533,7 +8527,7 @@ index 6f0f083..8e6a822 100755
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -18895,6 +19647,9 @@ include_expsyms=$lt_include_expsyms
+@@ -18895,6 +19647,9 @@
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
@@ -8543,7 +8537,7 @@ index 6f0f083..8e6a822 100755
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
-@@ -18941,212 +19696,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -18941,212 +19696,169 @@
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
@@ -8747,15 +8741,9 @@ index 6f0f083..8e6a822 100755
-_LT_EOF
- ;;
- esac
--
--
-- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-- || (rm -f "$cfgfile"; exit 1)
--
-- mv -f "$cfgfile" "$ofile" ||
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
-+
+
+ if test x"$xsi_shell" = xyes; then
+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
@@ -8913,13 +8901,16 @@ index 6f0f083..8e6a822 100755
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
-+
-+
+
+- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+- || (rm -f "$cfgfile"; exit 1)
+
+- mv -f "$cfgfile" "$ofile" ||
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
-@@ -19158,6 +19870,10 @@ _LT_EOF
+@@ -19158,6 +19870,10 @@
# The linker used to build libraries.
LD=$lt_LD_CXX
@@ -8930,7 +8921,7 @@ index 6f0f083..8e6a822 100755
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
-@@ -19170,12 +19886,12 @@ with_gcc=$GCC_CXX
+@@ -19170,12 +19886,12 @@
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
@@ -8946,7 +8937,7 @@ index 6f0f083..8e6a822 100755
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static_CXX
-@@ -19225,10 +19941,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX
+@@ -19225,10 +19941,6 @@
# This must work even if \$libdir does not exist
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
@@ -8957,7 +8948,7 @@ index 6f0f083..8e6a822 100755
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-@@ -19262,9 +19974,6 @@ inherit_rpath=$inherit_rpath_CXX
+@@ -19262,9 +19974,6 @@
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs_CXX
@@ -8967,7 +8958,7 @@ index 6f0f083..8e6a822 100755
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -19280,6 +19989,9 @@ include_expsyms=$lt_include_expsyms_CXX
+@@ -19280,6 +19989,9 @@
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds_CXX
@@ -8977,7 +8968,7 @@ index 6f0f083..8e6a822 100755
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec_CXX
-@@ -19314,7 +20026,7 @@ _ACEOF
+@@ -19314,7 +20026,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
@@ -8986,7 +8977,7 @@ index 6f0f083..8e6a822 100755
# configure is writing to config.log, and then calls config.status.
-@@ -19335,7 +20047,7 @@ if test "$no_create" != yes; then
+@@ -19335,7 +20047,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -8995,12 +8986,10 @@ index 6f0f083..8e6a822 100755
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-diff --git a/ltmain.sh b/ltmain.sh
-old mode 100755
-new mode 100644
-index 7ed280b..c7d06c3
---- a/ltmain.sh
-+++ b/ltmain.sh
+Index: saga/ltmain.sh
+===================================================================
+--- saga.orig/ltmain.sh 2012-01-09 14:09:39.000000000 +0100
++++ saga/ltmain.sh 2012-01-09 14:10:07.000000000 +0100
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
@@ -9102,7 +9091,7 @@ index 7ed280b..c7d06c3
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -91,10 +98,15 @@ fi
+@@ -91,10 +98,15 @@
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
@@ -9121,7 +9110,7 @@ index 7ed280b..c7d06c3
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -107,24 +119,28 @@ do
+@@ -107,24 +119,28 @@
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
@@ -9156,7 +9145,7 @@ index 7ed280b..c7d06c3
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
-@@ -144,6 +160,27 @@ IFS=" $lt_nl"
+@@ -144,6 +160,27 @@
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
@@ -9184,7 +9173,7 @@ index 7ed280b..c7d06c3
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
-@@ -158,33 +195,183 @@ basename="s,^.*/,,"
+@@ -158,33 +195,183 @@
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
@@ -9388,7 +9377,7 @@ index 7ed280b..c7d06c3
# Make sure we have an absolute path for reexecution:
case $progpath in
-@@ -196,7 +383,7 @@ case $progpath in
+@@ -196,7 +383,7 @@
;;
*)
save_IFS="$IFS"
@@ -9397,7 +9386,7 @@ index 7ed280b..c7d06c3
for progdir in $PATH; do
IFS="$save_IFS"
test -x "$progdir/$progname" && break
-@@ -215,6 +402,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+@@ -215,6 +402,15 @@
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
@@ -9413,7 +9402,7 @@ index 7ed280b..c7d06c3
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
-@@ -243,7 +439,7 @@ opt_warning=:
+@@ -243,7 +439,7 @@
# name if it has been set yet.
func_echo ()
{
@@ -9422,7 +9411,7 @@ index 7ed280b..c7d06c3
}
# func_verbose arg...
-@@ -258,18 +454,25 @@ func_verbose ()
+@@ -258,18 +454,25 @@
:
}
@@ -9450,7 +9439,7 @@ index 7ed280b..c7d06c3
# bash bug again:
:
-@@ -326,9 +529,9 @@ func_mkdir_p ()
+@@ -326,9 +529,9 @@
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
@@ -9462,7 +9451,7 @@ index 7ed280b..c7d06c3
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
-@@ -378,7 +581,7 @@ func_mktempdir ()
+@@ -378,7 +581,7 @@
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
@@ -9471,7 +9460,7 @@ index 7ed280b..c7d06c3
}
-@@ -392,7 +595,7 @@ func_quote_for_eval ()
+@@ -392,7 +595,7 @@
{
case $1 in
*[\\\`\"\$]*)
@@ -9480,7 +9469,7 @@ index 7ed280b..c7d06c3
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
-@@ -419,7 +622,7 @@ func_quote_for_expand ()
+@@ -419,7 +622,7 @@
{
case $1 in
*[\\\`\"]*)
@@ -9489,7 +9478,7 @@ index 7ed280b..c7d06c3
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
-@@ -488,15 +691,39 @@ func_show_eval_locale ()
+@@ -488,15 +691,39 @@
fi
}
@@ -9532,7 +9521,7 @@ index 7ed280b..c7d06c3
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -509,22 +736,28 @@ func_version ()
+@@ -509,22 +736,28 @@
# Echo short help message to standard output and exit.
func_usage ()
{
@@ -9565,7 +9554,7 @@ index 7ed280b..c7d06c3
s/^# //
s/^# *$//
s*\$progname*'$progname'*
-@@ -534,11 +767,18 @@ func_help ()
+@@ -534,11 +767,18 @@
s*\$LTCFLAGS*'"$LTCFLAGS"'*
s*\$LD*'"$LD"'*
s/\$with_gnu_ld/'"$with_gnu_ld"'/
@@ -9588,7 +9577,7 @@ index 7ed280b..c7d06c3
}
# func_missing_arg argname
-@@ -546,63 +786,106 @@ func_help ()
+@@ -546,63 +786,106 @@
# exit_cmd.
func_missing_arg ()
{
@@ -9608,7 +9597,7 @@ index 7ed280b..c7d06c3
+{
+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
++
+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
@@ -9625,7 +9614,7 @@ index 7ed280b..c7d06c3
+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
-+
+
+exit_cmd=:
@@ -9726,7 +9715,7 @@ index 7ed280b..c7d06c3
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
-@@ -636,16 +919,16 @@ func_config ()
+@@ -636,16 +919,16 @@
# Display the features supported by this script.
func_features ()
{
@@ -9748,7 +9737,7 @@ index 7ed280b..c7d06c3
fi
exit $?
-@@ -692,117 +975,209 @@ func_enable_tag ()
+@@ -692,117 +975,209 @@
esac
}
@@ -9784,7 +9773,31 @@ index 7ed280b..c7d06c3
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+ fi
-+
+
+- # Shorthand for --mode=foo, only valid as the first argument
+- case $1 in
+- clean|clea|cle|cl)
+- shift; set dummy --mode clean ${1+"$@"}; shift
+- ;;
+- compile|compil|compi|comp|com|co|c)
+- shift; set dummy --mode compile ${1+"$@"}; shift
+- ;;
+- execute|execut|execu|exec|exe|ex|e)
+- shift; set dummy --mode execute ${1+"$@"}; shift
+- ;;
+- finish|finis|fini|fin|fi|f)
+- shift; set dummy --mode finish ${1+"$@"}; shift
+- ;;
+- install|instal|insta|inst|ins|in|i)
+- shift; set dummy --mode install ${1+"$@"}; shift
+- ;;
+- link|lin|li|l)
+- shift; set dummy --mode link ${1+"$@"}; shift
+- ;;
+- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+- shift; set dummy --mode uninstall ${1+"$@"}; shift
+- ;;
+- esac
+ exit $EXIT_MISMATCH
+ fi
+}
@@ -9814,7 +9827,9 @@ index 7ed280b..c7d06c3
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+esac
-+
+
+- # Parse non-mode specific arguments:
+- while test "$#" -gt 0; do
+
+
+# Option defaults:
@@ -9831,34 +9846,8 @@ index 7ed280b..c7d06c3
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
-
-- # Shorthand for --mode=foo, only valid as the first argument
-- case $1 in
-- clean|clea|cle|cl)
-- shift; set dummy --mode clean ${1+"$@"}; shift
-- ;;
-- compile|compil|compi|comp|com|co|c)
-- shift; set dummy --mode compile ${1+"$@"}; shift
-- ;;
-- execute|execut|execu|exec|exe|ex|e)
-- shift; set dummy --mode execute ${1+"$@"}; shift
-- ;;
-- finish|finis|fini|fin|fi|f)
-- shift; set dummy --mode finish ${1+"$@"}; shift
-- ;;
-- install|instal|insta|inst|ins|in|i)
-- shift; set dummy --mode install ${1+"$@"}; shift
-- ;;
-- link|lin|li|l)
-- shift; set dummy --mode link ${1+"$@"}; shift
-- ;;
-- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-- shift; set dummy --mode uninstall ${1+"$@"}; shift
-- ;;
-- esac
-
-- # Parse non-mode specific arguments:
-- while test "$#" -gt 0; do
++
++
+# Parse options once, thoroughly. This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
@@ -10042,7 +10031,7 @@ index 7ed280b..c7d06c3
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
-@@ -810,82 +1185,44 @@ func_enable_tag ()
+@@ -810,82 +1185,44 @@
opt_duplicate_compiler_generated_deps=:
;;
*)
@@ -10096,7 +10085,9 @@ index 7ed280b..c7d06c3
- fi
-}
-
--
++ # Darwin sucks
++ eval std_shrext=\"$shrext_cmds\"
+
-## ----------- ##
-## Main. ##
-## ----------- ##
@@ -10104,9 +10095,7 @@ index 7ed280b..c7d06c3
-$opt_help || {
- # Sanity checks first:
- func_check_version_match
-+ # Darwin sucks
-+ eval std_shrext=\"$shrext_cmds\"
-
+-
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
- fi
@@ -10149,7 +10138,7 @@ index 7ed280b..c7d06c3
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
-@@ -950,12 +1287,9 @@ func_ltwrapper_executable_p ()
+@@ -950,12 +1287,9 @@
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
@@ -10165,7 +10154,7 @@ index 7ed280b..c7d06c3
}
# func_ltwrapper_p file
-@@ -1001,6 +1335,37 @@ func_source ()
+@@ -1001,6 +1335,37 @@
}
@@ -10203,7 +10192,7 @@ index 7ed280b..c7d06c3
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
-@@ -1013,13 +1378,15 @@ func_infer_tag ()
+@@ -1013,13 +1378,15 @@
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -10222,7 +10211,7 @@ index 7ed280b..c7d06c3
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
-@@ -1030,11 +1397,13 @@ func_infer_tag ()
+@@ -1030,11 +1397,13 @@
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -10239,7 +10228,7 @@ index 7ed280b..c7d06c3
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
-@@ -1097,6 +1466,486 @@ EOF
+@@ -1097,6 +1466,486 @@
}
}
@@ -10726,7 +10715,7 @@ index 7ed280b..c7d06c3
# func_mode_compile arg...
func_mode_compile ()
{
-@@ -1137,12 +1986,12 @@ func_mode_compile ()
+@@ -1137,12 +1986,12 @@
;;
-pie | -fpie | -fPIE)
@@ -10741,7 +10730,7 @@ index 7ed280b..c7d06c3
continue
;;
-@@ -1163,15 +2012,14 @@ func_mode_compile ()
+@@ -1163,15 +2012,14 @@
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
@@ -10759,7 +10748,7 @@ index 7ed280b..c7d06c3
continue
;;
-@@ -1187,8 +2035,7 @@ func_mode_compile ()
+@@ -1187,8 +2035,7 @@
esac # case $arg_mode
# Aesthetically quote the previous argument.
@@ -10769,7 +10758,7 @@ index 7ed280b..c7d06c3
done # for arg
case $arg_mode in
-@@ -1213,7 +2060,7 @@ func_mode_compile ()
+@@ -1213,7 +2060,7 @@
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
@@ -10778,7 +10767,7 @@ index 7ed280b..c7d06c3
func_xform "$libobj"
libobj=$func_xform_result
;;
-@@ -1288,7 +2135,7 @@ func_mode_compile ()
+@@ -1288,7 +2135,7 @@
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
@@ -10787,7 +10776,7 @@ index 7ed280b..c7d06c3
lockfile="$output_obj.lock"
else
output_obj=
-@@ -1319,17 +2166,16 @@ compiler."
+@@ -1319,17 +2166,16 @@
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
@@ -10809,7 +10798,7 @@ index 7ed280b..c7d06c3
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
-@@ -1349,7 +2195,7 @@ compiler."
+@@ -1349,7 +2195,7 @@
if test -z "$output_obj"; then
# Place PIC objects in $objdir
@@ -10818,7 +10807,7 @@ index 7ed280b..c7d06c3
fi
func_show_eval_locale "$command" \
-@@ -1396,11 +2242,11 @@ compiler."
+@@ -1396,11 +2242,11 @@
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
@@ -10832,7 +10821,7 @@ index 7ed280b..c7d06c3
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-@@ -1445,13 +2291,13 @@ compiler."
+@@ -1445,13 +2291,13 @@
}
$opt_help || {
@@ -10848,7 +10837,7 @@ index 7ed280b..c7d06c3
"")
# Generic help is extracted from the usage comments
# at the start of this file.
-@@ -1482,10 +2328,11 @@ This mode accepts the following additional options:
+@@ -1482,10 +2328,11 @@
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
@@ -10862,7 +10851,7 @@ index 7ed280b..c7d06c3
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
-@@ -1538,7 +2385,7 @@ either the \`install' or \`cp' program.
+@@ -1538,7 +2385,7 @@
The following components of INSTALL-COMMAND are treated specially:
@@ -10871,7 +10860,7 @@ index 7ed280b..c7d06c3
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
-@@ -1558,6 +2405,8 @@ The following components of LINK-COMMAND are treated specially:
+@@ -1558,6 +2405,8 @@
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
@@ -10880,7 +10869,7 @@ index 7ed280b..c7d06c3
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-@@ -1586,6 +2435,11 @@ The following components of LINK-COMMAND are treated specially:
+@@ -1586,6 +2435,11 @@
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
@@ -10892,7 +10881,7 @@ index 7ed280b..c7d06c3
All other options (arguments beginning with \`-') are ignored.
-@@ -1619,18 +2473,44 @@ Otherwise, only FILE itself is deleted using RM."
+@@ -1619,18 +2473,44 @@
;;
*)
@@ -10943,7 +10932,7 @@ index 7ed280b..c7d06c3
# func_mode_execute arg...
-@@ -1643,13 +2523,16 @@ func_mode_execute ()
+@@ -1643,13 +2523,16 @@
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
@@ -10961,7 +10950,7 @@ index 7ed280b..c7d06c3
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
-@@ -1671,7 +2554,7 @@ func_mode_execute ()
+@@ -1671,7 +2554,7 @@
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
@@ -10970,7 +10959,7 @@ index 7ed280b..c7d06c3
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-@@ -1712,7 +2595,7 @@ func_mode_execute ()
+@@ -1712,7 +2595,7 @@
for file
do
case $file in
@@ -10979,7 +10968,7 @@ index 7ed280b..c7d06c3
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
-@@ -1728,8 +2611,7 @@ func_mode_execute ()
+@@ -1728,8 +2611,7 @@
;;
esac
# Quote arguments (to preserve shell metacharacters).
@@ -10989,7 +10978,7 @@ index 7ed280b..c7d06c3
done
if test "X$opt_dry_run" = Xfalse; then
-@@ -1754,29 +2636,66 @@ func_mode_execute ()
+@@ -1754,29 +2636,66 @@
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
@@ -11003,22 +10992,16 @@ index 7ed280b..c7d06c3
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
- # func_mode_finish arg...
- func_mode_finish ()
- {
- $opt_debug
-- libdirs="$nonopt"
++
++
++# func_mode_finish arg...
++func_mode_finish ()
++{
++ $opt_debug
+ libs=
+ libdirs=
- admincmds=
-
-- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-- for dir
-- do
-- libdirs="$libdirs $dir"
-- done
++ admincmds=
++
+ for opt in "$nonopt" ${1+"$@"}
+ do
+ if test -d "$opt"; then
@@ -11035,7 +11018,7 @@ index 7ed280b..c7d06c3
+ func_fatal_error "invalid argument \`$opt'"
+ fi
+ done
-+
+
+ if test -n "$libs"; then
+ if test -n "$lt_sysroot"; then
+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
@@ -11043,7 +11026,13 @@ index 7ed280b..c7d06c3
+ else
+ sysroot_cmd=
+ fi
-+
+
+-# func_mode_finish arg...
+-func_mode_finish ()
+-{
+- $opt_debug
+- libdirs="$nonopt"
+- admincmds=
+ # Remove sysroot references
+ if $opt_dry_run; then
+ for lib in $libs; do
@@ -11060,11 +11049,16 @@ index 7ed280b..c7d06c3
+ fi
+ fi
-+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+- for dir
+- do
+- libdirs="$libdirs $dir"
+- done
+-
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
-@@ -1786,7 +2705,7 @@ func_mode_finish ()
+@@ -1786,7 +2705,7 @@
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
@@ -11073,7 +11067,7 @@ index 7ed280b..c7d06c3
$cmds"
fi
done
-@@ -1795,53 +2714,55 @@ func_mode_finish ()
+@@ -1795,53 +2714,55 @@
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
@@ -11171,7 +11165,7 @@ index 7ed280b..c7d06c3
# func_mode_install arg...
-@@ -1852,7 +2773,7 @@ func_mode_install ()
+@@ -1852,7 +2773,7 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -11180,7 +11174,7 @@ index 7ed280b..c7d06c3
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
-@@ -1866,7 +2787,12 @@ func_mode_install ()
+@@ -1866,7 +2787,12 @@
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
@@ -11194,7 +11188,7 @@ index 7ed280b..c7d06c3
# We need to accept at least all the BSD install flags.
dest=
-@@ -1876,10 +2802,12 @@ func_mode_install ()
+@@ -1876,10 +2802,12 @@
install_type=
isdir=no
stripme=
@@ -11208,7 +11202,7 @@ index 7ed280b..c7d06c3
dest=$arg
continue
fi
-@@ -1887,10 +2815,9 @@ func_mode_install ()
+@@ -1887,10 +2815,9 @@
case $arg in
-d) isdir=yes ;;
-f)
@@ -11222,7 +11216,7 @@ index 7ed280b..c7d06c3
;;
-g | -m | -o)
prev=$arg
-@@ -1904,6 +2831,10 @@ func_mode_install ()
+@@ -1904,6 +2831,10 @@
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
@@ -11233,7 +11227,7 @@ index 7ed280b..c7d06c3
prev=
else
dest=$arg
-@@ -1914,7 +2845,11 @@ func_mode_install ()
+@@ -1914,7 +2845,11 @@
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
@@ -11246,7 +11240,7 @@ index 7ed280b..c7d06c3
done
test -z "$install_prog" && \
-@@ -1923,6 +2858,13 @@ func_mode_install ()
+@@ -1923,6 +2858,13 @@
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
@@ -11260,7 +11254,7 @@ index 7ed280b..c7d06c3
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
-@@ -1977,10 +2919,13 @@ func_mode_install ()
+@@ -1977,10 +2919,13 @@
case $file in
*.$libext)
# Do the static libraries later.
@@ -11275,7 +11269,7 @@ index 7ed280b..c7d06c3
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
-@@ -1994,23 +2939,23 @@ func_mode_install ()
+@@ -1994,23 +2939,23 @@
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
@@ -11303,7 +11297,7 @@ index 7ed280b..c7d06c3
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
-@@ -2023,9 +2968,9 @@ func_mode_install ()
+@@ -2023,9 +2968,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -11315,7 +11309,7 @@ index 7ed280b..c7d06c3
fi
func_warning "relinking \`$file'"
-@@ -2043,7 +2988,7 @@ func_mode_install ()
+@@ -2043,7 +2988,7 @@
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
@@ -11324,7 +11318,7 @@ index 7ed280b..c7d06c3
'exit $?'
tstripme="$stripme"
case $host_os in
-@@ -2083,7 +3028,7 @@ func_mode_install ()
+@@ -2083,7 +3028,7 @@
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -11333,7 +11327,7 @@ index 7ed280b..c7d06c3
;;
*.lo)
-@@ -2183,7 +3128,7 @@ func_mode_install ()
+@@ -2183,7 +3128,7 @@
if test -f "$lib"; then
func_source "$lib"
fi
@@ -11342,7 +11336,7 @@ index 7ed280b..c7d06c3
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
-@@ -2202,7 +3147,7 @@ func_mode_install ()
+@@ -2202,7 +3147,7 @@
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -11351,7 +11345,7 @@ index 7ed280b..c7d06c3
$opt_silent || {
func_quote_for_expand "$relink_command"
-@@ -2221,7 +3166,7 @@ func_mode_install ()
+@@ -2221,7 +3166,7 @@
}
else
# Install the binary that we compiled earlier.
@@ -11360,7 +11354,7 @@ index 7ed280b..c7d06c3
fi
fi
-@@ -2257,11 +3202,13 @@ func_mode_install ()
+@@ -2257,11 +3202,13 @@
# Set up the ranlib parameters.
oldlib="$destdir/$name"
@@ -11375,7 +11369,7 @@ index 7ed280b..c7d06c3
fi
# Do each command in the postinstall commands.
-@@ -2280,7 +3227,7 @@ func_mode_install ()
+@@ -2280,7 +3227,7 @@
fi
}
@@ -11384,7 +11378,7 @@ index 7ed280b..c7d06c3
# func_generate_dlsyms outputname originator pic_p
-@@ -2323,6 +3270,22 @@ func_generate_dlsyms ()
+@@ -2323,6 +3270,22 @@
extern \"C\" {
#endif
@@ -11407,7 +11401,7 @@ index 7ed280b..c7d06c3
/* External symbol declarations for the compiler. */\
"
-@@ -2332,10 +3295,11 @@ extern \"C\" {
+@@ -2332,10 +3295,11 @@
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
@@ -11422,7 +11416,7 @@ index 7ed280b..c7d06c3
done
if test -n "$exclude_expsyms"; then
-@@ -2371,7 +3335,7 @@ extern \"C\" {
+@@ -2371,7 +3335,7 @@
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -11431,7 +11425,7 @@ index 7ed280b..c7d06c3
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
-@@ -2384,10 +3348,52 @@ extern \"C\" {
+@@ -2384,10 +3348,52 @@
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
@@ -11488,7 +11482,7 @@ index 7ed280b..c7d06c3
done
$opt_dry_run || {
-@@ -2415,36 +3421,19 @@ extern \"C\" {
+@@ -2415,36 +3421,19 @@
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
@@ -11529,7 +11523,7 @@ index 7ed280b..c7d06c3
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
-@@ -2457,7 +3446,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
+@@ -2457,7 +3446,7 @@
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
@@ -11538,7 +11532,7 @@ index 7ed280b..c7d06c3
{0, (void *) 0}
};
-@@ -2484,7 +3473,7 @@ static const void *lt_preloaded_setup() {
+@@ -2484,7 +3473,7 @@
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
@@ -11547,7 +11541,7 @@ index 7ed280b..c7d06c3
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
-@@ -2500,7 +3489,7 @@ static const void *lt_preloaded_setup() {
+@@ -2500,7 +3489,7 @@
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
@@ -11556,7 +11550,7 @@ index 7ed280b..c7d06c3
esac
done
-@@ -2515,16 +3504,16 @@ static const void *lt_preloaded_setup() {
+@@ -2515,16 +3504,16 @@
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -11579,7 +11573,7 @@ index 7ed280b..c7d06c3
;;
esac
;;
-@@ -2538,8 +3527,8 @@ static const void *lt_preloaded_setup() {
+@@ -2538,8 +3527,8 @@
# really was required.
# Nullify the symbol file.
@@ -11590,7 +11584,7 @@ index 7ed280b..c7d06c3
fi
}
-@@ -2549,6 +3538,7 @@ static const void *lt_preloaded_setup() {
+@@ -2549,6 +3538,7 @@
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
@@ -11598,7 +11592,7 @@ index 7ed280b..c7d06c3
func_win32_libid ()
{
$opt_debug
-@@ -2559,9 +3549,11 @@ func_win32_libid ()
+@@ -2559,9 +3549,11 @@
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
@@ -11612,7 +11606,7 @@ index 7ed280b..c7d06c3
$SED -n -e '
1,100{
/ I /{
-@@ -2590,6 +3582,131 @@ func_win32_libid ()
+@@ -2590,6 +3582,131 @@
$ECHO "$win32_libid_type"
}
@@ -11744,7 +11738,7 @@ index 7ed280b..c7d06c3
# func_extract_an_archive dir oldlib
-@@ -2598,7 +3715,18 @@ func_extract_an_archive ()
+@@ -2598,7 +3715,18 @@
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
@@ -11764,7 +11758,7 @@ index 7ed280b..c7d06c3
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
-@@ -2669,7 +3797,7 @@ func_extract_archives ()
+@@ -2669,7 +3797,7 @@
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -11773,7 +11767,7 @@ index 7ed280b..c7d06c3
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
-@@ -2684,25 +3812,30 @@ func_extract_archives ()
+@@ -2684,25 +3812,30 @@
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
@@ -11788,34 +11782,35 @@ index 7ed280b..c7d06c3
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [arg=no]
-+#
+ #
+-# 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_part1_arg1=no
+- if test -n "$1" ; then
+- func_emit_wrapper_part1_arg1=$1
+- fi
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
- #
--# Emit the first part of a libtool wrapper script on stdout.
--# For more information, see the description associated with
--# func_emit_wrapper(), below.
--func_emit_wrapper_part1 ()
++#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take. If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
- {
-- func_emit_wrapper_part1_arg1=no
-- if test -n "$1" ; then
-- func_emit_wrapper_part1_arg1=$1
-- fi
++{
+ func_emit_wrapper_arg1=${1-no}
$ECHO "\
#! $SHELL
-@@ -2718,7 +3851,6 @@ func_emit_wrapper_part1 ()
+@@ -2718,7 +3851,6 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -11823,7 +11818,7 @@ index 7ed280b..c7d06c3
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
-@@ -2749,31 +3881,135 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
+@@ -2749,31 +3881,135 @@
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
@@ -11977,7 +11972,7 @@ index 7ed280b..c7d06c3
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
-@@ -2783,30 +4019,13 @@ else
+@@ -2783,30 +4019,13 @@
esac
fi
@@ -12011,7 +12006,7 @@ index 7ed280b..c7d06c3
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
-@@ -2814,7 +4033,7 @@ func_emit_wrapper_part2 ()
+@@ -2814,7 +4033,7 @@
fi
# remove .libs from thisdir
case \"\$thisdir\" in
@@ -12020,7 +12015,7 @@ index 7ed280b..c7d06c3
$objdir ) thisdir=. ;;
esac
fi
-@@ -2869,6 +4088,18 @@ func_emit_wrapper_part2 ()
+@@ -2869,6 +4088,18 @@
if test -f \"\$progdir/\$program\"; then"
@@ -12039,7 +12034,7 @@ index 7ed280b..c7d06c3
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
-@@ -2877,253 +4108,28 @@ func_emit_wrapper_part2 ()
+@@ -2877,253 +4108,28 @@
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
@@ -12195,7 +12190,7 @@ index 7ed280b..c7d06c3
- fi
-}
-# end: func_to_host_path
-
+-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
@@ -12293,10 +12288,11 @@ index 7ed280b..c7d06c3
- fi
-}
-# end: func_to_host_pathlist
++
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
-@@ -3141,31 +4147,23 @@ func_emit_cwrapperexe_src ()
+@@ -3141,31 +4147,23 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
@@ -12331,7 +12327,7 @@ index 7ed280b..c7d06c3
# endif
#endif
#include <malloc.h>
-@@ -3177,6 +4175,44 @@ int setenv (const char *, const char *, int);
+@@ -3177,6 +4175,44 @@
#include <fcntl.h>
#include <sys/stat.h>
@@ -12376,7 +12372,7 @@ index 7ed280b..c7d06c3
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
-@@ -3192,14 +4228,7 @@ int setenv (const char *, const char *, int);
+@@ -3192,14 +4228,7 @@
# define S_IXGRP 0
#endif
@@ -12392,7 +12388,7 @@ index 7ed280b..c7d06c3
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
-@@ -3230,10 +4259,6 @@ int setenv (const char *, const char *, int);
+@@ -3230,10 +4259,6 @@
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
@@ -12403,7 +12399,7 @@ index 7ed280b..c7d06c3
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
-@@ -3246,22 +4271,13 @@ int setenv (const char *, const char *, int);
+@@ -3246,22 +4271,13 @@
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
@@ -12430,7 +12426,7 @@ index 7ed280b..c7d06c3
void *xmalloc (size_t num);
char *xstrdup (const char *string);
-@@ -3271,41 +4287,27 @@ char *chase_symlinks (const char *pathspec);
+@@ -3271,41 +4287,27 @@
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
@@ -12481,7 +12477,7 @@ index 7ed280b..c7d06c3
EOF
else
cat <<"EOF"
-@@ -3314,10 +4316,10 @@ EOF
+@@ -3314,10 +4316,10 @@
fi
if test -n "$dllsearchpath"; then
@@ -12494,7 +12490,7 @@ index 7ed280b..c7d06c3
EOF
else
cat <<"EOF"
-@@ -3340,24 +4342,10 @@ EOF
+@@ -3340,24 +4342,10 @@
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
@@ -12520,7 +12516,7 @@ index 7ed280b..c7d06c3
int
main (int argc, char *argv[])
-@@ -3374,10 +4362,13 @@ main (int argc, char *argv[])
+@@ -3374,10 +4362,13 @@
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
@@ -12537,7 +12533,7 @@ index 7ed280b..c7d06c3
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3391,25 +4382,57 @@ EOF
+@@ -3391,25 +4382,57 @@
esac
cat <<"EOF"
@@ -12604,7 +12600,7 @@ index 7ed280b..c7d06c3
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
-@@ -3427,8 +4450,9 @@ EOF
+@@ -3427,8 +4450,9 @@
target_name = tmp_pathspec;
tmp_pathspec = 0;
@@ -12616,7 +12612,7 @@ index 7ed280b..c7d06c3
EOF
cat <<EOF
-@@ -3478,80 +4502,19 @@ EOF
+@@ -3478,80 +4502,19 @@
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
@@ -12706,7 +12702,7 @@ index 7ed280b..c7d06c3
}
EOF
-@@ -3560,11 +4523,14 @@ EOF
+@@ -3560,11 +4523,14 @@
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
@@ -12722,7 +12718,7 @@ index 7ed280b..c7d06c3
return 127;
}
return rval;
-@@ -3586,7 +4552,7 @@ xmalloc (size_t num)
+@@ -3586,7 +4552,7 @@
{
void *p = (void *) malloc (num);
if (!p)
@@ -12731,7 +12727,7 @@ index 7ed280b..c7d06c3
return p;
}
-@@ -3620,8 +4586,8 @@ check_executable (const char *path)
+@@ -3620,8 +4586,8 @@
{
struct stat st;
@@ -12742,7 +12738,7 @@ index 7ed280b..c7d06c3
if ((!path) || (!*path))
return 0;
-@@ -3638,8 +4604,8 @@ make_executable (const char *path)
+@@ -3638,8 +4604,8 @@
int rval = 0;
struct stat st;
@@ -12753,7 +12749,7 @@ index 7ed280b..c7d06c3
if ((!path) || (!*path))
return 0;
-@@ -3665,8 +4631,8 @@ find_executable (const char *wrapper)
+@@ -3665,8 +4631,8 @@
int tmp_len;
char *concat_name;
@@ -12764,7 +12760,7 @@ index 7ed280b..c7d06c3
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
-@@ -3719,7 +4685,8 @@ find_executable (const char *wrapper)
+@@ -3719,7 +4685,8 @@
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -12774,7 +12770,7 @@ index 7ed280b..c7d06c3
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3744,7 +4711,8 @@ find_executable (const char *wrapper)
+@@ -3744,7 +4711,8 @@
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -12784,7 +12780,7 @@ index 7ed280b..c7d06c3
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
-@@ -3770,8 +4738,9 @@ chase_symlinks (const char *pathspec)
+@@ -3770,8 +4738,9 @@
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
@@ -12796,7 +12792,7 @@ index 7ed280b..c7d06c3
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
-@@ -3793,8 +4762,9 @@ chase_symlinks (const char *pathspec)
+@@ -3793,8 +4762,9 @@
}
else
{
@@ -12808,7 +12804,7 @@ index 7ed280b..c7d06c3
}
}
XFREE (tmp_pathspec);
-@@ -3807,7 +4777,8 @@ chase_symlinks (const char *pathspec)
+@@ -3807,7 +4777,8 @@
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
@@ -12818,7 +12814,7 @@ index 7ed280b..c7d06c3
}
return xstrdup (tmp_pathspec);
#endif
-@@ -3833,11 +4804,25 @@ strendzap (char *str, const char *pat)
+@@ -3833,11 +4804,25 @@
return str;
}
@@ -12846,7 +12842,7 @@ index 7ed280b..c7d06c3
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
-@@ -3846,20 +4831,32 @@ lt_error_core (int exit_status, const char *mode,
+@@ -3846,20 +4831,32 @@
}
void
@@ -12884,7 +12880,7 @@ index 7ed280b..c7d06c3
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
-@@ -3904,95 +4901,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
+@@ -3904,95 +4901,12 @@
return new_value;
}
@@ -12983,7 +12979,7 @@ index 7ed280b..c7d06c3
if (name && *name && value && *value)
{
-@@ -4011,9 +4925,9 @@ lt_update_exe_path (const char *name, const char *value)
+@@ -4011,9 +4925,9 @@
void
lt_update_lib_path (const char *name, const char *value)
{
@@ -12996,7 +12992,7 @@ index 7ed280b..c7d06c3
if (name && *name && value && *value)
{
-@@ -4023,11 +4937,158 @@ lt_update_lib_path (const char *name, const char *value)
+@@ -4023,11 +4937,158 @@
}
}
@@ -13155,7 +13151,7 @@ index 7ed280b..c7d06c3
# func_mode_link arg...
func_mode_link ()
{
-@@ -4072,6 +5133,7 @@ func_mode_link ()
+@@ -4072,6 +5133,7 @@
new_inherited_linker_flags=
avoid_version=no
@@ -13163,7 +13159,7 @@ index 7ed280b..c7d06c3
dlfiles=
dlprefiles=
dlself=no
-@@ -4164,6 +5226,11 @@ func_mode_link ()
+@@ -4164,6 +5226,11 @@
esac
case $prev in
@@ -13175,7 +13171,7 @@ index 7ed280b..c7d06c3
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
-@@ -4195,9 +5262,9 @@ func_mode_link ()
+@@ -4195,9 +5262,9 @@
;;
*)
if test "$prev" = dlfiles; then
@@ -13187,7 +13183,7 @@ index 7ed280b..c7d06c3
fi
prev=
continue
-@@ -4221,7 +5288,7 @@ func_mode_link ()
+@@ -4221,7 +5288,7 @@
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
@@ -13196,7 +13192,7 @@ index 7ed280b..c7d06c3
;;
esac
;;
-@@ -4240,7 +5307,7 @@ func_mode_link ()
+@@ -4240,7 +5307,7 @@
moreargs=
for fil in `cat "$save_arg"`
do
@@ -13205,7 +13201,7 @@ index 7ed280b..c7d06c3
arg=$fil
# A libtool-controlled object.
-@@ -4269,7 +5336,7 @@ func_mode_link ()
+@@ -4269,7 +5336,7 @@
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -13214,7 +13210,7 @@ index 7ed280b..c7d06c3
prev=
continue
else
-@@ -4281,7 +5348,7 @@ func_mode_link ()
+@@ -4281,7 +5348,7 @@
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
@@ -13223,7 +13219,7 @@ index 7ed280b..c7d06c3
prev=
fi
-@@ -4351,12 +5418,12 @@ func_mode_link ()
+@@ -4351,12 +5418,12 @@
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
@@ -13238,7 +13234,7 @@ index 7ed280b..c7d06c3
esac
fi
prev=
-@@ -4368,28 +5435,28 @@ func_mode_link ()
+@@ -4368,28 +5435,28 @@
continue
;;
weak)
@@ -13273,7 +13269,7 @@ index 7ed280b..c7d06c3
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
-@@ -4425,6 +5492,11 @@ func_mode_link ()
+@@ -4425,6 +5492,11 @@
continue
;;
@@ -13285,7 +13281,7 @@ index 7ed280b..c7d06c3
-dlopen)
prev=dlfiles
continue
-@@ -4475,15 +5547,16 @@ func_mode_link ()
+@@ -4475,15 +5547,16 @@
;;
-L*)
@@ -13305,7 +13301,7 @@ index 7ed280b..c7d06c3
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -4495,24 +5568,30 @@ func_mode_link ()
+@@ -4495,24 +5568,30 @@
;;
esac
case "$deplibs " in
@@ -13342,7 +13338,7 @@ index 7ed280b..c7d06c3
esac
;;
esac
-@@ -4522,7 +5601,7 @@ func_mode_link ()
+@@ -4522,7 +5601,7 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -13351,7 +13347,7 @@ index 7ed280b..c7d06c3
# These systems don't actually have a C or math library (as such)
continue
;;
-@@ -4536,7 +5615,7 @@ func_mode_link ()
+@@ -4536,7 +5615,7 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -13360,7 +13356,7 @@ index 7ed280b..c7d06c3
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
-@@ -4556,7 +5635,7 @@ func_mode_link ()
+@@ -4556,7 +5635,7 @@
;;
esac
fi
@@ -13369,7 +13365,7 @@ index 7ed280b..c7d06c3
continue
;;
-@@ -4568,21 +5647,22 @@ func_mode_link ()
+@@ -4568,21 +5647,22 @@
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
@@ -13397,7 +13393,7 @@ index 7ed280b..c7d06c3
esac
continue
;;
-@@ -4649,13 +5729,17 @@ func_mode_link ()
+@@ -4649,13 +5729,17 @@
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -13416,7 +13412,7 @@ index 7ed280b..c7d06c3
esac
continue
;;
-@@ -4708,8 +5792,8 @@ func_mode_link ()
+@@ -4708,8 +5792,8 @@
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
@@ -13427,7 +13423,7 @@ index 7ed280b..c7d06c3
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
-@@ -4724,9 +5808,9 @@ func_mode_link ()
+@@ -4724,9 +5808,9 @@
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
@@ -13440,7 +13436,7 @@ index 7ed280b..c7d06c3
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
-@@ -4754,23 +5838,27 @@ func_mode_link ()
+@@ -4754,23 +5838,27 @@
arg="$func_quote_for_eval_result"
;;
@@ -13480,7 +13476,7 @@ index 7ed280b..c7d06c3
continue
;;
-@@ -4782,7 +5870,7 @@ func_mode_link ()
+@@ -4782,7 +5870,7 @@
*.$objext)
# A standard object.
@@ -13489,7 +13485,7 @@ index 7ed280b..c7d06c3
;;
*.lo)
-@@ -4813,7 +5901,7 @@ func_mode_link ()
+@@ -4813,7 +5901,7 @@
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -13498,7 +13494,7 @@ index 7ed280b..c7d06c3
prev=
continue
else
-@@ -4825,7 +5913,7 @@ func_mode_link ()
+@@ -4825,7 +5913,7 @@
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
@@ -13507,7 +13503,7 @@ index 7ed280b..c7d06c3
prev=
fi
-@@ -4870,24 +5958,25 @@ func_mode_link ()
+@@ -4870,24 +5958,25 @@
*.$libext)
# An archive.
@@ -13538,7 +13534,7 @@ index 7ed280b..c7d06c3
fi
continue
;;
-@@ -4925,7 +6014,7 @@ func_mode_link ()
+@@ -4925,7 +6014,7 @@
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
@@ -13547,7 +13543,7 @@ index 7ed280b..c7d06c3
else
shlib_search_path=
fi
-@@ -4934,6 +6023,8 @@ func_mode_link ()
+@@ -4934,6 +6023,8 @@
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
@@ -13556,7 +13552,7 @@ index 7ed280b..c7d06c3
# Create the object directory.
func_mkdir_p "$output_objdir"
-@@ -4954,12 +6045,12 @@ func_mode_link ()
+@@ -4954,12 +6045,12 @@
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
@@ -13572,7 +13568,7 @@ index 7ed280b..c7d06c3
done
if test "$linkmode" = lib; then
-@@ -4972,9 +6063,9 @@ func_mode_link ()
+@@ -4972,9 +6063,9 @@
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
@@ -13584,7 +13580,7 @@ index 7ed280b..c7d06c3
done
fi
pre_post_deps=
-@@ -5044,17 +6135,19 @@ func_mode_link ()
+@@ -5044,17 +6135,19 @@
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
@@ -13607,7 +13603,7 @@ index 7ed280b..c7d06c3
esac
done
done
-@@ -5070,16 +6163,17 @@ func_mode_link ()
+@@ -5070,16 +6163,17 @@
lib=
found=no
case $deplib in
@@ -13628,7 +13624,7 @@ index 7ed280b..c7d06c3
esac
fi
fi
-@@ -5164,7 +6258,7 @@ func_mode_link ()
+@@ -5164,7 +6258,7 @@
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
@@ -13637,7 +13633,7 @@ index 7ed280b..c7d06c3
esac
fi
fi
-@@ -5177,7 +6271,8 @@ func_mode_link ()
+@@ -5177,7 +6271,8 @@
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
@@ -13647,7 +13643,7 @@ index 7ed280b..c7d06c3
;;
prog)
if test "$pass" = conv; then
-@@ -5191,7 +6286,8 @@ func_mode_link ()
+@@ -5191,7 +6286,8 @@
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
@@ -13657,7 +13653,7 @@ index 7ed280b..c7d06c3
;;
*)
func_warning "\`-L' is ignored for archives/objects"
-@@ -5202,17 +6298,21 @@ func_mode_link ()
+@@ -5202,17 +6298,21 @@
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
@@ -13682,7 +13678,7 @@ index 7ed280b..c7d06c3
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
-@@ -5230,7 +6330,7 @@ func_mode_link ()
+@@ -5230,7 +6330,7 @@
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
@@ -13691,7 +13687,7 @@ index 7ed280b..c7d06c3
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
-@@ -5240,15 +6340,15 @@ func_mode_link ()
+@@ -5240,15 +6340,15 @@
;;
esac
if test "$valid_a_lib" != yes; then
@@ -13714,7 +13710,7 @@ index 7ed280b..c7d06c3
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
-@@ -5275,11 +6375,11 @@ func_mode_link ()
+@@ -5275,11 +6375,11 @@
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
@@ -13728,7 +13724,7 @@ index 7ed280b..c7d06c3
fi
fi
continue
-@@ -5321,20 +6421,20 @@ func_mode_link ()
+@@ -5321,20 +6421,20 @@
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
@@ -13754,7 +13750,7 @@ index 7ed280b..c7d06c3
fi
if test "$pass" = conv; then
-@@ -5345,17 +6445,17 @@ func_mode_link ()
+@@ -5345,17 +6445,17 @@
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
@@ -13777,7 +13773,7 @@ index 7ed280b..c7d06c3
done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
-@@ -5366,9 +6466,15 @@ func_mode_link ()
+@@ -5366,9 +6466,15 @@
# Get the name of the library we link against.
linklib=
@@ -13796,7 +13792,7 @@ index 7ed280b..c7d06c3
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
-@@ -5385,9 +6491,9 @@ func_mode_link ()
+@@ -5385,9 +6491,9 @@
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
@@ -13808,7 +13804,7 @@ index 7ed280b..c7d06c3
fi
continue
fi # $pass = dlopen
-@@ -5409,14 +6515,14 @@ func_mode_link ()
+@@ -5409,14 +6515,14 @@
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
@@ -13826,7 +13822,7 @@ index 7ed280b..c7d06c3
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
-@@ -5424,12 +6530,12 @@ func_mode_link ()
+@@ -5424,12 +6530,12 @@
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
@@ -13841,7 +13837,7 @@ index 7ed280b..c7d06c3
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
-@@ -5440,20 +6546,46 @@ func_mode_link ()
+@@ -5440,20 +6546,46 @@
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
@@ -13902,7 +13898,7 @@ index 7ed280b..c7d06c3
fi # $pass = dlpreopen
if test -z "$libdir"; then
-@@ -5471,7 +6603,7 @@ func_mode_link ()
+@@ -5471,7 +6603,7 @@
if test "$linkmode" = prog && test "$pass" != link; then
@@ -13911,7 +13907,7 @@ index 7ed280b..c7d06c3
deplibs="$lib $deplibs"
linkalldeplibs=no
-@@ -5484,7 +6616,8 @@ func_mode_link ()
+@@ -5484,7 +6616,8 @@
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
@@ -13921,7 +13917,7 @@ index 7ed280b..c7d06c3
;;
esac
# Need to link against all dependency_libs?
-@@ -5495,12 +6628,12 @@ func_mode_link ()
+@@ -5495,12 +6628,12 @@
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
@@ -13937,7 +13933,7 @@ index 7ed280b..c7d06c3
done # for deplib
continue
fi # $linkmode = prog...
-@@ -5515,7 +6648,7 @@ func_mode_link ()
+@@ -5515,7 +6648,7 @@
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
@@ -13946,7 +13942,7 @@ index 7ed280b..c7d06c3
esac
fi
-@@ -5527,7 +6660,7 @@ func_mode_link ()
+@@ -5527,7 +6660,7 @@
*)
case "$compile_rpath " in
*" $absdir "*) ;;
@@ -13955,7 +13951,7 @@ index 7ed280b..c7d06c3
esac
;;
esac
-@@ -5536,7 +6669,7 @@ func_mode_link ()
+@@ -5536,7 +6669,7 @@
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -13964,7 +13960,7 @@ index 7ed280b..c7d06c3
esac
;;
esac
-@@ -5561,12 +6694,12 @@ func_mode_link ()
+@@ -5561,12 +6694,12 @@
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
@@ -13979,7 +13975,7 @@ index 7ed280b..c7d06c3
need_relink=yes
fi
;;
-@@ -5583,7 +6716,7 @@ func_mode_link ()
+@@ -5583,7 +6716,7 @@
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
@@ -13988,7 +13984,7 @@ index 7ed280b..c7d06c3
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
-@@ -5601,7 +6734,7 @@ func_mode_link ()
+@@ -5601,7 +6734,7 @@
*)
case "$compile_rpath " in
*" $absdir "*) ;;
@@ -13997,7 +13993,7 @@ index 7ed280b..c7d06c3
esac
;;
esac
-@@ -5610,7 +6743,7 @@ func_mode_link ()
+@@ -5610,7 +6743,7 @@
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -14006,7 +14002,7 @@ index 7ed280b..c7d06c3
esac
;;
esac
-@@ -5664,7 +6797,7 @@ func_mode_link ()
+@@ -5664,7 +6797,7 @@
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
@@ -14015,7 +14011,7 @@ index 7ed280b..c7d06c3
add_shlibpath=
add_dir=
add=
-@@ -5686,9 +6819,9 @@ func_mode_link ()
+@@ -5686,9 +6819,9 @@
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
@@ -14028,7 +14024,7 @@ index 7ed280b..c7d06c3
else
add="$dir/$old_library"
fi
-@@ -5715,12 +6848,12 @@ func_mode_link ()
+@@ -5715,12 +6848,12 @@
test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
@@ -14043,7 +14039,7 @@ index 7ed280b..c7d06c3
;;
esac
fi
-@@ -5742,7 +6875,7 @@ func_mode_link ()
+@@ -5742,7 +6875,7 @@
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
@@ -14052,7 +14048,7 @@ index 7ed280b..c7d06c3
esac
fi
if test "$linkmode" = prog; then
-@@ -5756,13 +6889,13 @@ func_mode_link ()
+@@ -5756,13 +6889,13 @@
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
@@ -14068,7 +14064,7 @@ index 7ed280b..c7d06c3
add_shlibpath=
add_dir=
add=
-@@ -5776,7 +6909,7 @@ func_mode_link ()
+@@ -5776,7 +6909,7 @@
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
@@ -14077,7 +14073,7 @@ index 7ed280b..c7d06c3
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
-@@ -5793,7 +6926,7 @@ func_mode_link ()
+@@ -5793,7 +6926,7 @@
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
@@ -14086,7 +14082,7 @@ index 7ed280b..c7d06c3
;;
esac
fi
-@@ -5828,21 +6961,21 @@ func_mode_link ()
+@@ -5828,21 +6961,21 @@
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
@@ -14120,7 +14116,7 @@ index 7ed280b..c7d06c3
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
-@@ -5870,27 +7003,33 @@ func_mode_link ()
+@@ -5870,27 +7003,33 @@
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
@@ -14160,7 +14156,7 @@ index 7ed280b..c7d06c3
done
if test "$link_all_deplibs" != no; then
-@@ -5900,8 +7039,10 @@ func_mode_link ()
+@@ -5900,8 +7039,10 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
@@ -14172,7 +14168,7 @@ index 7ed280b..c7d06c3
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-@@ -5928,8 +7069,8 @@ func_mode_link ()
+@@ -5928,8 +7069,8 @@
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
@@ -14183,7 +14179,7 @@ index 7ed280b..c7d06c3
path=
fi
fi
-@@ -5962,7 +7103,7 @@ func_mode_link ()
+@@ -5962,7 +7103,7 @@
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
@@ -14192,7 +14188,7 @@ index 7ed280b..c7d06c3
fi
fi
dependency_libs="$newdependency_libs"
-@@ -5979,7 +7120,7 @@ func_mode_link ()
+@@ -5979,7 +7120,7 @@
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
@@ -14201,7 +14197,7 @@ index 7ed280b..c7d06c3
esac
done
newlib_search_path=
-@@ -6037,10 +7178,10 @@ func_mode_link ()
+@@ -6037,10 +7178,10 @@
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
@@ -14214,7 +14210,7 @@ index 7ed280b..c7d06c3
esac
done
eval $var=\"$tmp_libs\"
-@@ -6056,7 +7197,7 @@ func_mode_link ()
+@@ -6056,7 +7197,7 @@
;;
esac
if test -n "$i" ; then
@@ -14223,7 +14219,7 @@ index 7ed280b..c7d06c3
fi
done
dependency_libs=$tmp_libs
-@@ -6097,7 +7238,7 @@ func_mode_link ()
+@@ -6097,7 +7238,7 @@
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
@@ -14232,7 +14228,7 @@ index 7ed280b..c7d06c3
;;
lib)
-@@ -6130,10 +7271,10 @@ func_mode_link ()
+@@ -6130,10 +7271,10 @@
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
@@ -14245,7 +14241,7 @@ index 7ed280b..c7d06c3
fi
fi
-@@ -6192,13 +7333,14 @@ func_mode_link ()
+@@ -6192,13 +7333,14 @@
# which has an extra 1 added just for fun
#
case $version_type in
@@ -14261,7 +14257,7 @@ index 7ed280b..c7d06c3
current="$number_major"
revision="$number_minor"
age="0"
-@@ -6311,7 +7453,7 @@ func_mode_link ()
+@@ -6311,7 +7453,7 @@
versuffix="$major.$revision"
;;
@@ -14270,7 +14266,7 @@ index 7ed280b..c7d06c3
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
-@@ -6334,7 +7476,7 @@ func_mode_link ()
+@@ -6334,7 +7476,7 @@
done
# Make executables depend on our current version.
@@ -14279,7 +14275,7 @@ index 7ed280b..c7d06c3
;;
qnx)
-@@ -6402,10 +7544,10 @@ func_mode_link ()
+@@ -6402,10 +7544,10 @@
fi
func_generate_dlsyms "$libname" "$libname" "yes"
@@ -14292,7 +14288,7 @@ index 7ed280b..c7d06c3
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
-@@ -6421,7 +7563,7 @@ func_mode_link ()
+@@ -6421,7 +7563,7 @@
continue
fi
fi
@@ -14301,7 +14297,7 @@ index 7ed280b..c7d06c3
;;
*) ;;
esac
-@@ -6432,27 +7574,28 @@ func_mode_link ()
+@@ -6432,27 +7574,28 @@
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
@@ -14337,7 +14333,7 @@ index 7ed280b..c7d06c3
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-@@ -6466,7 +7609,7 @@ func_mode_link ()
+@@ -6466,7 +7609,7 @@
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
@@ -14346,7 +14342,7 @@ index 7ed280b..c7d06c3
esac
done
-@@ -6476,19 +7619,19 @@ func_mode_link ()
+@@ -6476,19 +7619,19 @@
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
@@ -14369,7 +14365,7 @@ index 7ed280b..c7d06c3
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
-@@ -6505,7 +7648,7 @@ func_mode_link ()
+@@ -6505,7 +7648,7 @@
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
@@ -14378,7 +14374,7 @@ index 7ed280b..c7d06c3
fi
;;
esac
-@@ -6554,7 +7697,7 @@ EOF
+@@ -6554,7 +7697,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -14387,7 +14383,7 @@ index 7ed280b..c7d06c3
i=""
;;
esac
-@@ -6565,21 +7708,21 @@ EOF
+@@ -6565,21 +7708,21 @@
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -14417,7 +14413,7 @@ index 7ed280b..c7d06c3
;;
esac
done
-@@ -6597,7 +7740,7 @@ EOF
+@@ -6597,7 +7740,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -14426,7 +14422,7 @@ index 7ed280b..c7d06c3
i=""
;;
esac
-@@ -6608,29 +7751,29 @@ EOF
+@@ -6608,29 +7751,29 @@
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -14468,7 +14464,7 @@ index 7ed280b..c7d06c3
;;
esac
done
-@@ -6647,15 +7790,27 @@ EOF
+@@ -6647,15 +7790,27 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -14498,7 +14494,7 @@ index 7ed280b..c7d06c3
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
-@@ -6672,13 +7827,13 @@ EOF
+@@ -6672,13 +7827,13 @@
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
@@ -14514,7 +14510,7 @@ index 7ed280b..c7d06c3
a_deplib=""
break 2
fi
-@@ -6687,12 +7842,12 @@ EOF
+@@ -6687,12 +7842,12 @@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -14532,7 +14528,7 @@ index 7ed280b..c7d06c3
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
-@@ -6703,7 +7858,7 @@ EOF
+@@ -6703,7 +7858,7 @@
;;
*)
# Add a -L argument.
@@ -14541,7 +14537,7 @@ index 7ed280b..c7d06c3
;;
esac
done # Gone through all deplibs.
-@@ -6719,7 +7874,7 @@ EOF
+@@ -6719,7 +7874,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -14550,7 +14546,7 @@ index 7ed280b..c7d06c3
a_deplib=""
;;
esac
-@@ -6730,9 +7885,9 @@ EOF
+@@ -6730,9 +7885,9 @@
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
@@ -14562,7 +14558,7 @@ index 7ed280b..c7d06c3
a_deplib=""
break 2
fi
-@@ -6741,12 +7896,12 @@ EOF
+@@ -6741,12 +7896,12 @@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -14580,7 +14576,7 @@ index 7ed280b..c7d06c3
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
-@@ -6757,32 +7912,32 @@ EOF
+@@ -6757,32 +7912,32 @@
;;
*)
# Add a -L argument.
@@ -14624,7 +14620,7 @@ index 7ed280b..c7d06c3
;;
esac
versuffix=$versuffix_save
-@@ -6794,23 +7949,23 @@ EOF
+@@ -6794,23 +7949,23 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
@@ -14658,7 +14654,7 @@ index 7ed280b..c7d06c3
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
-@@ -6820,16 +7975,16 @@ EOF
+@@ -6820,16 +7975,16 @@
build_libtool_libs=no
fi
else
@@ -14683,7 +14679,7 @@ index 7ed280b..c7d06c3
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
-@@ -6846,9 +8001,9 @@ EOF
+@@ -6846,9 +8001,9 @@
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
@@ -14696,7 +14692,7 @@ index 7ed280b..c7d06c3
;;
esac
-@@ -6861,7 +8016,7 @@ EOF
+@@ -6861,7 +8016,7 @@
*)
case " $deplibs " in
*" -L$path/$objdir "*)
@@ -14705,7 +14701,7 @@ index 7ed280b..c7d06c3
esac
;;
esac
-@@ -6871,10 +8026,10 @@ EOF
+@@ -6871,10 +8026,10 @@
-L*)
case " $new_libs " in
*" $deplib "*) ;;
@@ -14718,7 +14714,7 @@ index 7ed280b..c7d06c3
esac
done
deplibs="$new_libs"
-@@ -6886,15 +8041,22 @@ EOF
+@@ -6886,15 +8041,22 @@
# Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then
@@ -14742,7 +14738,7 @@ index 7ed280b..c7d06c3
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
-@@ -6903,18 +8065,18 @@ EOF
+@@ -6903,18 +8065,18 @@
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -14764,7 +14760,7 @@ index 7ed280b..c7d06c3
esac
fi
done
-@@ -6922,17 +8084,13 @@ EOF
+@@ -6922,17 +8084,13 @@
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
@@ -14784,7 +14780,7 @@ index 7ed280b..c7d06c3
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
-@@ -6940,7 +8098,7 @@ EOF
+@@ -6940,7 +8098,7 @@
fi
shlibpath="$finalize_shlibpath"
@@ -14793,7 +14789,7 @@ index 7ed280b..c7d06c3
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
-@@ -6966,18 +8124,18 @@ EOF
+@@ -6966,18 +8124,18 @@
linknames=
for link
do
@@ -14815,7 +14811,7 @@ index 7ed280b..c7d06c3
fi
orig_export_symbols=
-@@ -7008,13 +8166,45 @@ EOF
+@@ -7008,13 +8166,45 @@
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
@@ -14866,7 +14862,7 @@ index 7ed280b..c7d06c3
skipped_export=false
else
# The command line is too long to execute in one step.
-@@ -7036,7 +8226,7 @@ EOF
+@@ -7036,7 +8226,7 @@
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -14875,7 +14871,7 @@ index 7ed280b..c7d06c3
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7048,7 +8238,7 @@ EOF
+@@ -7048,7 +8238,7 @@
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
@@ -14884,7 +14880,7 @@ index 7ed280b..c7d06c3
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
-@@ -7058,7 +8248,7 @@ EOF
+@@ -7058,7 +8248,7 @@
case " $convenience " in
*" $test_deplib "*) ;;
*)
@@ -14893,7 +14889,7 @@ index 7ed280b..c7d06c3
;;
esac
done
-@@ -7078,21 +8268,21 @@ EOF
+@@ -7078,21 +8268,21 @@
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
@@ -14919,7 +14915,7 @@ index 7ed280b..c7d06c3
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
-@@ -7137,7 +8327,8 @@ EOF
+@@ -7137,7 +8327,8 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -14929,7 +14925,7 @@ index 7ed280b..c7d06c3
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -7150,13 +8341,16 @@ EOF
+@@ -7150,13 +8341,16 @@
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
@@ -14950,7 +14946,7 @@ index 7ed280b..c7d06c3
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
func_verbose "creating linker input file list: $output"
-@@ -7170,10 +8364,12 @@ EOF
+@@ -7170,10 +8364,12 @@
fi
for obj
do
@@ -14966,7 +14962,7 @@ index 7ed280b..c7d06c3
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
-@@ -7197,17 +8393,19 @@ EOF
+@@ -7197,17 +8393,19 @@
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
@@ -14989,7 +14985,7 @@ index 7ed280b..c7d06c3
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
-@@ -7217,11 +8415,12 @@ EOF
+@@ -7217,11 +8415,12 @@
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
@@ -15004,7 +15000,7 @@ index 7ed280b..c7d06c3
else
output=
-@@ -7255,7 +8454,7 @@ EOF
+@@ -7255,7 +8454,7 @@
lt_exit=$?
# Restore the uninstalled library and exit
@@ -15013,7 +15009,7 @@ index 7ed280b..c7d06c3
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
-@@ -7276,7 +8475,7 @@ EOF
+@@ -7276,7 +8475,7 @@
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -15022,7 +15018,7 @@ index 7ed280b..c7d06c3
fi
if test -n "$orig_export_symbols"; then
-@@ -7288,7 +8487,7 @@ EOF
+@@ -7288,7 +8487,7 @@
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
@@ -15031,7 +15027,7 @@ index 7ed280b..c7d06c3
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
-@@ -7329,10 +8528,10 @@ EOF
+@@ -7329,10 +8528,10 @@
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
@@ -15044,7 +15040,7 @@ index 7ed280b..c7d06c3
test "X$libobjs" = "X " && libobjs=
fi
-@@ -7348,7 +8547,7 @@ EOF
+@@ -7348,7 +8547,7 @@
lt_exit=$?
# Restore the uninstalled library and exit
@@ -15053,7 +15049,7 @@ index 7ed280b..c7d06c3
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
-@@ -7360,7 +8559,7 @@ EOF
+@@ -7360,7 +8559,7 @@
IFS="$save_ifs"
# Restore the uninstalled library and exit
@@ -15062,7 +15058,7 @@ index 7ed280b..c7d06c3
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
-@@ -7441,18 +8640,21 @@ EOF
+@@ -7441,18 +8640,21 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
@@ -15087,7 +15083,7 @@ index 7ed280b..c7d06c3
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -7512,8 +8714,8 @@ EOF
+@@ -7512,8 +8714,8 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -15098,7 +15094,7 @@ index 7ed280b..c7d06c3
;;
esac
-@@ -7524,14 +8726,14 @@ EOF
+@@ -7524,14 +8726,14 @@
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
@@ -15117,7 +15113,7 @@ index 7ed280b..c7d06c3
;;
esac
-@@ -7545,7 +8747,7 @@ EOF
+@@ -7545,7 +8747,7 @@
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
@@ -15126,7 +15122,7 @@ index 7ed280b..c7d06c3
esac
;;
esac
-@@ -7555,17 +8757,17 @@ EOF
+@@ -7555,17 +8757,17 @@
-L*)
case " $new_libs " in
*" $deplib "*) ;;
@@ -15148,7 +15144,7 @@ index 7ed280b..c7d06c3
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -7573,7 +8775,7 @@ EOF
+@@ -7573,7 +8775,7 @@
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -15157,7 +15153,7 @@ index 7ed280b..c7d06c3
esac
done
fi
-@@ -7592,18 +8794,18 @@ EOF
+@@ -7592,18 +8794,18 @@
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -15179,7 +15175,7 @@ index 7ed280b..c7d06c3
esac
fi
case $host in
-@@ -7612,12 +8814,12 @@ EOF
+@@ -7612,12 +8814,12 @@
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -15194,7 +15190,7 @@ index 7ed280b..c7d06c3
esac
;;
esac
-@@ -7643,18 +8845,18 @@ EOF
+@@ -7643,18 +8845,18 @@
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -15216,7 +15212,7 @@ index 7ed280b..c7d06c3
esac
fi
done
-@@ -7668,8 +8870,8 @@ EOF
+@@ -7668,8 +8870,8 @@
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
@@ -15227,7 +15223,7 @@ index 7ed280b..c7d06c3
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -7681,15 +8883,15 @@ EOF
+@@ -7681,15 +8883,15 @@
wrappers_required=yes
case $host in
@@ -15247,7 +15243,7 @@ index 7ed280b..c7d06c3
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
-@@ -7698,13 +8900,19 @@ EOF
+@@ -7698,13 +8900,19 @@
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
@@ -15268,7 +15264,7 @@ index 7ed280b..c7d06c3
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-@@ -7727,7 +8935,7 @@ EOF
+@@ -7727,7 +8935,7 @@
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
@@ -15277,7 +15273,7 @@ index 7ed280b..c7d06c3
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
-@@ -7735,7 +8943,7 @@ EOF
+@@ -7735,7 +8943,7 @@
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
@@ -15286,7 +15282,7 @@ index 7ed280b..c7d06c3
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
-@@ -7745,11 +8953,18 @@ EOF
+@@ -7745,11 +8953,18 @@
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
@@ -15306,7 +15302,7 @@ index 7ed280b..c7d06c3
exit $EXIT_SUCCESS
fi
-@@ -7764,7 +8979,7 @@ EOF
+@@ -7764,7 +8979,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -15315,7 +15311,7 @@ index 7ed280b..c7d06c3
else
# fast_install is set to needless
relink_command=
-@@ -7776,13 +8991,19 @@ EOF
+@@ -7776,13 +8991,19 @@
fi
# Replace the output file specification.
@@ -15336,7 +15332,7 @@ index 7ed280b..c7d06c3
# Now create the wrapper script.
func_verbose "creating $output"
-@@ -7800,18 +9021,7 @@ EOF
+@@ -7800,18 +9021,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -15356,7 +15352,7 @@ index 7ed280b..c7d06c3
fi
# Only actually do things if not in dry run mode.
-@@ -7891,7 +9101,7 @@ EOF
+@@ -7891,7 +9101,7 @@
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
@@ -15365,7 +15361,7 @@ index 7ed280b..c7d06c3
fi
fi
addlibs="$old_convenience"
-@@ -7899,10 +9109,10 @@ EOF
+@@ -7899,10 +9109,10 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -15378,7 +15374,7 @@ index 7ed280b..c7d06c3
fi
# Do each command in the archive commands.
-@@ -7913,10 +9123,10 @@ EOF
+@@ -7913,10 +9123,10 @@
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
@@ -15391,7 +15387,7 @@ index 7ed280b..c7d06c3
fi
# POSIX demands no paths to be encoded in archives. We have
-@@ -7932,9 +9142,9 @@ EOF
+@@ -7932,9 +9142,9 @@
done | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -15403,7 +15399,7 @@ index 7ed280b..c7d06c3
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
-@@ -7958,18 +9168,30 @@ EOF
+@@ -7958,18 +9168,30 @@
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
@@ -15436,7 +15432,7 @@ index 7ed280b..c7d06c3
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
-@@ -8043,7 +9265,7 @@ EOF
+@@ -8043,7 +9265,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -15445,7 +15441,7 @@ index 7ed280b..c7d06c3
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -8063,12 +9285,23 @@ EOF
+@@ -8063,12 +9285,23 @@
*.la)
func_basename "$deplib"
name="$func_basename_result"
@@ -15472,7 +15468,7 @@ index 7ed280b..c7d06c3
esac
done
dependency_libs="$newdependency_libs"
-@@ -8082,9 +9315,9 @@ EOF
+@@ -8082,9 +9315,9 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
@@ -15484,7 +15480,7 @@ index 7ed280b..c7d06c3
esac
done
dlfiles="$newdlfiles"
-@@ -8101,7 +9334,7 @@ EOF
+@@ -8101,7 +9334,7 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
@@ -15493,7 +15489,7 @@ index 7ed280b..c7d06c3
;;
esac
done
-@@ -8113,7 +9346,7 @@ EOF
+@@ -8113,7 +9346,7 @@
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
@@ -15502,7 +15498,7 @@ index 7ed280b..c7d06c3
done
dlfiles="$newdlfiles"
newdlprefiles=
-@@ -8122,15 +9355,33 @@ EOF
+@@ -8122,15 +9355,33 @@
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
@@ -15538,7 +15534,7 @@ index 7ed280b..c7d06c3
esac
$ECHO > $output "\
# $outputname - a libtool library file
-@@ -8189,7 +9440,7 @@ relink_command=\"$relink_command\""
+@@ -8189,7 +9440,7 @@
exit $EXIT_SUCCESS
}
@@ -15547,7 +15543,7 @@ index 7ed280b..c7d06c3
func_mode_link ${1+"$@"}
-@@ -8209,9 +9460,9 @@ func_mode_uninstall ()
+@@ -8209,9 +9460,9 @@
for arg
do
case $arg in
@@ -15560,7 +15556,7 @@ index 7ed280b..c7d06c3
esac
done
-@@ -8220,24 +9471,23 @@ func_mode_uninstall ()
+@@ -8220,24 +9471,23 @@
rmdirs=
@@ -15592,7 +15588,7 @@ index 7ed280b..c7d06c3
esac
fi
-@@ -8263,18 +9513,17 @@ func_mode_uninstall ()
+@@ -8263,18 +9513,17 @@
# Delete the libtool libraries and symlinks.
for n in $library_names; do
@@ -15617,7 +15613,7 @@ index 7ed280b..c7d06c3
;;
uninstall)
if test -n "$library_names"; then
-@@ -8302,19 +9551,19 @@ func_mode_uninstall ()
+@@ -8302,19 +9551,19 @@
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
@@ -15640,7 +15636,7 @@ index 7ed280b..c7d06c3
noexename=$name
case $file in
*.exe)
-@@ -8324,7 +9573,7 @@ func_mode_uninstall ()
+@@ -8324,7 +9573,7 @@
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
@@ -15649,7 +15645,7 @@ index 7ed280b..c7d06c3
;;
esac
# Do a test to see if this is a libtool program.
-@@ -8333,7 +9582,7 @@ func_mode_uninstall ()
+@@ -8333,7 +9582,7 @@
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
@@ -15658,7 +15654,7 @@ index 7ed280b..c7d06c3
else
relink_command=
func_source $dir/$noexename
-@@ -8341,12 +9590,12 @@ func_mode_uninstall ()
+@@ -8341,12 +9590,12 @@
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
@@ -15674,7 +15670,7 @@ index 7ed280b..c7d06c3
fi
fi
fi
-@@ -8354,7 +9603,6 @@ func_mode_uninstall ()
+@@ -8354,7 +9603,6 @@
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
@@ -15682,7 +15678,7 @@ index 7ed280b..c7d06c3
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
-@@ -8366,16 +9614,16 @@ func_mode_uninstall ()
+@@ -8366,16 +9614,16 @@
exit $exit_status
}
@@ -15702,10 +15698,10 @@ index 7ed280b..c7d06c3
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index a3fee53..828104c 100644
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
+Index: saga/m4/libtool.m4
+===================================================================
+--- saga.orig/m4/libtool.m4 2012-01-09 14:09:37.000000000 +0100
++++ saga/m4/libtool.m4 2012-01-09 14:10:07.000000000 +0100
@@ -1,7 +1,8 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
@@ -15726,7 +15722,7 @@ index a3fee53..828104c 100644
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
+@@ -37,7 +39,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
@@ -15735,7 +15731,7 @@ index a3fee53..828104c 100644
# LT_PREREQ(VERSION)
-@@ -66,6 +68,7 @@ esac
+@@ -66,6 +68,7 @@
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
@@ -15743,7 +15739,7 @@ index a3fee53..828104c 100644
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
-@@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
+@@ -82,6 +85,8 @@
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
@@ -15752,7 +15748,7 @@ index a3fee53..828104c 100644
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
-@@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME],
+@@ -118,7 +123,7 @@
*) break;;
esac
done
@@ -15761,7 +15757,7 @@ index a3fee53..828104c 100644
])
-@@ -138,6 +143,11 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
+@@ -138,6 +143,11 @@
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
@@ -15773,7 +15769,7 @@ index a3fee53..828104c 100644
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
-@@ -160,10 +170,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+@@ -160,10 +170,13 @@
dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
@@ -15787,7 +15783,7 @@ index a3fee53..828104c 100644
_LT_CONFIG_LIBTOOL_INIT([
# See if we are running on zsh, and set the options which allow our
-@@ -179,7 +192,6 @@ fi
+@@ -179,7 +192,6 @@
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
@@ -15795,7 +15791,7 @@ index a3fee53..828104c 100644
case $host_os in
aix3*)
-@@ -193,23 +205,6 @@ aix3*)
+@@ -193,23 +205,6 @@
;;
esac
@@ -15819,7 +15815,7 @@ index a3fee53..828104c 100644
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -250,6 +245,28 @@ _LT_CONFIG_COMMANDS
+@@ -250,6 +245,28 @@
])# _LT_SETUP
@@ -15848,7 +15844,7 @@ index a3fee53..828104c 100644
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
-@@ -408,7 +425,7 @@ m4_define([_lt_decl_all_varnames],
+@@ -408,7 +425,7 @@
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
@@ -15857,7 +15853,7 @@ index a3fee53..828104c 100644
# _LT_CONFIG_STATUS_DECLARATIONS
-@@ -418,7 +435,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
+@@ -418,7 +435,7 @@
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
@@ -15866,7 +15862,7 @@ index a3fee53..828104c 100644
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-@@ -517,12 +534,20 @@ LTCC='$LTCC'
+@@ -517,12 +534,20 @@
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
@@ -15889,7 +15885,7 @@ index a3fee53..828104c 100644
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -533,9 +558,9 @@ done
+@@ -533,9 +558,9 @@
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
@@ -15901,7 +15897,7 @@ index a3fee53..828104c 100644
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -543,16 +568,38 @@ for var in lt_decl_all_varnames([[ \
+@@ -543,16 +568,38 @@
esac
done
@@ -15947,7 +15943,7 @@ index a3fee53..828104c 100644
# LT_OUTPUT
# ---------
-@@ -562,20 +609,11 @@ _LT_OUTPUT_LIBTOOL_INIT
+@@ -562,20 +609,11 @@
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
@@ -15971,7 +15967,7 @@ index a3fee53..828104c 100644
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
-@@ -601,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+@@ -601,7 +639,7 @@
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
@@ -15980,7 +15976,7 @@ index a3fee53..828104c 100644
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-@@ -646,15 +684,13 @@ chmod +x "$CONFIG_LT"
+@@ -646,15 +684,13 @@
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
@@ -16003,7 +15999,7 @@ index a3fee53..828104c 100644
])# LT_OUTPUT
-@@ -717,15 +753,12 @@ _LT_EOF
+@@ -717,15 +753,12 @@
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
@@ -16023,7 +16019,7 @@ index a3fee53..828104c 100644
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
],
-@@ -770,6 +803,7 @@ AC_DEFUN([LT_LANG],
+@@ -770,6 +803,7 @@
m4_case([$1],
[C], [_LT_LANG(C)],
[C++], [_LT_LANG(CXX)],
@@ -16031,7 +16027,7 @@ index a3fee53..828104c 100644
[Java], [_LT_LANG(GCJ)],
[Fortran 77], [_LT_LANG(F77)],
[Fortran], [_LT_LANG(FC)],
-@@ -791,6 +825,31 @@ m4_defun([_LT_LANG],
+@@ -791,6 +825,31 @@
])# _LT_LANG
@@ -16063,7 +16059,7 @@ index a3fee53..828104c 100644
# _LT_LANG_DEFAULT_CONFIG
# -----------------------
m4_defun([_LT_LANG_DEFAULT_CONFIG],
-@@ -821,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+@@ -821,6 +880,10 @@
m4_ifdef([LT_PROG_GCJ],
[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
@@ -16074,7 +16070,7 @@ index a3fee53..828104c 100644
AC_PROVIDE_IFELSE([LT_PROG_RC],
[LT_LANG(RC)],
[m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-@@ -831,11 +894,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+@@ -831,11 +894,13 @@
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
@@ -16088,7 +16084,7 @@ index a3fee53..828104c 100644
# _LT_TAG_COMPILER
-@@ -921,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+@@ -921,7 +986,13 @@
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
@@ -16103,7 +16099,7 @@ index a3fee53..828104c 100644
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
-@@ -929,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+@@ -929,6 +1000,7 @@
rm -rf libconftest.dylib*
rm -f conftest.*
fi])
@@ -16111,7 +16107,7 @@ index a3fee53..828104c 100644
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
[lt_cv_ld_exported_symbols_list],
[lt_cv_ld_exported_symbols_list=no
-@@ -940,6 +1012,34 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+@@ -940,6 +1012,34 @@
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
@@ -16146,7 +16142,7 @@ index a3fee53..828104c 100644
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -967,7 +1067,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+@@ -967,7 +1067,7 @@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -16155,7 +16151,7 @@ index a3fee53..828104c 100644
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -977,8 +1077,8 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+@@ -977,8 +1077,8 @@
])
@@ -16166,7 +16162,7 @@ index a3fee53..828104c 100644
# Checks for linker and compiler features on darwin
m4_defun([_LT_DARWIN_LINKER_FEATURES],
[
-@@ -987,7 +1087,13 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -987,7 +1087,13 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -16181,7 +16177,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -995,7 +1101,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -995,7 +1101,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -16190,7 +16186,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -1011,203 +1117,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -1011,203 +1117,142 @@
fi
])
@@ -16501,7 +16497,7 @@ index a3fee53..828104c 100644
# _LT_ENABLE_LOCK
# ---------------
m4_defun([_LT_ENABLE_LOCK],
-@@ -1236,7 +1281,7 @@ ia64-*-hpux*)
+@@ -1236,7 +1281,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -16510,7 +16506,7 @@ index a3fee53..828104c 100644
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -1329,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+@@ -1329,14 +1374,27 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -16540,7 +16536,7 @@ index a3fee53..828104c 100644
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
-@@ -1354,14 +1412,47 @@ need_locks="$enable_libtool_lock"
+@@ -1354,14 +1412,47 @@
])# _LT_ENABLE_LOCK
@@ -16593,7 +16589,7 @@ index a3fee53..828104c 100644
AC_CHECK_TOOL(STRIP, strip, :)
test -z "$STRIP" && STRIP=:
-@@ -1380,18 +1471,27 @@ old_postuninstall_cmds=
+@@ -1380,18 +1471,27 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -16624,7 +16620,7 @@ index a3fee53..828104c 100644
])# _LT_CMD_OLD_ARCHIVE
-@@ -1416,15 +1516,15 @@ AC_CACHE_CHECK([$1], [$2],
+@@ -1416,15 +1516,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -16643,7 +16639,7 @@ index a3fee53..828104c 100644
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -1464,7 +1564,7 @@ AC_CACHE_CHECK([$1], [$2],
+@@ -1464,7 +1564,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
@@ -16652,7 +16648,7 @@ index a3fee53..828104c 100644
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -1527,6 +1627,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1527,6 +1627,11 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -16664,7 +16660,7 @@ index a3fee53..828104c 100644
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -1552,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1552,6 +1657,11 @@
lt_cv_sys_max_cmd_len=196608
;;
@@ -16676,7 +16672,7 @@ index a3fee53..828104c 100644
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-@@ -1591,8 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1591,8 +1701,8 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
@@ -16687,7 +16683,7 @@ index a3fee53..828104c 100644
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -1643,7 +1753,7 @@ else
+@@ -1643,7 +1753,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -16696,7 +16692,7 @@ index a3fee53..828104c 100644
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -1684,7 +1794,13 @@ else
+@@ -1684,7 +1794,13 @@
# endif
#endif
@@ -16711,7 +16707,7 @@ index a3fee53..828104c 100644
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -1693,7 +1809,11 @@ int main ()
+@@ -1693,7 +1809,11 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -16724,7 +16720,7 @@ index a3fee53..828104c 100644
/* dlclose (self); */
}
else
-@@ -1869,16 +1989,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+@@ -1869,16 +1989,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -16744,7 +16740,7 @@ index a3fee53..828104c 100644
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-@@ -2037,6 +2157,7 @@ m4_require([_LT_DECL_EGREP])dnl
+@@ -2037,6 +2157,7 @@
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -16752,7 +16748,7 @@ index a3fee53..828104c 100644
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-@@ -2045,16 +2166,23 @@ if test "$GCC" = yes; then
+@@ -2045,16 +2166,23 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -16782,7 +16778,7 @@ index a3fee53..828104c 100644
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -2067,7 +2195,7 @@ if test "$GCC" = yes; then
+@@ -2067,7 +2195,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -16791,7 +16787,7 @@ index a3fee53..828104c 100644
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -2087,7 +2215,13 @@ BEGIN {RS=" "; FS="/|\n";} {
+@@ -2087,7 +2215,13 @@
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
@@ -16806,7 +16802,7 @@ index a3fee53..828104c 100644
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
-@@ -2113,7 +2247,7 @@ need_version=unknown
+@@ -2113,7 +2247,7 @@
case $host_os in
aix3*)
@@ -16815,7 +16811,7 @@ index a3fee53..828104c 100644
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
-@@ -2122,7 +2256,7 @@ aix3*)
+@@ -2122,7 +2256,7 @@
;;
aix[[4-9]]*)
@@ -16824,7 +16820,7 @@ index a3fee53..828104c 100644
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
-@@ -2175,7 +2309,7 @@ amigaos*)
+@@ -2175,7 +2309,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -16833,7 +16829,7 @@ index a3fee53..828104c 100644
;;
esac
;;
-@@ -2187,7 +2321,7 @@ beos*)
+@@ -2187,7 +2321,7 @@
;;
bsdi[[45]]*)
@@ -16842,7 +16838,7 @@ index a3fee53..828104c 100644
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'
-@@ -2206,8 +2340,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -2206,8 +2340,9 @@
need_version=no
need_lib_prefix=no
@@ -16854,7 +16850,7 @@ index a3fee53..828104c 100644
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -2228,36 +2363,83 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -2228,36 +2363,83 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -16952,7 +16948,7 @@ index a3fee53..828104c 100644
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -2278,7 +2460,7 @@ m4_if([$1], [],[
+@@ -2278,7 +2460,7 @@
;;
dgux*)
@@ -16961,7 +16957,7 @@ index a3fee53..828104c 100644
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-@@ -2286,10 +2468,6 @@ dgux*)
+@@ -2286,10 +2468,6 @@
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -16972,7 +16968,7 @@ index a3fee53..828104c 100644
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -2297,7 +2475,7 @@ freebsd* | dragonfly*)
+@@ -2297,7 +2475,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -16981,7 +16977,7 @@ index a3fee53..828104c 100644
*) objformat=elf ;;
esac
fi
-@@ -2315,7 +2493,7 @@ freebsd* | dragonfly*)
+@@ -2315,7 +2493,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -16990,7 +16986,7 @@ index a3fee53..828104c 100644
shlibpath_overrides_runpath=yes
;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-@@ -2335,12 +2513,26 @@ freebsd* | dragonfly*)
+@@ -2335,12 +2513,26 @@
;;
gnu*)
@@ -17018,7 +17014,7 @@ index a3fee53..828104c 100644
hardcode_into_libs=yes
;;
-@@ -2386,12 +2578,14 @@ hpux9* | hpux10* | hpux11*)
+@@ -2386,12 +2578,14 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -17035,7 +17031,7 @@ index a3fee53..828104c 100644
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-@@ -2407,7 +2601,7 @@ irix5* | irix6* | nonstopux*)
+@@ -2407,7 +2601,7 @@
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
@@ -17044,7 +17040,7 @@ index a3fee53..828104c 100644
else
version_type=irix
fi ;;
-@@ -2444,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+@@ -2444,9 +2638,9 @@
dynamic_linker=no
;;
@@ -17056,7 +17052,7 @@ index a3fee53..828104c 100644
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2454,16 +2648,21 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -2454,16 +2648,21 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -17087,7 +17083,7 @@ index a3fee53..828104c 100644
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
-@@ -2472,7 +2671,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -2472,7 +2671,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -17096,7 +17092,7 @@ index a3fee53..828104c 100644
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -2516,7 +2715,7 @@ netbsd*)
+@@ -2516,7 +2715,7 @@
;;
newsos6)
@@ -17105,7 +17101,7 @@ index a3fee53..828104c 100644
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
-@@ -2585,7 +2784,7 @@ rdos*)
+@@ -2585,7 +2784,7 @@
;;
solaris*)
@@ -17114,7 +17110,7 @@ index a3fee53..828104c 100644
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2610,7 +2809,7 @@ sunos4*)
+@@ -2610,7 +2809,7 @@
;;
sysv4 | sysv4.3*)
@@ -17123,7 +17119,7 @@ index a3fee53..828104c 100644
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
-@@ -2634,7 +2833,7 @@ sysv4 | sysv4.3*)
+@@ -2634,7 +2833,7 @@
sysv4*MP*)
if test -d /usr/nec ;then
@@ -17132,7 +17128,7 @@ index a3fee53..828104c 100644
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
-@@ -2665,7 +2864,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+@@ -2665,7 +2864,7 @@
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
@@ -17141,7 +17137,7 @@ index a3fee53..828104c 100644
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2675,7 +2874,7 @@ tpf*)
+@@ -2675,7 +2874,7 @@
;;
uts4*)
@@ -17150,7 +17146,7 @@ index a3fee53..828104c 100644
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
-@@ -2717,6 +2916,8 @@ _LT_DECL([], [library_names_spec], [1],
+@@ -2717,6 +2916,8 @@
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
@@ -17159,7 +17155,7 @@ index a3fee53..828104c 100644
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
-@@ -2829,6 +3030,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+@@ -2829,6 +3030,7 @@
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
@@ -17167,7 +17163,7 @@ index a3fee53..828104c 100644
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
-@@ -2950,6 +3152,11 @@ case $reload_flag in
+@@ -2950,6 +3152,11 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
@@ -17179,7 +17175,7 @@ index a3fee53..828104c 100644
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -2958,8 +3165,8 @@ case $host_os in
+@@ -2958,8 +3165,8 @@
fi
;;
esac
@@ -17190,7 +17186,7 @@ index a3fee53..828104c 100644
])# _LT_CMD_RELOAD
-@@ -3011,16 +3218,18 @@ mingw* | pw32*)
+@@ -3011,16 +3218,18 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -17212,7 +17208,7 @@ index a3fee53..828104c 100644
# 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'
-@@ -3050,6 +3259,10 @@ gnu*)
+@@ -3050,6 +3259,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -17223,7 +17219,7 @@ index a3fee53..828104c 100644
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -3058,11 +3271,11 @@ hpux10.20* | hpux11*)
+@@ -3058,11 +3271,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -17237,7 +17233,7 @@ index a3fee53..828104c 100644
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -3083,7 +3296,7 @@ irix5* | irix6* | nonstopux*)
+@@ -3083,7 +3296,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -17246,7 +17242,7 @@ index a3fee53..828104c 100644
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3162,6 +3375,21 @@ tpf*)
+@@ -3162,6 +3375,21 @@
;;
esac
])
@@ -17268,7 +17264,7 @@ index a3fee53..828104c 100644
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -3169,7 +3397,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -3169,7 +3397,11 @@
_LT_DECL([], [deplibs_check_method], [1],
[Method to check whether dependent libraries are shared objects])
_LT_DECL([], [file_magic_cmd], [1],
@@ -17281,12 +17277,11 @@ index a3fee53..828104c 100644
])# _LT_CHECK_MAGIC_METHOD
-@@ -3226,8 +3458,20 @@ if test "$lt_cv_path_NM" != "no"; then
+@@ -3226,7 +3458,19 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-- AC_SUBST([DUMPBIN])
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
@@ -17300,11 +17295,10 @@ index a3fee53..828104c 100644
+ ;;
+ esac
+ fi
-+ AC_SUBST([DUMPBIN])
+ AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
- fi
-@@ -3239,13 +3483,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+@@ -3239,13 +3483,13 @@
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
@@ -17321,7 +17315,7 @@ index a3fee53..828104c 100644
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -3260,6 +3504,67 @@ dnl aclocal-1.4 backwards compatibility:
+@@ -3260,6 +3504,67 @@
dnl AC_DEFUN([AM_PROG_NM], [])
dnl AC_DEFUN([AC_PROG_NM], [])
@@ -17389,7 +17383,7 @@ index a3fee53..828104c 100644
# LT_LIB_M
# --------
-@@ -3268,7 +3573,7 @@ AC_DEFUN([LT_LIB_M],
+@@ -3268,7 +3573,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
@@ -17398,7 +17392,7 @@ index a3fee53..828104c 100644
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
-@@ -3296,7 +3601,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
+@@ -3296,7 +3601,12 @@
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
@@ -17412,7 +17406,7 @@ index a3fee53..828104c 100644
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
-@@ -3313,6 +3623,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+@@ -3313,6 +3623,7 @@
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
@@ -17420,7 +17414,7 @@ index a3fee53..828104c 100644
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -3380,8 +3691,8 @@ esac
+@@ -3380,8 +3691,8 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
@@ -17431,7 +17425,7 @@ index a3fee53..828104c 100644
# Handle CRLF in mingw tool chain
opt_cr=
-@@ -3405,6 +3716,7 @@ for ac_symprfx in "" "_"; do
+@@ -3405,6 +3716,7 @@
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
@@ -17439,7 +17433,7 @@ index a3fee53..828104c 100644
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-@@ -3417,6 +3729,7 @@ for ac_symprfx in "" "_"; do
+@@ -3417,6 +3729,7 @@
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
@@ -17447,7 +17441,7 @@ index a3fee53..828104c 100644
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -3438,7 +3751,7 @@ _LT_EOF
+@@ -3438,7 +3751,7 @@
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -17456,7 +17450,7 @@ index a3fee53..828104c 100644
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -3450,6 +3763,18 @@ _LT_EOF
+@@ -3450,6 +3763,18 @@
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
@@ -17475,7 +17469,7 @@ index a3fee53..828104c 100644
#ifdef __cplusplus
extern "C" {
#endif
-@@ -3461,7 +3786,7 @@ _LT_EOF
+@@ -3461,7 +3786,7 @@
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
@@ -17484,7 +17478,7 @@ index a3fee53..828104c 100644
const char *name;
void *address;
}
-@@ -3487,15 +3812,15 @@ static const void *lt_preloaded_setup() {
+@@ -3487,15 +3812,15 @@
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
@@ -17504,7 +17498,7 @@ index a3fee53..828104c 100644
else
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
fi
-@@ -3528,6 +3853,13 @@ else
+@@ -3528,6 +3853,13 @@
AC_MSG_RESULT(ok)
fi
@@ -17518,7 +17512,7 @@ index a3fee53..828104c 100644
_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-@@ -3538,6 +3870,8 @@ _LT_DECL([global_symbol_to_c_name_address],
+@@ -3538,6 +3870,8 @@
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -17527,7 +17521,7 @@ index a3fee53..828104c 100644
]) # _LT_CMD_GLOBAL_SYMBOLS
-@@ -3549,7 +3883,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
+@@ -3549,7 +3883,6 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)=
@@ -17535,7 +17529,7 @@ index a3fee53..828104c 100644
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -3600,6 +3933,11 @@ m4_if([$1], [CXX], [
+@@ -3600,6 +3933,11 @@
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -17547,7 +17541,7 @@ index a3fee53..828104c 100644
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -3649,6 +3987,12 @@ m4_if([$1], [CXX], [
+@@ -3649,6 +3987,12 @@
;;
esac
;;
@@ -17560,7 +17554,7 @@ index a3fee53..828104c 100644
dgux*)
case $cc_basename in
ec++*)
-@@ -3738,8 +4082,8 @@ m4_if([$1], [CXX], [
+@@ -3738,8 +4082,8 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -17571,7 +17565,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-@@ -3801,7 +4145,7 @@ m4_if([$1], [CXX], [
+@@ -3801,7 +4145,7 @@
;;
solaris*)
case $cc_basename in
@@ -17580,7 +17574,7 @@ index a3fee53..828104c 100644
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -3905,6 +4249,12 @@ m4_if([$1], [CXX], [
+@@ -3905,6 +4249,12 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -17593,7 +17587,7 @@ index a3fee53..828104c 100644
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -3947,6 +4297,15 @@ m4_if([$1], [CXX], [
+@@ -3947,6 +4297,15 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
@@ -17609,7 +17603,7 @@ index a3fee53..828104c 100644
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -4010,7 +4369,13 @@ m4_if([$1], [CXX], [
+@@ -4010,7 +4369,13 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
@@ -17624,7 +17618,7 @@ index a3fee53..828104c 100644
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -4022,25 +4387,40 @@ m4_if([$1], [CXX], [
+@@ -4022,25 +4387,40 @@
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -17671,7 +17665,7 @@ index a3fee53..828104c 100644
;;
esac
;;
-@@ -4072,7 +4452,7 @@ m4_if([$1], [CXX], [
+@@ -4072,7 +4452,7 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
@@ -17680,7 +17674,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4129,9 +4509,11 @@ case $host_os in
+@@ -4129,9 +4509,11 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -17695,7 +17689,7 @@ index a3fee53..828104c 100644
#
# Check to make sure the PIC flag actually works.
-@@ -4150,6 +4532,8 @@ fi
+@@ -4150,6 +4532,8 @@
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
[Additional compiler flags for building library objects])
@@ -17704,7 +17698,7 @@ index a3fee53..828104c 100644
#
# Check to make sure the static flag actually works.
#
-@@ -4170,6 +4554,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+@@ -4170,6 +4554,7 @@
m4_defun([_LT_LINKER_SHLIBS],
[AC_REQUIRE([LT_PATH_LD])dnl
AC_REQUIRE([LT_PATH_NM])dnl
@@ -17712,7 +17706,7 @@ index a3fee53..828104c 100644
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -4178,30 +4563,40 @@ m4_require([_LT_TAG_COMPILER])dnl
+@@ -4178,30 +4563,40 @@
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
m4_if([$1], [CXX], [
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -17761,7 +17755,7 @@ index a3fee53..828104c 100644
], [
runpath_var=
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -4216,7 +4611,6 @@ m4_if([$1], [CXX], [
+@@ -4216,7 +4611,6 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
@@ -17769,7 +17763,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -4261,13 +4655,39 @@ dnl Note also adjust exclude_expsyms for C++ above.
+@@ -4261,13 +4655,39 @@
openbsd*)
with_gnu_ld=no
;;
@@ -17810,7 +17804,7 @@ index a3fee53..828104c 100644
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -4301,11 +4721,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
+@@ -4301,11 +4721,12 @@
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -17826,7 +17820,7 @@ index a3fee53..828104c 100644
_LT_EOF
fi
-@@ -4341,10 +4762,12 @@ _LT_EOF
+@@ -4341,10 +4762,12 @@
# _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'
@@ -17840,7 +17834,7 @@ index a3fee53..828104c 100644
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -4362,6 +4785,11 @@ _LT_EOF
+@@ -4362,6 +4785,11 @@
fi
;;
@@ -17852,7 +17846,7 @@ index a3fee53..828104c 100644
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4387,15 +4815,16 @@ _LT_EOF
+@@ -4387,15 +4815,16 @@
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
@@ -17873,7 +17867,7 @@ index a3fee53..828104c 100644
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -4406,13 +4835,17 @@ _LT_EOF
+@@ -4406,13 +4835,17 @@
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
@@ -17893,7 +17887,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -4428,17 +4861,16 @@ _LT_EOF
+@@ -4428,17 +4861,16 @@
fi
case $cc_basename in
@@ -17915,7 +17909,7 @@ index a3fee53..828104c 100644
fi
;;
esac
-@@ -4452,8 +4884,8 @@ _LT_EOF
+@@ -4452,8 +4884,8 @@
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -17926,7 +17920,7 @@ index a3fee53..828104c 100644
fi
;;
-@@ -4471,8 +4903,8 @@ _LT_EOF
+@@ -4471,8 +4903,8 @@
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17937,7 +17931,7 @@ index a3fee53..828104c 100644
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4518,8 +4950,8 @@ _LT_EOF
+@@ -4518,8 +4950,8 @@
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17948,7 +17942,7 @@ index a3fee53..828104c 100644
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4559,8 +4991,10 @@ _LT_EOF
+@@ -4559,8 +4991,10 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -17960,7 +17954,7 @@ index a3fee53..828104c 100644
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -4648,9 +5082,9 @@ _LT_EOF
+@@ -4648,9 +5082,9 @@
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -17972,7 +17966,7 @@ index a3fee53..828104c 100644
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -4659,14 +5093,19 @@ _LT_EOF
+@@ -4659,14 +5093,19 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -17995,7 +17989,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -4698,20 +5137,64 @@ _LT_EOF
+@@ -4698,20 +5137,64 @@
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
@@ -18074,7 +18068,7 @@ index a3fee53..828104c 100644
;;
darwin* | rhapsody*)
-@@ -4724,10 +5207,6 @@ _LT_EOF
+@@ -4724,10 +5207,6 @@
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -18085,7 +18079,7 @@ index a3fee53..828104c 100644
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little
-@@ -4740,7 +5219,7 @@ _LT_EOF
+@@ -4740,7 +5219,7 @@
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -18094,7 +18088,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes
-@@ -4749,7 +5228,7 @@ _LT_EOF
+@@ -4749,7 +5228,7 @@
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
@@ -18103,7 +18097,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4757,7 +5236,7 @@ _LT_EOF
+@@ -4757,7 +5236,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -18112,7 +18106,7 @@ index a3fee53..828104c 100644
else
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -4772,14 +5251,13 @@ _LT_EOF
+@@ -4772,14 +5251,13 @@
;;
hpux10*)
@@ -18129,7 +18123,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-@@ -4791,16 +5269,16 @@ _LT_EOF
+@@ -4791,16 +5269,16 @@
;;
hpux11*)
@@ -18149,7 +18143,7 @@ index a3fee53..828104c 100644
;;
esac
else
-@@ -4812,7 +5290,14 @@ _LT_EOF
+@@ -4812,7 +5290,14 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -18165,7 +18159,7 @@ index a3fee53..828104c 100644
;;
esac
fi
-@@ -4840,19 +5325,34 @@ _LT_EOF
+@@ -4840,19 +5325,34 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -18209,7 +18203,7 @@ index a3fee53..828104c 100644
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4914,17 +5414,17 @@ _LT_EOF
+@@ -4914,17 +5414,17 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -18230,7 +18224,7 @@ index a3fee53..828104c 100644
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4934,13 +5434,13 @@ _LT_EOF
+@@ -4934,13 +5434,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -18247,7 +18241,7 @@ index a3fee53..828104c 100644
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4953,9 +5453,9 @@ _LT_EOF
+@@ -4953,9 +5453,9 @@
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
@@ -18259,7 +18253,7 @@ index a3fee53..828104c 100644
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -5131,36 +5631,38 @@ x|xyes)
+@@ -5131,36 +5631,38 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -18328,7 +18322,7 @@ index a3fee53..828104c 100644
;;
esac
fi
-@@ -5197,9 +5699,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
+@@ -5197,9 +5699,6 @@
_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
[Flag to hardcode $libdir into a binary during linking.
This must work even if $libdir does not exist])
@@ -18338,7 +18332,7 @@ index a3fee53..828104c 100644
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
-@@ -5225,8 +5724,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
+@@ -5225,8 +5724,6 @@
to runtime path list])
_LT_TAGDECL([], [link_all_deplibs], [0],
[Whether libtool must link a program against all its dependency libraries])
@@ -18347,7 +18341,7 @@ index a3fee53..828104c 100644
_LT_TAGDECL([], [always_export_symbols], [0],
[Set to "yes" if exported symbols are required])
_LT_TAGDECL([], [export_symbols_cmds], [2],
-@@ -5237,6 +5734,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
+@@ -5237,6 +5734,8 @@
[Symbols that must always be exported])
_LT_TAGDECL([], [prelink_cmds], [2],
[Commands necessary for linking programs (against libraries) with templates])
@@ -18356,7 +18350,7 @@ index a3fee53..828104c 100644
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
dnl FIXME: Not yet implemented
-@@ -5330,37 +5829,22 @@ CC="$lt_save_CC"
+@@ -5330,37 +5829,22 @@
])# _LT_LANG_C_CONFIG
@@ -18403,7 +18397,7 @@ index a3fee53..828104c 100644
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -5372,7 +5856,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+@@ -5372,7 +5856,6 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
@@ -18411,7 +18405,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -5382,6 +5865,8 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -5382,6 +5865,8 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -18420,7 +18414,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -5413,6 +5898,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5413,6 +5898,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
@@ -18428,7 +18422,7 @@ index a3fee53..828104c 100644
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
-@@ -5430,6 +5916,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5430,6 +5916,7 @@
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
@@ -18436,7 +18430,7 @@ index a3fee53..828104c 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -5451,8 +5938,8 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5451,8 +5938,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -18447,7 +18441,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5484,7 +5971,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5484,7 +5971,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -18456,7 +18450,7 @@ index a3fee53..828104c 100644
else
GXX=no
-@@ -5593,10 +6080,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5593,10 +6080,10 @@
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -18469,7 +18463,7 @@ index a3fee53..828104c 100644
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -5605,14 +6092,19 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5605,14 +6092,19 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -18492,7 +18486,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -5642,28 +6134,75 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5642,28 +6134,75 @@
;;
cygwin* | mingw* | pw32* | cegcc*)
@@ -18590,7 +18584,7 @@ index a3fee53..828104c 100644
darwin* | rhapsody*)
_LT_DARWIN_LINKER_FEATURES($1)
;;
-@@ -5686,7 +6225,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5686,7 +6225,7 @@
esac
;;
@@ -18599,7 +18593,7 @@ index a3fee53..828104c 100644
# C++ shared libraries reported to be fairly broken before
# switch to ELF
_LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5705,6 +6244,11 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5705,6 +6244,11 @@
gnu*)
;;
@@ -18611,7 +18605,7 @@ index a3fee53..828104c 100644
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -5729,11 +6273,11 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5729,11 +6273,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -18625,7 +18619,7 @@ index a3fee53..828104c 100644
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5794,7 +6338,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5794,7 +6338,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -18634,7 +18628,7 @@ index a3fee53..828104c 100644
;;
*)
if test "$GXX" = yes; then
-@@ -5804,10 +6348,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5804,10 +6348,10 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
@@ -18647,7 +18641,7 @@ index a3fee53..828104c 100644
;;
esac
fi
-@@ -5837,7 +6381,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5837,7 +6381,7 @@
case $cc_basename in
CC*)
# SGI C++
@@ -18656,7 +18650,7 @@ index a3fee53..828104c 100644
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -5848,9 +6392,9 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5848,9 +6392,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -18668,7 +18662,7 @@ index a3fee53..828104c 100644
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -5879,7 +6423,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5879,7 +6423,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -18677,7 +18671,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5916,26 +6460,26 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5916,26 +6460,26 @@
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -18710,7 +18704,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
-@@ -5943,7 +6487,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5943,7 +6487,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -18719,7 +18713,7 @@ index a3fee53..828104c 100644
;;
cxx*)
# Compaq C++
-@@ -5962,9 +6506,9 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5962,9 +6506,9 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -18731,7 +18725,7 @@ index a3fee53..828104c 100644
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5984,13 +6528,13 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5984,13 +6528,13 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
@@ -18747,7 +18741,7 @@ index a3fee53..828104c 100644
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6059,7 +6603,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6059,7 +6603,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -18756,7 +18750,7 @@ index a3fee53..828104c 100644
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -6094,15 +6638,15 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6094,15 +6638,15 @@
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -18775,7 +18769,7 @@ index a3fee53..828104c 100644
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
-@@ -6118,17 +6662,17 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6118,17 +6662,17 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -18796,7 +18790,7 @@ index a3fee53..828104c 100644
;;
esac
-@@ -6138,7 +6682,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6138,7 +6682,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -18805,7 +18799,7 @@ index a3fee53..828104c 100644
else
# FIXME: insert proper C++ library support
-@@ -6174,7 +6718,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6174,7 +6718,7 @@
solaris*)
case $cc_basename in
@@ -18814,7 +18808,7 @@ index a3fee53..828104c 100644
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -6195,7 +6739,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6195,7 +6739,7 @@
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -18823,7 +18817,7 @@ index a3fee53..828104c 100644
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6215,14 +6759,14 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6215,14 +6759,14 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -18841,7 +18835,7 @@ index a3fee53..828104c 100644
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -6233,7 +6777,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6233,7 +6777,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -18850,7 +18844,7 @@ index a3fee53..828104c 100644
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-@@ -6287,6 +6831,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6287,6 +6831,10 @@
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -18861,7 +18855,7 @@ index a3fee53..828104c 100644
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -6342,6 +6890,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6342,6 +6890,7 @@
fi # test -n "$compiler"
CC=$lt_save_CC
@@ -18869,7 +18863,7 @@ index a3fee53..828104c 100644
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
-@@ -6356,6 +6905,29 @@ AC_LANG_POP
+@@ -6356,6 +6905,29 @@
])# _LT_LANG_CXX_CONFIG
@@ -18899,7 +18893,7 @@ index a3fee53..828104c 100644
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
-@@ -6364,6 +6936,7 @@ AC_LANG_POP
+@@ -6364,6 +6936,7 @@
# objects, libraries and library flags.
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -18907,7 +18901,7 @@ index a3fee53..828104c 100644
# Dependencies to place before and after the object being linked:
_LT_TAGVAR(predep_objects, $1)=
_LT_TAGVAR(postdep_objects, $1)=
-@@ -6413,7 +6986,20 @@ public class foo {
+@@ -6413,7 +6986,20 @@
}
};
_LT_EOF
@@ -18928,7 +18922,7 @@ index a3fee53..828104c 100644
dnl Parse the compiler output and extract the necessary
dnl objects, libraries and library flags.
if AC_TRY_EVAL(ac_compile); then
-@@ -6425,7 +7011,7 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6425,7 +7011,7 @@
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
@@ -18937,7 +18931,7 @@ index a3fee53..828104c 100644
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
-@@ -6434,13 +7020,22 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6434,13 +7020,22 @@
test $p = "-R"; then
prev=$p
continue
@@ -18964,7 +18958,7 @@ index a3fee53..828104c 100644
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
-@@ -6460,8 +7055,10 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6460,8 +7055,10 @@
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
fi
fi
@@ -18975,7 +18969,7 @@ index a3fee53..828104c 100644
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
-@@ -6497,6 +7094,7 @@ else
+@@ -6497,6 +7094,7 @@
fi
$RM -f confest.$objext
@@ -18983,7 +18977,7 @@ index a3fee53..828104c 100644
# PORTME: override above test on systems where it is broken
m4_if([$1], [CXX],
-@@ -6533,7 +7131,7 @@ linux*)
+@@ -6533,7 +7131,7 @@
solaris*)
case $cc_basename in
@@ -18992,7 +18986,7 @@ index a3fee53..828104c 100644
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -6577,32 +7175,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
+@@ -6577,32 +7175,16 @@
])# _LT_SYS_HIDDEN_LIBDEPS
@@ -19029,7 +19023,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6612,7 +7194,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+@@ -6612,7 +7194,6 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
@@ -19037,7 +19031,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
-@@ -6621,6 +7202,8 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -6621,6 +7202,8 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -19046,7 +19040,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6660,7 +7243,9 @@ if test "$_lt_disable_F77" != yes; then
+@@ -6660,7 +7243,9 @@
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
@@ -19056,7 +19050,7 @@ index a3fee53..828104c 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -6714,38 +7299,24 @@ if test "$_lt_disable_F77" != yes; then
+@@ -6714,38 +7299,24 @@
GCC=$lt_save_GCC
CC="$lt_save_CC"
@@ -19101,7 +19095,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6755,7 +7326,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+@@ -6755,7 +7326,6 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
@@ -19109,7 +19103,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
-@@ -6764,6 +7334,8 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -6764,6 +7334,8 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -19118,7 +19112,7 @@ index a3fee53..828104c 100644
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6803,7 +7375,9 @@ if test "$_lt_disable_FC" != yes; then
+@@ -6803,7 +7375,9 @@
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
@@ -19128,7 +19122,7 @@ index a3fee53..828104c 100644
compiler=$CC
GCC=$ac_cv_fc_compiler_gnu
-@@ -6859,7 +7433,8 @@ if test "$_lt_disable_FC" != yes; then
+@@ -6859,7 +7433,8 @@
fi # test -n "$compiler"
GCC=$lt_save_GCC
@@ -19138,7 +19132,7 @@ index a3fee53..828104c 100644
fi # test "$_lt_disable_FC" != yes
AC_LANG_POP
-@@ -6896,10 +7471,12 @@ _LT_COMPILER_BOILERPLATE
+@@ -6896,10 +7471,12 @@
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
@@ -19152,7 +19146,7 @@ index a3fee53..828104c 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
-@@ -6909,6 +7486,8 @@ _LT_CC_BASENAME([$compiler])
+@@ -6909,6 +7486,8 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -19161,7 +19155,7 @@ index a3fee53..828104c 100644
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -6928,10 +7507,82 @@ fi
+@@ -6928,10 +7507,82 @@
AC_LANG_RESTORE
GCC=$lt_save_GCC
@@ -19245,7 +19239,7 @@ index a3fee53..828104c 100644
# _LT_LANG_RC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
-@@ -6963,9 +7614,11 @@ _LT_LINKER_BOILERPLATE
+@@ -6963,9 +7614,11 @@
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
@@ -19257,7 +19251,7 @@ index a3fee53..828104c 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -6978,7 +7631,8 @@ fi
+@@ -6978,7 +7631,8 @@
GCC=$lt_save_GCC
AC_LANG_RESTORE
@@ -19267,7 +19261,7 @@ index a3fee53..828104c 100644
])# _LT_LANG_RC_CONFIG
-@@ -6998,6 +7652,13 @@ dnl aclocal-1.4 backwards compatibility:
+@@ -6998,6 +7652,13 @@
dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
@@ -19281,7 +19275,7 @@ index a3fee53..828104c 100644
# LT_PROG_RC
# ----------
AC_DEFUN([LT_PROG_RC],
-@@ -7037,6 +7698,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+@@ -7037,6 +7698,15 @@
AC_SUBST([OBJDUMP])
])
@@ -19297,7 +19291,7 @@ index a3fee53..828104c 100644
# _LT_DECL_SED
# ------------
-@@ -7130,8 +7800,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
+@@ -7130,8 +7800,8 @@
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
@@ -19308,7 +19302,7 @@ index a3fee53..828104c 100644
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-@@ -7170,208 +7840,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+@@ -7170,208 +7840,162 @@
])# _LT_CHECK_SHELL_FEATURES
@@ -19393,6 +19387,12 @@ index a3fee53..828104c 100644
-{
- func_xform_result=${1%.*}.lo
-}
+-
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=$(( $[*] ))
+-}
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
@@ -19409,18 +19409,17 @@ index a3fee53..828104c 100644
+test 0 -eq $? || _lt_function_replace_fail=:
+])
--# 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_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
@@ -19443,17 +19442,6 @@ index a3fee53..828104c 100644
+ esac
+ func_basename_result="${1##*/}"])
--_LT_EOF
-- ;;
-- *) # Bourne compatible functions.
-- cat << \_LT_EOF >> "$cfgfile"
-+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+ # positional parameters, so assign one to ordinary parameter first.
-+ func_stripname_result=${3}
-+ func_stripname_result=${func_stripname_result#"${1}"}
-+ func_stripname_result=${func_stripname_result%"${2}"}])
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
@@ -19467,27 +19455,28 @@ index a3fee53..828104c 100644
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-+ func_split_long_opt_name=${1%%=*}
-+ func_split_long_opt_arg=${1#*=}])
++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++ # positional parameters, so assign one to ordinary parameter first.
++ func_stripname_result=${3}
++ func_stripname_result=${func_stripname_result#"${1}"}
++ func_stripname_result=${func_stripname_result%"${2}"}])
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-+ func_split_short_opt_arg=${1#??}
-+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
++ func_split_long_opt_name=${1%%=*}
++ func_split_long_opt_arg=${1#*=}])
-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_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-+ case ${1} in
-+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+ *) func_lo2o_result=${1} ;;
-+ esac])
++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
++ func_split_short_opt_arg=${1#??}
++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
@@ -19504,12 +19493,16 @@ index a3fee53..828104c 100644
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
++ case ${1} in
++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++ *) func_lo2o_result=${1} ;;
++ esac])
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-# func_opt_split
-func_opt_split ()
@@ -19517,28 +19510,33 @@ index a3fee53..828104c 100644
- 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"`
-}
--
++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
+
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
--
++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
++fi
+
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-+fi
++if test x"$lt_shell_append" = xyes; then
++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$[@]"`
-}
-+if test x"$lt_shell_append" = xyes; then
-+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
++ func_quote_for_eval "${2}"
++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-# func_len string
-# STRING may not start with a hyphen.
@@ -19546,13 +19544,6 @@ index a3fee53..828104c 100644
-{
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-+ func_quote_for_eval "${2}"
-+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
--_LT_EOF
--esac
+ # Save a `func_append' function call where possible by direct use of '+='
+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
@@ -19566,14 +19557,17 @@ index a3fee53..828104c 100644
+ test 0 -eq $? || _lt_function_replace_fail=:
+fi
--case $lt_shell_append in
-- yes)
-- cat << \_LT_EOF >> "$cfgfile"
+-_LT_EOF
+-esac
+if test x"$_lt_function_replace_fail" = x":"; then
+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+-case $lt_shell_append in
+- yes)
+- cat << \_LT_EOF >> "$cfgfile"
+-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
@@ -19659,10 +19653,10 @@ index a3fee53..828104c 100644
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+ [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
-diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
-index 34151a3..5d9acd8 100644
---- a/m4/ltoptions.m4
-+++ b/m4/ltoptions.m4
+Index: saga/m4/ltoptions.m4
+===================================================================
+--- saga.orig/m4/ltoptions.m4 2012-01-09 14:09:37.000000000 +0100
++++ saga/m4/ltoptions.m4 2012-01-09 14:10:07.000000000 +0100
@@ -1,13 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
@@ -19680,7 +19674,7 @@ index 34151a3..5d9acd8 100644
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+@@ -125,7 +126,7 @@
[enable_win32_dll=yes
case $host in
@@ -19689,7 +19683,7 @@ index 34151a3..5d9acd8 100644
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -133,13 +134,13 @@ case $host in
+@@ -133,13 +134,13 @@
esac
test -z "$AS" && AS=as
@@ -19706,7 +19700,7 @@ index 34151a3..5d9acd8 100644
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-@@ -325,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+@@ -325,9 +326,24 @@
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
@@ -19733,10 +19727,10 @@ index 34151a3..5d9acd8 100644
[pic_mode=default])
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
-index f3c5309..07a8602 100644
---- a/m4/ltversion.m4
-+++ b/m4/ltversion.m4
+Index: saga/m4/ltversion.m4
+===================================================================
+--- saga.orig/m4/ltversion.m4 2012-01-09 14:09:37.000000000 +0100
++++ saga/m4/ltversion.m4 2012-01-09 14:10:07.000000000 +0100
@@ -7,17 +7,17 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
@@ -19761,10 +19755,10 @@ index f3c5309..07a8602 100644
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
-diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
-index 637bb20..c573da9 100644
---- a/m4/lt~obsolete.m4
-+++ b/m4/lt~obsolete.m4
+Index: saga/m4/lt~obsolete.m4
+===================================================================
+--- saga.orig/m4/lt~obsolete.m4 2012-01-09 14:09:37.000000000 +0100
++++ saga/m4/lt~obsolete.m4 2012-01-09 14:10:07.000000000 +0100
@@ -1,13 +1,13 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
@@ -19781,7 +19775,7 @@ index 637bb20..c573da9 100644
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+@@ -77,7 +77,6 @@
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
@@ -19789,7 +19783,7 @@ index 637bb20..c573da9 100644
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])])
-@@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+@@ -90,3 +89,10 @@
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])])
@@ -19800,11 +19794,11 @@ index 637bb20..c573da9 100644
+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 8758ac8..678bebb 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/Makefile.in
+===================================================================
+--- saga.orig/src/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19812,7 +19806,7 @@ index 8758ac8..678bebb 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19820,7 +19814,7 @@ index 8758ac8..678bebb 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19828,7 +19822,7 @@ index 8758ac8..678bebb 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19836,11 +19830,11 @@ index 8758ac8..678bebb 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
-index 701c05d..206350f 100644
---- a/src/modules/Makefile.in
-+++ b/src/modules/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/Makefile.in
+===================================================================
+--- saga.orig/src/modules/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19848,7 +19842,7 @@ index 701c05d..206350f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19856,7 +19850,7 @@ index 701c05d..206350f 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19864,7 +19858,7 @@ index 701c05d..206350f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19872,11 +19866,11 @@ index 701c05d..206350f 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/grid/Makefile.in b/src/modules/grid/Makefile.in
-index 165f3da..441f980 100644
---- a/src/modules/grid/Makefile.in
-+++ b/src/modules/grid/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/grid/Makefile.in
+===================================================================
+--- saga.orig/src/modules/grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19884,7 +19878,7 @@ index 165f3da..441f980 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19892,7 +19886,7 @@ index 165f3da..441f980 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19900,7 +19894,7 @@ index 165f3da..441f980 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19908,11 +19902,11 @@ index 165f3da..441f980 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/grid/grid_analysis/Makefile.in b/src/modules/grid/grid_analysis/Makefile.in
-index b2cb540..69b810b 100644
---- a/src/modules/grid/grid_analysis/Makefile.in
-+++ b/src/modules/grid/grid_analysis/Makefile.in
-@@ -133,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/grid/grid_analysis/Makefile.in
+===================================================================
+--- saga.orig/src/modules/grid/grid_analysis/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/grid/grid_analysis/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -133,6 +133,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19920,7 +19914,7 @@ index b2cb540..69b810b 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -159,6 +160,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -159,6 +160,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19928,7 +19922,7 @@ index b2cb540..69b810b 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -197,6 +199,7 @@ abs_builddir = @abs_builddir@
+@@ -197,6 +199,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19936,7 +19930,7 @@ index b2cb540..69b810b 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -230,7 +233,6 @@ libdir = @libdir@
+@@ -230,7 +233,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19944,11 +19938,11 @@ index b2cb540..69b810b 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/grid/grid_calculus/Makefile.in b/src/modules/grid/grid_calculus/Makefile.in
-index 120fe40..b3034b8 100644
---- a/src/modules/grid/grid_calculus/Makefile.in
-+++ b/src/modules/grid/grid_calculus/Makefile.in
-@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/grid/grid_calculus/Makefile.in
+===================================================================
+--- saga.orig/src/modules/grid/grid_calculus/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/grid/grid_calculus/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -131,6 +131,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19956,7 +19950,7 @@ index 120fe40..b3034b8 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -157,6 +158,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19964,7 +19958,7 @@ index 120fe40..b3034b8 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19972,7 +19966,7 @@ index 120fe40..b3034b8 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@ libdir = @libdir@
+@@ -228,7 +231,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19980,11 +19974,11 @@ index 120fe40..b3034b8 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/grid/grid_calculus_bsl/Makefile.in b/src/modules/grid/grid_calculus_bsl/Makefile.in
-index 3945ad5..e3ba009 100644
---- a/src/modules/grid/grid_calculus_bsl/Makefile.in
-+++ b/src/modules/grid/grid_calculus_bsl/Makefile.in
-@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/grid/grid_calculus_bsl/Makefile.in
+===================================================================
+--- saga.orig/src/modules/grid/grid_calculus_bsl/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/grid/grid_calculus_bsl/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -131,6 +131,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19992,7 +19986,7 @@ index 3945ad5..e3ba009 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -157,6 +158,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20000,7 +19994,7 @@ index 3945ad5..e3ba009 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20008,7 +20002,7 @@ index 3945ad5..e3ba009 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@ libdir = @libdir@
+@@ -228,7 +231,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20016,11 +20010,11 @@ index 3945ad5..e3ba009 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/grid/grid_filter/Makefile.in b/src/modules/grid/grid_filter/Makefile.in
-index 34636b9..cce5e07 100644
---- a/src/modules/grid/grid_filter/Makefile.in
-+++ b/src/modules/grid/grid_filter/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/grid/grid_filter/Makefile.in
+===================================================================
+--- saga.orig/src/modules/grid/grid_filter/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/grid/grid_filter/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20028,7 +20022,7 @@ index 34636b9..cce5e07 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20036,7 +20030,7 @@ index 34636b9..cce5e07 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20044,7 +20038,7 @@ index 34636b9..cce5e07 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20052,11 +20046,11 @@ index 34636b9..cce5e07 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/grid/grid_gridding/Makefile.in b/src/modules/grid/grid_gridding/Makefile.in
-index ab3ea25..4fbdf7c 100644
---- a/src/modules/grid/grid_gridding/Makefile.in
-+++ b/src/modules/grid/grid_gridding/Makefile.in
-@@ -81,7 +81,7 @@ am_libgrid_gridding_la_OBJECTS = Interpolation.lo \
+Index: saga/src/modules/grid/grid_gridding/Makefile.in
+===================================================================
+--- saga.orig/src/modules/grid/grid_gridding/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/grid/grid_gridding/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -81,7 +81,7 @@
Interpolation_NearestNeighbour.lo Interpolation_Shepard.lo \
Interpolation_Triangulation.lo kernel_density.lo \
MLB_Interface.lo Shapes2Grid.lo Shepard.lo delaunay.lo hash.lo \
@@ -20065,7 +20059,7 @@ index ab3ea25..4fbdf7c 100644
libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -132,6 +132,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20073,7 +20067,7 @@ index ab3ea25..4fbdf7c 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -158,6 +159,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20081,7 +20075,7 @@ index ab3ea25..4fbdf7c 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20089,7 +20083,7 @@ index ab3ea25..4fbdf7c 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@ libdir = @libdir@
+@@ -229,7 +232,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20097,7 +20091,7 @@ index ab3ea25..4fbdf7c 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -259,7 +261,7 @@ top_srcdir = @top_srcdir@
+@@ -259,7 +261,7 @@
DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
@@ -20106,7 +20100,7 @@ index ab3ea25..4fbdf7c 100644
pkglib_LTLIBRARIES = libgrid_gridding.la
libgrid_gridding_la_SOURCES = \
Interpolation.cpp\
-@@ -279,7 +281,6 @@ Shepard.cpp\
+@@ -279,7 +281,6 @@
./nn/nnai.c\
./nn/nncommon.c\
./nn/nnpi.c\
@@ -20114,7 +20108,7 @@ index ab3ea25..4fbdf7c 100644
Interpolation.h\
Interpolation_InverseDistance.h\
Interpolation_NaturalNeighbour.h\
-@@ -295,7 +296,6 @@ Shepard.h\
+@@ -295,7 +296,6 @@
./nn/istack.h\
./nn/nan.h\
./nn/nn.h\
@@ -20122,7 +20116,7 @@ index ab3ea25..4fbdf7c 100644
./nn/version.h
libgrid_gridding_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
-@@ -390,7 +390,6 @@ distclean-compile:
+@@ -390,7 +390,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nnai.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nncommon.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nnpi.Plo at am__quote@
@@ -20130,7 +20124,7 @@ index ab3ea25..4fbdf7c 100644
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -462,13 +461,6 @@ nnpi.lo: ./nn/nnpi.c
+@@ -462,13 +461,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c
@@ -20144,11 +20138,11 @@ index ab3ea25..4fbdf7c 100644
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-diff --git a/src/modules/grid/grid_spline/Makefile.in b/src/modules/grid/grid_spline/Makefile.in
-index 15ac42b..7e7156c 100644
---- a/src/modules/grid/grid_spline/Makefile.in
-+++ b/src/modules/grid/grid_spline/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/grid/grid_spline/Makefile.in
+===================================================================
+--- saga.orig/src/modules/grid/grid_spline/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/grid/grid_spline/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -130,6 +130,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20156,7 +20150,7 @@ index 15ac42b..7e7156c 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -156,6 +157,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20164,7 +20158,7 @@ index 15ac42b..7e7156c 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20172,7 +20166,7 @@ index 15ac42b..7e7156c 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@ libdir = @libdir@
+@@ -227,7 +230,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20180,11 +20174,11 @@ index 15ac42b..7e7156c 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/grid/grid_tools/Makefile.in b/src/modules/grid/grid_tools/Makefile.in
-index 020f381..75d0a57 100644
---- a/src/modules/grid/grid_tools/Makefile.in
-+++ b/src/modules/grid/grid_tools/Makefile.in
-@@ -136,6 +136,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/grid/grid_tools/Makefile.in
+===================================================================
+--- saga.orig/src/modules/grid/grid_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/grid/grid_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -136,6 +136,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20192,7 +20186,7 @@ index 020f381..75d0a57 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -162,6 +163,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -162,6 +163,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20200,7 +20194,7 @@ index 020f381..75d0a57 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -200,6 +202,7 @@ abs_builddir = @abs_builddir@
+@@ -200,6 +202,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20208,7 +20202,7 @@ index 020f381..75d0a57 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -233,7 +236,6 @@ libdir = @libdir@
+@@ -233,7 +236,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20216,11 +20210,11 @@ index 020f381..75d0a57 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/grid/grid_visualisation/Makefile.in b/src/modules/grid/grid_visualisation/Makefile.in
-index af2b578..e1af16c 100644
---- a/src/modules/grid/grid_visualisation/Makefile.in
-+++ b/src/modules/grid/grid_visualisation/Makefile.in
-@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/grid/grid_visualisation/Makefile.in
+===================================================================
+--- saga.orig/src/modules/grid/grid_visualisation/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/grid/grid_visualisation/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -131,6 +131,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20228,7 +20222,7 @@ index af2b578..e1af16c 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -157,6 +158,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20236,7 +20230,7 @@ index af2b578..e1af16c 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20244,7 +20238,7 @@ index af2b578..e1af16c 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@ libdir = @libdir@
+@@ -228,7 +231,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20252,11 +20246,11 @@ index af2b578..e1af16c 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/pointcloud/Makefile.in b/src/modules/pointcloud/Makefile.in
-index 7b9ab32..d99752f 100644
---- a/src/modules/pointcloud/Makefile.in
-+++ b/src/modules/pointcloud/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/pointcloud/Makefile.in
+===================================================================
+--- saga.orig/src/modules/pointcloud/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/pointcloud/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20264,7 +20258,7 @@ index 7b9ab32..d99752f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20272,7 +20266,7 @@ index 7b9ab32..d99752f 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20280,7 +20274,7 @@ index 7b9ab32..d99752f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20288,11 +20282,11 @@ index 7b9ab32..d99752f 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/pointcloud/pointcloud_tools/Makefile.in b/src/modules/pointcloud/pointcloud_tools/Makefile.in
-index 6f31ca3..5ece3f0 100644
---- a/src/modules/pointcloud/pointcloud_tools/Makefile.in
-+++ b/src/modules/pointcloud/pointcloud_tools/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/pointcloud/pointcloud_tools/Makefile.in
+===================================================================
+--- saga.orig/src/modules/pointcloud/pointcloud_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/pointcloud/pointcloud_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -130,6 +130,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20300,7 +20294,7 @@ index 6f31ca3..5ece3f0 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -156,6 +157,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20308,7 +20302,7 @@ index 6f31ca3..5ece3f0 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20316,7 +20310,7 @@ index 6f31ca3..5ece3f0 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@ libdir = @libdir@
+@@ -227,7 +230,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20324,11 +20318,11 @@ index 6f31ca3..5ece3f0 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/pointcloud/pointcloud_viewer/Makefile.in b/src/modules/pointcloud/pointcloud_viewer/Makefile.in
-index 5425739..322b4ae 100644
---- a/src/modules/pointcloud/pointcloud_viewer/Makefile.in
-+++ b/src/modules/pointcloud/pointcloud_viewer/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/pointcloud/pointcloud_viewer/Makefile.in
+===================================================================
+--- saga.orig/src/modules/pointcloud/pointcloud_viewer/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/pointcloud/pointcloud_viewer/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -130,6 +130,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20336,7 +20330,7 @@ index 5425739..322b4ae 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -156,6 +157,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20344,7 +20338,7 @@ index 5425739..322b4ae 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20352,7 +20346,7 @@ index 5425739..322b4ae 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@ libdir = @libdir@
+@@ -227,7 +230,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20360,11 +20354,11 @@ index 5425739..322b4ae 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/shapes/Makefile.in b/src/modules/shapes/Makefile.in
-index bd4a260..01c1ff3 100644
---- a/src/modules/shapes/Makefile.in
-+++ b/src/modules/shapes/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/shapes/Makefile.in
+===================================================================
+--- saga.orig/src/modules/shapes/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/shapes/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20372,7 +20366,7 @@ index bd4a260..01c1ff3 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20380,7 +20374,7 @@ index bd4a260..01c1ff3 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20388,7 +20382,7 @@ index bd4a260..01c1ff3 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20396,11 +20390,11 @@ index bd4a260..01c1ff3 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/shapes/shapes_grid/Makefile.in b/src/modules/shapes/shapes_grid/Makefile.in
-index bcfc2ed..f273722 100644
---- a/src/modules/shapes/shapes_grid/Makefile.in
-+++ b/src/modules/shapes/shapes_grid/Makefile.in
-@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/shapes/shapes_grid/Makefile.in
+===================================================================
+--- saga.orig/src/modules/shapes/shapes_grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/shapes/shapes_grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -131,6 +131,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20408,7 +20402,7 @@ index bcfc2ed..f273722 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -157,6 +158,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20416,7 +20410,7 @@ index bcfc2ed..f273722 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20424,7 +20418,7 @@ index bcfc2ed..f273722 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@ libdir = @libdir@
+@@ -228,7 +231,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20432,11 +20426,11 @@ index bcfc2ed..f273722 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/shapes/shapes_lines/Makefile.in b/src/modules/shapes/shapes_lines/Makefile.in
-index faefd7d..0dd40fc 100644
---- a/src/modules/shapes/shapes_lines/Makefile.in
-+++ b/src/modules/shapes/shapes_lines/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/shapes/shapes_lines/Makefile.in
+===================================================================
+--- saga.orig/src/modules/shapes/shapes_lines/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/shapes/shapes_lines/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20444,7 +20438,7 @@ index faefd7d..0dd40fc 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20452,7 +20446,7 @@ index faefd7d..0dd40fc 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20460,7 +20454,7 @@ index faefd7d..0dd40fc 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20468,11 +20462,11 @@ index faefd7d..0dd40fc 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/shapes/shapes_points/Makefile.in b/src/modules/shapes/shapes_points/Makefile.in
-index cc358de..d9513ab 100644
---- a/src/modules/shapes/shapes_points/Makefile.in
-+++ b/src/modules/shapes/shapes_points/Makefile.in
-@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/shapes/shapes_points/Makefile.in
+===================================================================
+--- saga.orig/src/modules/shapes/shapes_points/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/shapes/shapes_points/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -132,6 +132,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20480,7 +20474,7 @@ index cc358de..d9513ab 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -158,6 +159,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20488,7 +20482,7 @@ index cc358de..d9513ab 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20496,7 +20490,7 @@ index cc358de..d9513ab 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@ libdir = @libdir@
+@@ -229,7 +232,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20504,11 +20498,11 @@ index cc358de..d9513ab 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/shapes/shapes_polygons/Makefile.in b/src/modules/shapes/shapes_polygons/Makefile.in
-index cace281..c514dfc 100644
---- a/src/modules/shapes/shapes_polygons/Makefile.in
-+++ b/src/modules/shapes/shapes_polygons/Makefile.in
-@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/shapes/shapes_polygons/Makefile.in
+===================================================================
+--- saga.orig/src/modules/shapes/shapes_polygons/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/shapes/shapes_polygons/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -131,6 +131,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20516,7 +20510,7 @@ index cace281..c514dfc 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -157,6 +158,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20524,7 +20518,7 @@ index cace281..c514dfc 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20532,7 +20526,7 @@ index cace281..c514dfc 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@ libdir = @libdir@
+@@ -228,7 +231,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20540,11 +20534,11 @@ index cace281..c514dfc 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/shapes/shapes_tools/Makefile.in b/src/modules/shapes/shapes_tools/Makefile.in
-index 9743244..dff52dd 100644
---- a/src/modules/shapes/shapes_tools/Makefile.in
-+++ b/src/modules/shapes/shapes_tools/Makefile.in
-@@ -134,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/shapes/shapes_tools/Makefile.in
+===================================================================
+--- saga.orig/src/modules/shapes/shapes_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/shapes/shapes_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -134,6 +134,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20552,7 +20546,7 @@ index 9743244..dff52dd 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -160,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -160,6 +161,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20560,7 +20554,7 @@ index 9743244..dff52dd 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -198,6 +200,7 @@ abs_builddir = @abs_builddir@
+@@ -198,6 +200,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20568,7 +20562,7 @@ index 9743244..dff52dd 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -231,7 +234,6 @@ libdir = @libdir@
+@@ -231,7 +234,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20576,11 +20570,11 @@ index 9743244..dff52dd 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/shapes/shapes_transect/Makefile.in b/src/modules/shapes/shapes_transect/Makefile.in
-index 945084e..dbbd6cf 100644
---- a/src/modules/shapes/shapes_transect/Makefile.in
-+++ b/src/modules/shapes/shapes_transect/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/shapes/shapes_transect/Makefile.in
+===================================================================
+--- saga.orig/src/modules/shapes/shapes_transect/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/shapes/shapes_transect/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -126,6 +126,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20588,7 +20582,7 @@ index 945084e..dbbd6cf 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -152,6 +153,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20596,7 +20590,7 @@ index 945084e..dbbd6cf 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -190,6 +192,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20604,7 +20598,7 @@ index 945084e..dbbd6cf 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@ libdir = @libdir@
+@@ -223,7 +226,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20612,11 +20606,11 @@ index 945084e..dbbd6cf 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/table/Makefile.in b/src/modules/table/Makefile.in
-index 42558e0..dba3499 100644
---- a/src/modules/table/Makefile.in
-+++ b/src/modules/table/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/table/Makefile.in
+===================================================================
+--- saga.orig/src/modules/table/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/table/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20624,7 +20618,7 @@ index 42558e0..dba3499 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20632,7 +20626,7 @@ index 42558e0..dba3499 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20640,7 +20634,7 @@ index 42558e0..dba3499 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20648,11 +20642,11 @@ index 42558e0..dba3499 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/table/table_calculus/Makefile.in b/src/modules/table/table_calculus/Makefile.in
-index a404f86..3658df8 100644
---- a/src/modules/table/table_calculus/Makefile.in
-+++ b/src/modules/table/table_calculus/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/table/table_calculus/Makefile.in
+===================================================================
+--- saga.orig/src/modules/table/table_calculus/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/table/table_calculus/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20660,7 +20654,7 @@ index a404f86..3658df8 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20668,7 +20662,7 @@ index a404f86..3658df8 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20676,7 +20670,7 @@ index a404f86..3658df8 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20684,11 +20678,11 @@ index a404f86..3658df8 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/table/table_tools/Makefile.in b/src/modules/table/table_tools/Makefile.in
-index 529ee4a..a98b65c 100644
---- a/src/modules/table/table_tools/Makefile.in
-+++ b/src/modules/table/table_tools/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/table/table_tools/Makefile.in
+===================================================================
+--- saga.orig/src/modules/table/table_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/table/table_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20696,7 +20690,7 @@ index 529ee4a..a98b65c 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20704,7 +20698,7 @@ index 529ee4a..a98b65c 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20712,7 +20706,7 @@ index 529ee4a..a98b65c 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20720,11 +20714,11 @@ index 529ee4a..a98b65c 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/tin/Makefile.in b/src/modules/tin/Makefile.in
-index 4f4e4c5..1eae4f7 100644
---- a/src/modules/tin/Makefile.in
-+++ b/src/modules/tin/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/tin/Makefile.in
+===================================================================
+--- saga.orig/src/modules/tin/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/tin/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20732,7 +20726,7 @@ index 4f4e4c5..1eae4f7 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20740,7 +20734,7 @@ index 4f4e4c5..1eae4f7 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20748,7 +20742,7 @@ index 4f4e4c5..1eae4f7 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20756,11 +20750,11 @@ index 4f4e4c5..1eae4f7 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/tin/tin_tools/Makefile.in b/src/modules/tin/tin_tools/Makefile.in
-index a0e403e..f23cefb 100644
---- a/src/modules/tin/tin_tools/Makefile.in
-+++ b/src/modules/tin/tin_tools/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/tin/tin_tools/Makefile.in
+===================================================================
+--- saga.orig/src/modules/tin/tin_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/tin/tin_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20768,7 +20762,7 @@ index a0e403e..f23cefb 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20776,7 +20770,7 @@ index a0e403e..f23cefb 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20784,7 +20778,7 @@ index a0e403e..f23cefb 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20792,11 +20786,11 @@ index a0e403e..f23cefb 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules/tin/tin_viewer/Makefile.in b/src/modules/tin/tin_viewer/Makefile.in
-index d1f89c6..521b5f9 100644
---- a/src/modules/tin/tin_viewer/Makefile.in
-+++ b/src/modules/tin/tin_viewer/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules/tin/tin_viewer/Makefile.in
+===================================================================
+--- saga.orig/src/modules/tin/tin_viewer/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules/tin/tin_viewer/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20804,7 +20798,7 @@ index d1f89c6..521b5f9 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20812,7 +20806,7 @@ index d1f89c6..521b5f9 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20820,7 +20814,7 @@ index d1f89c6..521b5f9 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20828,11 +20822,11 @@ index d1f89c6..521b5f9 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_contrib/Makefile.in b/src/modules_contrib/Makefile.in
-index 040184d..6d0f635 100644
---- a/src/modules_contrib/Makefile.in
-+++ b/src/modules_contrib/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_contrib/Makefile.in
+===================================================================
+--- saga.orig/src/modules_contrib/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_contrib/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20840,7 +20834,7 @@ index 040184d..6d0f635 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20848,7 +20842,7 @@ index 040184d..6d0f635 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20856,7 +20850,7 @@ index 040184d..6d0f635 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20864,11 +20858,11 @@ index 040184d..6d0f635 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_contrib/contrib_a_perego/Makefile.in b/src/modules_contrib/contrib_a_perego/Makefile.in
-index 4ec3db3..0862ab5 100644
---- a/src/modules_contrib/contrib_a_perego/Makefile.in
-+++ b/src/modules_contrib/contrib_a_perego/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_contrib/contrib_a_perego/Makefile.in
+===================================================================
+--- saga.orig/src/modules_contrib/contrib_a_perego/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_contrib/contrib_a_perego/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20876,7 +20870,7 @@ index 4ec3db3..0862ab5 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20884,7 +20878,7 @@ index 4ec3db3..0862ab5 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20892,7 +20886,7 @@ index 4ec3db3..0862ab5 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20900,11 +20894,11 @@ index 4ec3db3..0862ab5 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in b/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
-index 8631ad2..8266f87 100644
---- a/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
-+++ b/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
+===================================================================
+--- saga.orig/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20912,7 +20906,7 @@ index 8631ad2..8266f87 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20920,7 +20914,7 @@ index 8631ad2..8266f87 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20928,7 +20922,7 @@ index 8631ad2..8266f87 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20936,11 +20930,11 @@ index 8631ad2..8266f87 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_contrib/contrib_s_liersch/Makefile.in b/src/modules_contrib/contrib_s_liersch/Makefile.in
-index 17893b4..3eadf90 100644
---- a/src/modules_contrib/contrib_s_liersch/Makefile.in
-+++ b/src/modules_contrib/contrib_s_liersch/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_contrib/contrib_s_liersch/Makefile.in
+===================================================================
+--- saga.orig/src/modules_contrib/contrib_s_liersch/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_contrib/contrib_s_liersch/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20948,7 +20942,7 @@ index 17893b4..3eadf90 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20956,7 +20950,7 @@ index 17893b4..3eadf90 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20964,7 +20958,7 @@ index 17893b4..3eadf90 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20972,11 +20966,11 @@ index 17893b4..3eadf90 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in b/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
-index 41fb921..4462fc7 100644
---- a/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
-+++ b/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
+===================================================================
+--- saga.orig/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20984,7 +20978,7 @@ index 41fb921..4462fc7 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20992,7 +20986,7 @@ index 41fb921..4462fc7 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21000,7 +20994,7 @@ index 41fb921..4462fc7 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21008,11 +21002,11 @@ index 41fb921..4462fc7 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_contrib/garden/Makefile.in b/src/modules_contrib/garden/Makefile.in
-index 4e820cc..340f138 100644
---- a/src/modules_contrib/garden/Makefile.in
-+++ b/src/modules_contrib/garden/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_contrib/garden/Makefile.in
+===================================================================
+--- saga.orig/src/modules_contrib/garden/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_contrib/garden/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21020,7 +21014,7 @@ index 4e820cc..340f138 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21028,7 +21022,7 @@ index 4e820cc..340f138 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21036,7 +21030,7 @@ index 4e820cc..340f138 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21044,11 +21038,11 @@ index 4e820cc..340f138 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_contrib/garden/garden_3d_viewer/Makefile.in b/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
-index 977533d..7f0821f 100644
---- a/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
-+++ b/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
+===================================================================
+--- saga.orig/src/modules_contrib/garden/garden_3d_viewer/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_contrib/garden/garden_3d_viewer/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21056,7 +21050,7 @@ index 977533d..7f0821f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21064,7 +21058,7 @@ index 977533d..7f0821f 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21072,7 +21066,7 @@ index 977533d..7f0821f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21080,11 +21074,11 @@ index 977533d..7f0821f 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_contrib/garden/garden_webservices/Makefile.in b/src/modules_contrib/garden/garden_webservices/Makefile.in
-index 608085b..0325f01 100644
---- a/src/modules_contrib/garden/garden_webservices/Makefile.in
-+++ b/src/modules_contrib/garden/garden_webservices/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_contrib/garden/garden_webservices/Makefile.in
+===================================================================
+--- saga.orig/src/modules_contrib/garden/garden_webservices/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_contrib/garden/garden_webservices/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21092,7 +21086,7 @@ index 608085b..0325f01 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21100,7 +21094,7 @@ index 608085b..0325f01 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21108,7 +21102,7 @@ index 608085b..0325f01 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21116,11 +21110,11 @@ index 608085b..0325f01 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_geostatistics/Makefile.in b/src/modules_geostatistics/Makefile.in
-index b8cb4ff..e053653 100644
---- a/src/modules_geostatistics/Makefile.in
-+++ b/src/modules_geostatistics/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_geostatistics/Makefile.in
+===================================================================
+--- saga.orig/src/modules_geostatistics/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_geostatistics/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21128,7 +21122,7 @@ index b8cb4ff..e053653 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21136,7 +21130,7 @@ index b8cb4ff..e053653 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21144,7 +21138,7 @@ index b8cb4ff..e053653 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21152,11 +21146,11 @@ index b8cb4ff..e053653 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_geostatistics/geostatistics/Makefile.in b/src/modules_geostatistics/geostatistics/Makefile.in
-index eeff88a..a13ae91 100644
---- a/src/modules_geostatistics/geostatistics/Makefile.in
-+++ b/src/modules_geostatistics/geostatistics/Makefile.in
-@@ -115,6 +115,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_geostatistics/geostatistics/Makefile.in
+===================================================================
+--- saga.orig/src/modules_geostatistics/geostatistics/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_geostatistics/geostatistics/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -115,6 +115,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21164,7 +21158,7 @@ index eeff88a..a13ae91 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -141,6 +142,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -141,6 +142,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21172,7 +21166,7 @@ index eeff88a..a13ae91 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -179,6 +181,7 @@ abs_builddir = @abs_builddir@
+@@ -179,6 +181,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21180,7 +21174,7 @@ index eeff88a..a13ae91 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -212,7 +215,6 @@ libdir = @libdir@
+@@ -212,7 +215,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21188,11 +21182,11 @@ index eeff88a..a13ae91 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
-index a4c8283..6aa80cd 100644
---- a/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
-+++ b/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
-@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
+===================================================================
+--- saga.orig/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -132,6 +132,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21200,7 +21194,7 @@ index a4c8283..6aa80cd 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -158,6 +159,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21208,7 +21202,7 @@ index a4c8283..6aa80cd 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21216,7 +21210,7 @@ index a4c8283..6aa80cd 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@ libdir = @libdir@
+@@ -229,7 +232,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21224,11 +21218,11 @@ index a4c8283..6aa80cd 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
-index 347e1f6..636d2a3 100644
---- a/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
-+++ b/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
-@@ -134,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
+===================================================================
+--- saga.orig/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -134,6 +134,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21236,7 +21230,7 @@ index 347e1f6..636d2a3 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -160,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -160,6 +161,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21244,7 +21238,7 @@ index 347e1f6..636d2a3 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -198,6 +200,7 @@ abs_builddir = @abs_builddir@
+@@ -198,6 +200,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21252,7 +21246,7 @@ index 347e1f6..636d2a3 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -231,7 +234,6 @@ libdir = @libdir@
+@@ -231,7 +234,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21260,11 +21254,11 @@ index 347e1f6..636d2a3 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
-index 37b0bf4..71e44c9 100644
---- a/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
-+++ b/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
+===================================================================
+--- saga.orig/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -130,6 +130,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21272,7 +21266,7 @@ index 37b0bf4..71e44c9 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -156,6 +157,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21280,7 +21274,7 @@ index 37b0bf4..71e44c9 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21288,7 +21282,7 @@ index 37b0bf4..71e44c9 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@ libdir = @libdir@
+@@ -227,7 +230,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21296,11 +21290,11 @@ index 37b0bf4..71e44c9 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
-index 5b1aaaa..fbe3ee4 100644
---- a/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
-+++ b/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
-@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
+===================================================================
+--- saga.orig/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -132,6 +132,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21308,7 +21302,7 @@ index 5b1aaaa..fbe3ee4 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -158,6 +159,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21316,7 +21310,7 @@ index 5b1aaaa..fbe3ee4 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21324,7 +21318,7 @@ index 5b1aaaa..fbe3ee4 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@ libdir = @libdir@
+@@ -229,7 +232,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21332,11 +21326,11 @@ index 5b1aaaa..fbe3ee4 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/Makefile.in b/src/modules_images/Makefile.in
-index cf72430..84c6563 100644
---- a/src/modules_images/Makefile.in
-+++ b/src/modules_images/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_images/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21344,7 +21338,7 @@ index cf72430..84c6563 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21352,7 +21346,7 @@ index cf72430..84c6563 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21360,7 +21354,7 @@ index cf72430..84c6563 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21368,11 +21362,11 @@ index cf72430..84c6563 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/modules_imagery/Makefile.in b/src/modules_images/modules_imagery/Makefile.in
-index a0afe21..ad90c79 100644
---- a/src/modules_images/modules_imagery/Makefile.in
-+++ b/src/modules_images/modules_imagery/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/modules_imagery/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/modules_imagery/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_images/modules_imagery/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21380,7 +21374,7 @@ index a0afe21..ad90c79 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21388,7 +21382,7 @@ index a0afe21..ad90c79 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21396,7 +21390,7 @@ index a0afe21..ad90c79 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21404,11 +21398,11 @@ index a0afe21..ad90c79 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/modules_imagery/imagery_classification/Makefile.in b/src/modules_images/modules_imagery/imagery_classification/Makefile.in
-index 359a850..a4ce68f 100644
---- a/src/modules_images/modules_imagery/imagery_classification/Makefile.in
-+++ b/src/modules_images/modules_imagery/imagery_classification/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/modules_imagery/imagery_classification/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/modules_imagery/imagery_classification/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_images/modules_imagery/imagery_classification/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21416,7 +21410,7 @@ index 359a850..a4ce68f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21424,7 +21418,7 @@ index 359a850..a4ce68f 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21432,7 +21426,7 @@ index 359a850..a4ce68f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21440,11 +21434,11 @@ index 359a850..a4ce68f 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/modules_imagery/imagery_rga/Makefile.in b/src/modules_images/modules_imagery/imagery_rga/Makefile.in
-index 98847fd..379be5f 100644
---- a/src/modules_images/modules_imagery/imagery_rga/Makefile.in
-+++ b/src/modules_images/modules_imagery/imagery_rga/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/modules_imagery/imagery_rga/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/modules_imagery/imagery_rga/Makefile.in 2012-01-09 14:09:37.000000000 +0100
++++ saga/src/modules_images/modules_imagery/imagery_rga/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -126,6 +126,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21452,7 +21446,7 @@ index 98847fd..379be5f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -152,6 +153,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21460,7 +21454,7 @@ index 98847fd..379be5f 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -190,6 +192,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21468,7 +21462,7 @@ index 98847fd..379be5f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@ libdir = @libdir@
+@@ -223,7 +226,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21476,11 +21470,11 @@ index 98847fd..379be5f 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in b/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
-index 6228f95..d6888a6 100644
---- a/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
-+++ b/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21488,7 +21482,7 @@ index 6228f95..d6888a6 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21496,7 +21490,7 @@ index 6228f95..d6888a6 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21504,7 +21498,7 @@ index 6228f95..d6888a6 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21512,11 +21506,11 @@ index 6228f95..d6888a6 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/modules_imagery/imagery_tools/Makefile.in b/src/modules_images/modules_imagery/imagery_tools/Makefile.in
-index 5af3e96..f82018d 100644
---- a/src/modules_images/modules_imagery/imagery_tools/Makefile.in
-+++ b/src/modules_images/modules_imagery/imagery_tools/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/modules_imagery/imagery_tools/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/modules_imagery/imagery_tools/Makefile.in 2012-01-09 14:09:37.000000000 +0100
++++ saga/src/modules_images/modules_imagery/imagery_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -127,6 +127,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21524,7 +21518,7 @@ index 5af3e96..f82018d 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -153,6 +154,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21532,7 +21526,7 @@ index 5af3e96..f82018d 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -191,6 +193,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21540,7 +21534,7 @@ index 5af3e96..f82018d 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +227,6 @@ libdir = @libdir@
+@@ -224,7 +227,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21548,11 +21542,11 @@ index 5af3e96..f82018d 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/modules_opencv/Makefile.in b/src/modules_images/modules_opencv/Makefile.in
-index 9f3e6b6..594441d 100644
---- a/src/modules_images/modules_opencv/Makefile.in
-+++ b/src/modules_images/modules_opencv/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/modules_opencv/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/modules_opencv/Makefile.in 2012-01-09 14:09:37.000000000 +0100
++++ saga/src/modules_images/modules_opencv/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21560,7 +21554,7 @@ index 9f3e6b6..594441d 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21568,7 +21562,7 @@ index 9f3e6b6..594441d 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21576,7 +21570,7 @@ index 9f3e6b6..594441d 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21584,11 +21578,11 @@ index 9f3e6b6..594441d 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/modules_opencv/opencv/Makefile.in b/src/modules_images/modules_opencv/opencv/Makefile.in
-index 633786a..fb50778 100644
---- a/src/modules_images/modules_opencv/opencv/Makefile.in
-+++ b/src/modules_images/modules_opencv/opencv/Makefile.in
-@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/modules_opencv/opencv/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/modules_opencv/opencv/Makefile.in 2012-01-09 14:09:37.000000000 +0100
++++ saga/src/modules_images/modules_opencv/opencv/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -132,6 +132,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21596,7 +21590,7 @@ index 633786a..fb50778 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -158,6 +159,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21604,7 +21598,7 @@ index 633786a..fb50778 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21612,7 +21606,7 @@ index 633786a..fb50778 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@ libdir = @libdir@
+@@ -229,7 +232,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21620,11 +21614,11 @@ index 633786a..fb50778 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/modules_vigra/Makefile.in b/src/modules_images/modules_vigra/Makefile.in
-index df8a402..6f175ac 100644
---- a/src/modules_images/modules_vigra/Makefile.in
-+++ b/src/modules_images/modules_vigra/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/modules_vigra/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/modules_vigra/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_images/modules_vigra/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21632,7 +21626,7 @@ index df8a402..6f175ac 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21640,7 +21634,7 @@ index df8a402..6f175ac 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21648,7 +21642,7 @@ index df8a402..6f175ac 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21656,11 +21650,11 @@ index df8a402..6f175ac 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_images/modules_vigra/vigra/Makefile.in b/src/modules_images/modules_vigra/vigra/Makefile.in
-index 811d21b..ecf10ce 100644
---- a/src/modules_images/modules_vigra/vigra/Makefile.in
-+++ b/src/modules_images/modules_vigra/vigra/Makefile.in
-@@ -134,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_images/modules_vigra/vigra/Makefile.in
+===================================================================
+--- saga.orig/src/modules_images/modules_vigra/vigra/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_images/modules_vigra/vigra/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -134,6 +134,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21668,7 +21662,7 @@ index 811d21b..ecf10ce 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -160,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -160,6 +161,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21676,7 +21670,7 @@ index 811d21b..ecf10ce 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -198,6 +200,7 @@ abs_builddir = @abs_builddir@
+@@ -198,6 +200,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21684,7 +21678,7 @@ index 811d21b..ecf10ce 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -231,7 +234,6 @@ libdir = @libdir@
+@@ -231,7 +234,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21692,11 +21686,11 @@ index 811d21b..ecf10ce 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/Makefile.in b/src/modules_io/Makefile.in
-index 3ecaf52..e8c3174 100644
---- a/src/modules_io/Makefile.in
-+++ b/src/modules_io/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21704,7 +21698,7 @@ index 3ecaf52..e8c3174 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21712,7 +21706,7 @@ index 3ecaf52..e8c3174 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21720,7 +21714,7 @@ index 3ecaf52..e8c3174 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21728,11 +21722,11 @@ index 3ecaf52..e8c3174 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/db/Makefile.in b/src/modules_io/db/Makefile.in
-index be2b6fb..f87046b 100644
---- a/src/modules_io/db/Makefile.in
-+++ b/src/modules_io/db/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/db/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/db/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/db/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21740,7 +21734,7 @@ index be2b6fb..f87046b 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21748,7 +21742,7 @@ index be2b6fb..f87046b 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21756,7 +21750,7 @@ index be2b6fb..f87046b 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21764,11 +21758,11 @@ index be2b6fb..f87046b 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/db/io_odbc/Makefile.in b/src/modules_io/db/io_odbc/Makefile.in
-index 43f2033..dc34dfc 100644
---- a/src/modules_io/db/io_odbc/Makefile.in
-+++ b/src/modules_io/db/io_odbc/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/db/io_odbc/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/db/io_odbc/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/db/io_odbc/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21776,7 +21770,7 @@ index 43f2033..dc34dfc 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21784,7 +21778,7 @@ index 43f2033..dc34dfc 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21792,7 +21786,7 @@ index 43f2033..dc34dfc 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21800,11 +21794,11 @@ index 43f2033..dc34dfc 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/docs/Makefile.in b/src/modules_io/docs/Makefile.in
-index 4ec365f..f1f112f 100644
---- a/src/modules_io/docs/Makefile.in
-+++ b/src/modules_io/docs/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/docs/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/docs/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/docs/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21812,7 +21806,7 @@ index 4ec365f..f1f112f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21820,7 +21814,7 @@ index 4ec365f..f1f112f 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21828,7 +21822,7 @@ index 4ec365f..f1f112f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21836,11 +21830,11 @@ index 4ec365f..f1f112f 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/docs/docs_html/Makefile.in b/src/modules_io/docs/docs_html/Makefile.in
-index 3119327..e7d3e73 100644
---- a/src/modules_io/docs/docs_html/Makefile.in
-+++ b/src/modules_io/docs/docs_html/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/docs/docs_html/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/docs/docs_html/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/docs/docs_html/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -127,6 +127,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21848,7 +21842,7 @@ index 3119327..e7d3e73 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -153,6 +154,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21856,7 +21850,7 @@ index 3119327..e7d3e73 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -191,6 +193,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21864,7 +21858,7 @@ index 3119327..e7d3e73 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +227,6 @@ libdir = @libdir@
+@@ -224,7 +227,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21872,11 +21866,11 @@ index 3119327..e7d3e73 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/docs/docs_pdf/Makefile.in b/src/modules_io/docs/docs_pdf/Makefile.in
-index 21e460f..ad355a8 100644
---- a/src/modules_io/docs/docs_pdf/Makefile.in
-+++ b/src/modules_io/docs/docs_pdf/Makefile.in
-@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/docs/docs_pdf/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/docs/docs_pdf/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/docs/docs_pdf/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -132,6 +132,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21884,7 +21878,7 @@ index 21e460f..ad355a8 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -158,6 +159,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21892,7 +21886,7 @@ index 21e460f..ad355a8 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21900,7 +21894,7 @@ index 21e460f..ad355a8 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@ libdir = @libdir@
+@@ -229,7 +232,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21908,11 +21902,11 @@ index 21e460f..ad355a8 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/esri_e00/Makefile.in b/src/modules_io/esri_e00/Makefile.in
-index 4427de6..a4d9abe 100644
---- a/src/modules_io/esri_e00/Makefile.in
-+++ b/src/modules_io/esri_e00/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/esri_e00/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/esri_e00/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/esri_e00/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21920,7 +21914,7 @@ index 4427de6..a4d9abe 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21928,7 +21922,7 @@ index 4427de6..a4d9abe 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21936,7 +21930,7 @@ index 4427de6..a4d9abe 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21944,11 +21938,11 @@ index 4427de6..a4d9abe 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/esri_e00/io_esri_e00/Makefile.in b/src/modules_io/esri_e00/io_esri_e00/Makefile.in
-index f765811..51e834e 100644
---- a/src/modules_io/esri_e00/io_esri_e00/Makefile.in
-+++ b/src/modules_io/esri_e00/io_esri_e00/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/esri_e00/io_esri_e00/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/esri_e00/io_esri_e00/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/esri_e00/io_esri_e00/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21956,7 +21950,7 @@ index f765811..51e834e 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21964,7 +21958,7 @@ index f765811..51e834e 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21972,7 +21966,7 @@ index f765811..51e834e 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21980,11 +21974,11 @@ index f765811..51e834e 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/gdal/Makefile.in b/src/modules_io/gdal/Makefile.in
-index f0b2207..8b363cc 100644
---- a/src/modules_io/gdal/Makefile.in
-+++ b/src/modules_io/gdal/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/gdal/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/gdal/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/gdal/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21992,7 +21986,7 @@ index f0b2207..8b363cc 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22000,7 +21994,7 @@ index f0b2207..8b363cc 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22008,7 +22002,7 @@ index f0b2207..8b363cc 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22016,11 +22010,11 @@ index f0b2207..8b363cc 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/gdal/io_gdal/Makefile.in b/src/modules_io/gdal/io_gdal/Makefile.in
-index 8208f1f..21b11c2 100644
---- a/src/modules_io/gdal/io_gdal/Makefile.in
-+++ b/src/modules_io/gdal/io_gdal/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/gdal/io_gdal/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/gdal/io_gdal/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/gdal/io_gdal/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22028,7 +22022,7 @@ index 8208f1f..21b11c2 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22036,7 +22030,7 @@ index 8208f1f..21b11c2 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22044,7 +22038,7 @@ index 8208f1f..21b11c2 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22052,11 +22046,11 @@ index 8208f1f..21b11c2 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/gps/Makefile.in b/src/modules_io/gps/Makefile.in
-index a47d4c6..cb7a51e 100644
---- a/src/modules_io/gps/Makefile.in
-+++ b/src/modules_io/gps/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/gps/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/gps/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/gps/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22064,7 +22058,7 @@ index a47d4c6..cb7a51e 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22072,7 +22066,7 @@ index a47d4c6..cb7a51e 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22080,7 +22074,7 @@ index a47d4c6..cb7a51e 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22088,11 +22082,11 @@ index a47d4c6..cb7a51e 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/gps/io_gps/Makefile.in b/src/modules_io/gps/io_gps/Makefile.in
-index 08067ac..94b9f2d 100644
---- a/src/modules_io/gps/io_gps/Makefile.in
-+++ b/src/modules_io/gps/io_gps/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/gps/io_gps/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/gps/io_gps/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/gps/io_gps/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -126,6 +126,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22100,7 +22094,7 @@ index 08067ac..94b9f2d 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -152,6 +153,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22108,7 +22102,7 @@ index 08067ac..94b9f2d 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -190,6 +192,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22116,7 +22110,7 @@ index 08067ac..94b9f2d 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@ libdir = @libdir@
+@@ -223,7 +226,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22124,11 +22118,11 @@ index 08067ac..94b9f2d 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/grid/Makefile.in b/src/modules_io/grid/Makefile.in
-index 83a11d7..c4c4499 100644
---- a/src/modules_io/grid/Makefile.in
-+++ b/src/modules_io/grid/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/grid/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22136,7 +22130,7 @@ index 83a11d7..c4c4499 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22144,7 +22138,7 @@ index 83a11d7..c4c4499 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22152,7 +22146,7 @@ index 83a11d7..c4c4499 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22160,11 +22154,11 @@ index 83a11d7..c4c4499 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/grid/io_grid/Makefile.in b/src/modules_io/grid/io_grid/Makefile.in
-index ba4d0db..2205c72 100644
---- a/src/modules_io/grid/io_grid/Makefile.in
-+++ b/src/modules_io/grid/io_grid/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/grid/io_grid/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/grid/io_grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/grid/io_grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22172,7 +22166,7 @@ index ba4d0db..2205c72 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22180,7 +22174,7 @@ index ba4d0db..2205c72 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22188,7 +22182,7 @@ index ba4d0db..2205c72 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22196,11 +22190,11 @@ index ba4d0db..2205c72 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.in b/src/modules_io/grid/io_grid_grib2/Makefile.in
-index b661d76..a49f8a5 100644
---- a/src/modules_io/grid/io_grid_grib2/Makefile.in
-+++ b/src/modules_io/grid/io_grid_grib2/Makefile.in
-@@ -75,31 +75,12 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/grid/io_grid_grib2/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/grid/io_grid_grib2/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -75,31 +75,12 @@
LTLIBRARIES = $(pkglib_LTLIBRARIES)
libio_grid_grib2_la_DEPENDENCIES = \
$(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
@@ -22233,7 +22227,7 @@ index b661d76..a49f8a5 100644
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -109,6 +90,15 @@ CXXLD = $(CXX)
+@@ -109,6 +90,15 @@
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -22249,7 +22243,7 @@ index b661d76..a49f8a5 100644
SOURCES = $(libio_grid_grib2_la_SOURCES)
DIST_SOURCES = $(libio_grid_grib2_la_SOURCES)
ETAGS = etags
-@@ -136,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -136,6 +126,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22257,7 +22251,7 @@ index b661d76..a49f8a5 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -162,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -162,6 +153,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22265,7 +22259,7 @@ index b661d76..a49f8a5 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -200,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -200,6 +192,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22273,7 +22267,7 @@ index b661d76..a49f8a5 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -233,7 +226,6 @@ libdir = @libdir@
+@@ -233,7 +226,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22281,7 +22275,7 @@ index b661d76..a49f8a5 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -266,54 +258,6 @@ AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
+@@ -266,54 +258,6 @@
AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
pkglib_LTLIBRARIES = libio_grid_grib2.la
libio_grid_grib2_la_SOURCES = \
@@ -22336,7 +22330,7 @@ index b661d76..a49f8a5 100644
grib2_import.cpp\
MLB_Interface.cpp\
grib2_import.h\
-@@ -323,7 +267,7 @@ libio_grid_grib2_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
+@@ -323,7 +267,7 @@
all: all-am
.SUFFIXES:
@@ -22345,7 +22339,7 @@ index b661d76..a49f8a5 100644
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -395,380 +339,7 @@ distclean-compile:
+@@ -395,380 +339,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MLB_Interface.Plo at am__quote@
@@ -22726,11 +22720,11 @@ index b661d76..a49f8a5 100644
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-diff --git a/src/modules_io/grid/io_grid_image/Makefile.in b/src/modules_io/grid/io_grid_image/Makefile.in
-index ccf4c5c..6d81d63 100644
---- a/src/modules_io/grid/io_grid_image/Makefile.in
-+++ b/src/modules_io/grid/io_grid_image/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/grid/io_grid_image/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/grid/io_grid_image/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/grid/io_grid_image/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -127,6 +127,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22738,7 +22732,7 @@ index ccf4c5c..6d81d63 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -153,6 +154,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22746,7 +22740,7 @@ index ccf4c5c..6d81d63 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -191,6 +193,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22754,7 +22748,7 @@ index ccf4c5c..6d81d63 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +227,6 @@ libdir = @libdir@
+@@ -224,7 +227,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22762,11 +22756,11 @@ index ccf4c5c..6d81d63 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/shapes/Makefile.in b/src/modules_io/shapes/Makefile.in
-index f59764f..8977b96 100644
---- a/src/modules_io/shapes/Makefile.in
-+++ b/src/modules_io/shapes/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/shapes/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/shapes/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/shapes/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22774,7 +22768,7 @@ index f59764f..8977b96 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22782,7 +22776,7 @@ index f59764f..8977b96 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22790,7 +22784,7 @@ index f59764f..8977b96 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22798,11 +22792,11 @@ index f59764f..8977b96 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/shapes/io_shapes/Makefile.in b/src/modules_io/shapes/io_shapes/Makefile.in
-index 34f368e..441153c 100644
---- a/src/modules_io/shapes/io_shapes/Makefile.in
-+++ b/src/modules_io/shapes/io_shapes/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/shapes/io_shapes/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/shapes/io_shapes/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/shapes/io_shapes/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22810,7 +22804,7 @@ index 34f368e..441153c 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22818,7 +22812,7 @@ index 34f368e..441153c 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22826,7 +22820,7 @@ index 34f368e..441153c 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22834,11 +22828,11 @@ index 34f368e..441153c 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/shapes/io_shapes_dxf/Makefile.in b/src/modules_io/shapes/io_shapes_dxf/Makefile.in
-index d117efd..5803ec0 100644
---- a/src/modules_io/shapes/io_shapes_dxf/Makefile.in
-+++ b/src/modules_io/shapes/io_shapes_dxf/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/shapes/io_shapes_dxf/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/shapes/io_shapes_dxf/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/shapes/io_shapes_dxf/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -127,6 +127,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22846,7 +22840,7 @@ index d117efd..5803ec0 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -153,6 +154,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22854,7 +22848,7 @@ index d117efd..5803ec0 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -191,6 +193,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22862,7 +22856,7 @@ index d117efd..5803ec0 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +227,6 @@ libdir = @libdir@
+@@ -224,7 +227,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22870,11 +22864,11 @@ index d117efd..5803ec0 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/shapes/io_shapes_las/Makefile.in b/src/modules_io/shapes/io_shapes_las/Makefile.in
-index 07a4001..a769b3a 100644
---- a/src/modules_io/shapes/io_shapes_las/Makefile.in
-+++ b/src/modules_io/shapes/io_shapes_las/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/shapes/io_shapes_las/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/shapes/io_shapes_las/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/shapes/io_shapes_las/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -130,6 +130,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22882,7 +22876,7 @@ index 07a4001..a769b3a 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -156,6 +157,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22890,7 +22884,7 @@ index 07a4001..a769b3a 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22898,7 +22892,7 @@ index 07a4001..a769b3a 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@ libdir = @libdir@
+@@ -227,7 +230,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22906,11 +22900,11 @@ index 07a4001..a769b3a 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/table/Makefile.in b/src/modules_io/table/Makefile.in
-index 28899dd..73a70a1 100644
---- a/src/modules_io/table/Makefile.in
-+++ b/src/modules_io/table/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/table/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/table/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/table/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22918,7 +22912,7 @@ index 28899dd..73a70a1 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22926,7 +22920,7 @@ index 28899dd..73a70a1 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22934,7 +22928,7 @@ index 28899dd..73a70a1 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22942,11 +22936,11 @@ index 28899dd..73a70a1 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_io/table/io_table/Makefile.in b/src/modules_io/table/io_table/Makefile.in
-index 82a7764..ac25e0e 100644
---- a/src/modules_io/table/io_table/Makefile.in
-+++ b/src/modules_io/table/io_table/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_io/table/io_table/Makefile.in
+===================================================================
+--- saga.orig/src/modules_io/table/io_table/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_io/table/io_table/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -126,6 +126,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22954,7 +22948,7 @@ index 82a7764..ac25e0e 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -152,6 +153,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22962,7 +22956,7 @@ index 82a7764..ac25e0e 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -190,6 +192,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22970,7 +22964,7 @@ index 82a7764..ac25e0e 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@ libdir = @libdir@
+@@ -223,7 +226,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22978,11 +22972,11 @@ index 82a7764..ac25e0e 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_lectures/Makefile.in b/src/modules_lectures/Makefile.in
-index 1290679..4b54dc4 100644
---- a/src/modules_lectures/Makefile.in
-+++ b/src/modules_lectures/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_lectures/Makefile.in
+===================================================================
+--- saga.orig/src/modules_lectures/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_lectures/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22990,7 +22984,7 @@ index 1290679..4b54dc4 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22998,7 +22992,7 @@ index 1290679..4b54dc4 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23006,7 +23000,7 @@ index 1290679..4b54dc4 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23014,11 +23008,11 @@ index 1290679..4b54dc4 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_lectures/lectures/Makefile.in b/src/modules_lectures/lectures/Makefile.in
-index 54cbd37..070d0d6 100644
---- a/src/modules_lectures/lectures/Makefile.in
-+++ b/src/modules_lectures/lectures/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_lectures/lectures/Makefile.in
+===================================================================
+--- saga.orig/src/modules_lectures/lectures/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_lectures/lectures/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23026,7 +23020,7 @@ index 54cbd37..070d0d6 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23034,7 +23028,7 @@ index 54cbd37..070d0d6 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23042,7 +23036,7 @@ index 54cbd37..070d0d6 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23050,11 +23044,11 @@ index 54cbd37..070d0d6 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_lectures/lectures/lectures_introduction/Makefile.in b/src/modules_lectures/lectures/lectures_introduction/Makefile.in
-index 97ce82e..a24bb90 100644
---- a/src/modules_lectures/lectures/lectures_introduction/Makefile.in
-+++ b/src/modules_lectures/lectures/lectures_introduction/Makefile.in
-@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_lectures/lectures/lectures_introduction/Makefile.in
+===================================================================
+--- saga.orig/src/modules_lectures/lectures/lectures_introduction/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_lectures/lectures/lectures_introduction/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -131,6 +131,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23062,7 +23056,7 @@ index 97ce82e..a24bb90 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -157,6 +158,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23070,7 +23064,7 @@ index 97ce82e..a24bb90 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23078,7 +23072,7 @@ index 97ce82e..a24bb90 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@ libdir = @libdir@
+@@ -228,7 +231,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23086,11 +23080,11 @@ index 97ce82e..a24bb90 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_projection/Makefile.in b/src/modules_projection/Makefile.in
-index ed2ec63..4624844 100644
---- a/src/modules_projection/Makefile.in
-+++ b/src/modules_projection/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_projection/Makefile.in
+===================================================================
+--- saga.orig/src/modules_projection/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_projection/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23098,7 +23092,7 @@ index ed2ec63..4624844 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23106,7 +23100,7 @@ index ed2ec63..4624844 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23114,7 +23108,7 @@ index ed2ec63..4624844 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23122,11 +23116,11 @@ index ed2ec63..4624844 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_projection/pj_georeference/Makefile.in b/src/modules_projection/pj_georeference/Makefile.in
-index 1419917..a5344d8 100644
---- a/src/modules_projection/pj_georeference/Makefile.in
-+++ b/src/modules_projection/pj_georeference/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_projection/pj_georeference/Makefile.in
+===================================================================
+--- saga.orig/src/modules_projection/pj_georeference/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_projection/pj_georeference/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23134,7 +23128,7 @@ index 1419917..a5344d8 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23142,7 +23136,7 @@ index 1419917..a5344d8 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23150,7 +23144,7 @@ index 1419917..a5344d8 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23158,11 +23152,11 @@ index 1419917..a5344d8 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_projection/pj_georeference/pj_georeference/Makefile.in b/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
-index 521a7e3..865bcbc 100644
---- a/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
-+++ b/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
+===================================================================
+--- saga.orig/src/modules_projection/pj_georeference/pj_georeference/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_projection/pj_georeference/pj_georeference/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23170,7 +23164,7 @@ index 521a7e3..865bcbc 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23178,7 +23172,7 @@ index 521a7e3..865bcbc 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23186,7 +23180,7 @@ index 521a7e3..865bcbc 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23194,11 +23188,11 @@ index 521a7e3..865bcbc 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_projection/pj_proj4/Makefile.in b/src/modules_projection/pj_proj4/Makefile.in
-index 388a221..6ce2f28 100644
---- a/src/modules_projection/pj_proj4/Makefile.in
-+++ b/src/modules_projection/pj_proj4/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_projection/pj_proj4/Makefile.in
+===================================================================
+--- saga.orig/src/modules_projection/pj_proj4/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_projection/pj_proj4/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23206,7 +23200,7 @@ index 388a221..6ce2f28 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23214,7 +23208,7 @@ index 388a221..6ce2f28 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23222,7 +23216,7 @@ index 388a221..6ce2f28 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23230,11 +23224,11 @@ index 388a221..6ce2f28 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_projection/pj_proj4/pj_proj4/Makefile.in b/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
-index 31d447c..141e57e 100644
---- a/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
-+++ b/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
+===================================================================
+--- saga.orig/src/modules_projection/pj_proj4/pj_proj4/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_projection/pj_proj4/pj_proj4/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23242,7 +23236,7 @@ index 31d447c..141e57e 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23250,7 +23244,7 @@ index 31d447c..141e57e 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23258,7 +23252,7 @@ index 31d447c..141e57e 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23266,11 +23260,11 @@ index 31d447c..141e57e 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_recreations/Makefile.in b/src/modules_recreations/Makefile.in
-index 25cb450..6fecd77 100644
---- a/src/modules_recreations/Makefile.in
-+++ b/src/modules_recreations/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_recreations/Makefile.in
+===================================================================
+--- saga.orig/src/modules_recreations/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_recreations/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23278,7 +23272,7 @@ index 25cb450..6fecd77 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23286,7 +23280,7 @@ index 25cb450..6fecd77 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23294,7 +23288,7 @@ index 25cb450..6fecd77 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23302,11 +23296,11 @@ index 25cb450..6fecd77 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_recreations/recreations/Makefile.in b/src/modules_recreations/recreations/Makefile.in
-index 176aa98..0f1c370 100644
---- a/src/modules_recreations/recreations/Makefile.in
-+++ b/src/modules_recreations/recreations/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_recreations/recreations/Makefile.in
+===================================================================
+--- saga.orig/src/modules_recreations/recreations/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_recreations/recreations/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23314,7 +23308,7 @@ index 176aa98..0f1c370 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23322,7 +23316,7 @@ index 176aa98..0f1c370 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23330,7 +23324,7 @@ index 176aa98..0f1c370 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23338,11 +23332,11 @@ index 176aa98..0f1c370 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_recreations/recreations/recreations_fractals/Makefile.in b/src/modules_recreations/recreations/recreations_fractals/Makefile.in
-index cfd6d6e..f7ce3c6 100644
---- a/src/modules_recreations/recreations/recreations_fractals/Makefile.in
-+++ b/src/modules_recreations/recreations/recreations_fractals/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_recreations/recreations/recreations_fractals/Makefile.in
+===================================================================
+--- saga.orig/src/modules_recreations/recreations/recreations_fractals/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_recreations/recreations/recreations_fractals/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23350,7 +23344,7 @@ index cfd6d6e..f7ce3c6 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23358,7 +23352,7 @@ index cfd6d6e..f7ce3c6 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23366,7 +23360,7 @@ index cfd6d6e..f7ce3c6 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23374,11 +23368,11 @@ index cfd6d6e..f7ce3c6 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_recreations/recreations/recreations_games/Makefile.in b/src/modules_recreations/recreations/recreations_games/Makefile.in
-index 4f5c84c..7c2ab19 100644
---- a/src/modules_recreations/recreations/recreations_games/Makefile.in
-+++ b/src/modules_recreations/recreations/recreations_games/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_recreations/recreations/recreations_games/Makefile.in
+===================================================================
+--- saga.orig/src/modules_recreations/recreations/recreations_games/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_recreations/recreations/recreations_games/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23386,7 +23380,7 @@ index 4f5c84c..7c2ab19 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23394,7 +23388,7 @@ index 4f5c84c..7c2ab19 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23402,7 +23396,7 @@ index 4f5c84c..7c2ab19 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23410,11 +23404,11 @@ index 4f5c84c..7c2ab19 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_simulation/Makefile.in b/src/modules_simulation/Makefile.in
-index 7f211a9..4019dfc 100644
---- a/src/modules_simulation/Makefile.in
-+++ b/src/modules_simulation/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_simulation/Makefile.in
+===================================================================
+--- saga.orig/src/modules_simulation/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_simulation/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23422,7 +23416,7 @@ index 7f211a9..4019dfc 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23430,7 +23424,7 @@ index 7f211a9..4019dfc 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23438,7 +23432,7 @@ index 7f211a9..4019dfc 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23446,7 +23440,7 @@ index 7f211a9..4019dfc 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -231,7 +233,7 @@ target_alias = @target_alias@
+@@ -231,7 +233,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -23455,11 +23449,11 @@ index 7f211a9..4019dfc 100644
all: all-recursive
.SUFFIXES:
-diff --git a/src/modules_simulation/cellular_automata/Makefile.in b/src/modules_simulation/cellular_automata/Makefile.in
-index fa3cce8..22350c7 100644
---- a/src/modules_simulation/cellular_automata/Makefile.in
-+++ b/src/modules_simulation/cellular_automata/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_simulation/cellular_automata/Makefile.in
+===================================================================
+--- saga.orig/src/modules_simulation/cellular_automata/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_simulation/cellular_automata/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23467,7 +23461,7 @@ index fa3cce8..22350c7 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23475,7 +23469,7 @@ index fa3cce8..22350c7 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23483,7 +23477,7 @@ index fa3cce8..22350c7 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23491,11 +23485,11 @@ index fa3cce8..22350c7 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in b/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in
-index e10538c..e94ffba 100644
---- a/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in
-+++ b/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in
+===================================================================
+--- saga.orig/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23503,7 +23497,7 @@ index e10538c..e94ffba 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23511,7 +23505,7 @@ index e10538c..e94ffba 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23519,7 +23513,7 @@ index e10538c..e94ffba 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23527,11 +23521,11 @@ index e10538c..e94ffba 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_simulation/ecosystems/Makefile.in b/src/modules_simulation/ecosystems/Makefile.in
-index fed2a81..d9b2777 100644
---- a/src/modules_simulation/ecosystems/Makefile.in
-+++ b/src/modules_simulation/ecosystems/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_simulation/ecosystems/Makefile.in
+===================================================================
+--- saga.orig/src/modules_simulation/ecosystems/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_simulation/ecosystems/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23539,7 +23533,7 @@ index fed2a81..d9b2777 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23547,7 +23541,7 @@ index fed2a81..d9b2777 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23555,7 +23549,7 @@ index fed2a81..d9b2777 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23563,11 +23557,11 @@ index fed2a81..d9b2777 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in b/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
-index 1f8c1f1..0dc6ea0 100644
---- a/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
-+++ b/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
+===================================================================
+--- saga.orig/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23575,7 +23569,7 @@ index 1f8c1f1..0dc6ea0 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23583,7 +23577,7 @@ index 1f8c1f1..0dc6ea0 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23591,7 +23585,7 @@ index 1f8c1f1..0dc6ea0 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23599,11 +23593,11 @@ index 1f8c1f1..0dc6ea0 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_simulation/hydrology/Makefile.in b/src/modules_simulation/hydrology/Makefile.in
-index 5899588..5cf6376 100644
---- a/src/modules_simulation/hydrology/Makefile.in
-+++ b/src/modules_simulation/hydrology/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_simulation/hydrology/Makefile.in
+===================================================================
+--- saga.orig/src/modules_simulation/hydrology/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_simulation/hydrology/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23611,7 +23605,7 @@ index 5899588..5cf6376 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23619,7 +23613,7 @@ index 5899588..5cf6376 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23627,7 +23621,7 @@ index 5899588..5cf6376 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23635,11 +23629,11 @@ index 5899588..5cf6376 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_simulation/hydrology/sim_hydrology/Makefile.in b/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
-index f83a80e..a64b96b 100644
---- a/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
-+++ b/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
+===================================================================
+--- saga.orig/src/modules_simulation/hydrology/sim_hydrology/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_simulation/hydrology/sim_hydrology/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23647,7 +23641,7 @@ index f83a80e..a64b96b 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23655,7 +23649,7 @@ index f83a80e..a64b96b 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23663,7 +23657,7 @@ index f83a80e..a64b96b 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23671,11 +23665,11 @@ index f83a80e..a64b96b 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_terrain_analysis/Makefile.in b/src/modules_terrain_analysis/Makefile.in
-index 7bdd704..bc9ccdd 100644
---- a/src/modules_terrain_analysis/Makefile.in
-+++ b/src/modules_terrain_analysis/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_terrain_analysis/Makefile.in
+===================================================================
+--- saga.orig/src/modules_terrain_analysis/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_terrain_analysis/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23683,7 +23677,7 @@ index 7bdd704..bc9ccdd 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23691,7 +23685,7 @@ index 7bdd704..bc9ccdd 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23699,7 +23693,7 @@ index 7bdd704..bc9ccdd 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23707,11 +23701,11 @@ index 7bdd704..bc9ccdd 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_terrain_analysis/terrain_analysis/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/Makefile.in
-index 47c2824..1459546 100644
---- a/src/modules_terrain_analysis/terrain_analysis/Makefile.in
-+++ b/src/modules_terrain_analysis/terrain_analysis/Makefile.in
-@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_terrain_analysis/terrain_analysis/Makefile.in
+===================================================================
+--- saga.orig/src/modules_terrain_analysis/terrain_analysis/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_terrain_analysis/terrain_analysis/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -114,6 +114,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23719,7 +23713,7 @@ index 47c2824..1459546 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -140,6 +141,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23727,7 +23721,7 @@ index 47c2824..1459546 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23735,7 +23729,7 @@ index 47c2824..1459546 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23743,11 +23737,11 @@ index 47c2824..1459546 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in
-index 31ab482..6c00577 100644
---- a/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in
-+++ b/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in
+===================================================================
+--- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23755,7 +23749,7 @@ index 31ab482..6c00577 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23763,7 +23757,7 @@ index 31ab482..6c00577 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23771,7 +23765,7 @@ index 31ab482..6c00577 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23779,11 +23773,11 @@ index 31ab482..6c00577 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in
-index 563b4f1..dfd3353 100644
---- a/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in
-+++ b/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in
+===================================================================
+--- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -126,6 +126,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23791,7 +23785,7 @@ index 563b4f1..dfd3353 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -152,6 +153,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23799,7 +23793,7 @@ index 563b4f1..dfd3353 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -190,6 +192,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23807,7 +23801,7 @@ index 563b4f1..dfd3353 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@ libdir = @libdir@
+@@ -223,7 +226,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23815,11 +23809,11 @@ index 563b4f1..dfd3353 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in
-index 19b3053..16b9686 100644
---- a/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in
-+++ b/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in
-@@ -133,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in
+===================================================================
+--- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -133,6 +133,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23827,7 +23821,7 @@ index 19b3053..16b9686 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -159,6 +160,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -159,6 +160,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23835,7 +23829,7 @@ index 19b3053..16b9686 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -197,6 +199,7 @@ abs_builddir = @abs_builddir@
+@@ -197,6 +199,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23843,7 +23837,7 @@ index 19b3053..16b9686 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -230,7 +233,6 @@ libdir = @libdir@
+@@ -230,7 +233,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23851,11 +23845,11 @@ index 19b3053..16b9686 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in
-index f992c7c..8a00bc8 100644
---- a/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in
-+++ b/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in
+===================================================================
+--- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -128,6 +128,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23863,7 +23857,7 @@ index f992c7c..8a00bc8 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -154,6 +155,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23871,7 +23865,7 @@ index f992c7c..8a00bc8 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23879,7 +23873,7 @@ index f992c7c..8a00bc8 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23887,11 +23881,11 @@ index f992c7c..8a00bc8 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in
-index ede76f8..b866be0 100644
---- a/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in
-+++ b/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in
-@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in
+===================================================================
+--- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -132,6 +132,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23899,7 +23893,7 @@ index ede76f8..b866be0 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -158,6 +159,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23907,7 +23901,7 @@ index ede76f8..b866be0 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23915,7 +23909,7 @@ index ede76f8..b866be0 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@ libdir = @libdir@
+@@ -229,7 +232,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23923,11 +23917,11 @@ index ede76f8..b866be0 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in
-index a047620..ecf02ea 100644
---- a/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in
-+++ b/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in
+===================================================================
+--- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23935,7 +23929,7 @@ index a047620..ecf02ea 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23943,7 +23937,7 @@ index a047620..ecf02ea 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23951,7 +23945,7 @@ index a047620..ecf02ea 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23959,11 +23953,11 @@ index a047620..ecf02ea 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in
-index b973291..34ca556 100644
---- a/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in
-+++ b/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in
+===================================================================
+--- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23971,7 +23965,7 @@ index b973291..34ca556 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23979,7 +23973,7 @@ index b973291..34ca556 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23987,7 +23981,7 @@ index b973291..34ca556 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23995,11 +23989,11 @@ index b973291..34ca556 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/saga_core/Makefile.in b/src/saga_core/Makefile.in
-index 092bbe1..14d309e 100644
---- a/src/saga_core/Makefile.in
-+++ b/src/saga_core/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/saga_core/Makefile.in
+===================================================================
+--- saga.orig/src/saga_core/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/saga_core/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -113,6 +113,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24007,7 +24001,7 @@ index 092bbe1..14d309e 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -139,6 +140,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -139,6 +140,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24015,7 +24009,7 @@ index 092bbe1..14d309e 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -177,6 +179,7 @@ abs_builddir = @abs_builddir@
+@@ -177,6 +179,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24023,7 +24017,7 @@ index 092bbe1..14d309e 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -210,7 +213,6 @@ libdir = @libdir@
+@@ -210,7 +213,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24031,11 +24025,11 @@ index 092bbe1..14d309e 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/saga_core/saga_api/Makefile.in b/src/saga_core/saga_api/Makefile.in
-index 4088b2c..6dcf5c1 100644
---- a/src/saga_core/saga_api/Makefile.in
-+++ b/src/saga_core/saga_api/Makefile.in
-@@ -155,6 +155,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/saga_core/saga_api/Makefile.in
+===================================================================
+--- saga.orig/src/saga_core/saga_api/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/saga_core/saga_api/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -155,6 +155,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24043,7 +24037,7 @@ index 4088b2c..6dcf5c1 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -181,6 +182,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -181,6 +182,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24051,7 +24045,7 @@ index 4088b2c..6dcf5c1 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -219,6 +221,7 @@ abs_builddir = @abs_builddir@
+@@ -219,6 +221,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24059,7 +24053,7 @@ index 4088b2c..6dcf5c1 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -252,7 +255,6 @@ libdir = @libdir@
+@@ -252,7 +255,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24067,11 +24061,11 @@ index 4088b2c..6dcf5c1 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/saga_core/saga_cmd/Makefile.in b/src/saga_core/saga_cmd/Makefile.in
-index 7e8b37d..a40cd3d 100644
---- a/src/saga_core/saga_cmd/Makefile.in
-+++ b/src/saga_core/saga_cmd/Makefile.in
-@@ -144,6 +144,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/saga_core/saga_cmd/Makefile.in
+===================================================================
+--- saga.orig/src/saga_core/saga_cmd/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/saga_core/saga_cmd/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -144,6 +144,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24079,7 +24073,7 @@ index 7e8b37d..a40cd3d 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -170,6 +171,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -170,6 +171,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24087,7 +24081,7 @@ index 7e8b37d..a40cd3d 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -208,6 +210,7 @@ abs_builddir = @abs_builddir@
+@@ -208,6 +210,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24095,7 +24089,7 @@ index 7e8b37d..a40cd3d 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -241,7 +244,6 @@ libdir = @libdir@
+@@ -241,7 +244,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24103,11 +24097,11 @@ index 7e8b37d..a40cd3d 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/saga_core/saga_cmd/man/Makefile.in b/src/saga_core/saga_cmd/man/Makefile.in
-index fc3415f..46fd8d8 100644
---- a/src/saga_core/saga_cmd/man/Makefile.in
-+++ b/src/saga_core/saga_cmd/man/Makefile.in
-@@ -100,6 +100,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/saga_core/saga_cmd/man/Makefile.in
+===================================================================
+--- saga.orig/src/saga_core/saga_cmd/man/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/saga_core/saga_cmd/man/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -100,6 +100,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24115,7 +24109,7 @@ index fc3415f..46fd8d8 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -126,6 +127,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -126,6 +127,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24123,7 +24117,7 @@ index fc3415f..46fd8d8 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -164,6 +166,7 @@ abs_builddir = @abs_builddir@
+@@ -164,6 +166,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24131,7 +24125,7 @@ index fc3415f..46fd8d8 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -197,7 +200,6 @@ libdir = @libdir@
+@@ -197,7 +200,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24139,11 +24133,11 @@ index fc3415f..46fd8d8 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/saga_core/saga_gdi/Makefile.in b/src/saga_core/saga_gdi/Makefile.in
-index 8686452..5c84df9 100644
---- a/src/saga_core/saga_gdi/Makefile.in
-+++ b/src/saga_core/saga_gdi/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/saga_core/saga_gdi/Makefile.in
+===================================================================
+--- saga.orig/src/saga_core/saga_gdi/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/saga_core/saga_gdi/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -130,6 +130,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24151,7 +24145,7 @@ index 8686452..5c84df9 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -156,6 +157,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24159,7 +24153,7 @@ index 8686452..5c84df9 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24167,7 +24161,7 @@ index 8686452..5c84df9 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@ libdir = @libdir@
+@@ -227,7 +230,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24175,11 +24169,11 @@ index 8686452..5c84df9 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/saga_core/saga_gui/Makefile.in b/src/saga_core/saga_gui/Makefile.in
-index d97e798..bfc2f6c 100644
---- a/src/saga_core/saga_gui/Makefile.in
-+++ b/src/saga_core/saga_gui/Makefile.in
-@@ -191,6 +191,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/saga_core/saga_gui/Makefile.in
+===================================================================
+--- saga.orig/src/saga_core/saga_gui/Makefile.in 2012-01-09 14:09:39.000000000 +0100
++++ saga/src/saga_core/saga_gui/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -191,6 +191,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24187,7 +24181,7 @@ index d97e798..bfc2f6c 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -217,6 +218,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -217,6 +218,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24195,7 +24189,7 @@ index d97e798..bfc2f6c 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -255,6 +257,7 @@ abs_builddir = @abs_builddir@
+@@ -255,6 +257,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24203,7 +24197,7 @@ index d97e798..bfc2f6c 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -288,7 +291,6 @@ libdir = @libdir@
+@@ -288,7 +291,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24211,11 +24205,11 @@ index d97e798..bfc2f6c 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/saga_core/saga_gui/man/Makefile.in b/src/saga_core/saga_gui/man/Makefile.in
-index d879530..f1a277b 100644
---- a/src/saga_core/saga_gui/man/Makefile.in
-+++ b/src/saga_core/saga_gui/man/Makefile.in
-@@ -100,6 +100,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/saga_core/saga_gui/man/Makefile.in
+===================================================================
+--- saga.orig/src/saga_core/saga_gui/man/Makefile.in 2012-01-09 14:09:39.000000000 +0100
++++ saga/src/saga_core/saga_gui/man/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -100,6 +100,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24223,7 +24217,7 @@ index d879530..f1a277b 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -126,6 +127,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -126,6 +127,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24231,7 +24225,7 @@ index d879530..f1a277b 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -164,6 +166,7 @@ abs_builddir = @abs_builddir@
+@@ -164,6 +166,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24239,7 +24233,7 @@ index d879530..f1a277b 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -197,7 +200,6 @@ libdir = @libdir@
+@@ -197,7 +200,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24247,11 +24241,11 @@ index d879530..f1a277b 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff --git a/src/saga_core/saga_odbc/Makefile.in b/src/saga_core/saga_odbc/Makefile.in
-index a2f0fe1..9507937 100644
---- a/src/saga_core/saga_odbc/Makefile.in
-+++ b/src/saga_core/saga_odbc/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+Index: saga/src/saga_core/saga_odbc/Makefile.in
+===================================================================
+--- saga.orig/src/saga_core/saga_odbc/Makefile.in 2012-01-09 14:09:38.000000000 +0100
++++ saga/src/saga_core/saga_odbc/Makefile.in 2012-01-09 14:10:07.000000000 +0100
+@@ -129,6 +129,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24259,7 +24253,7 @@ index a2f0fe1..9507937 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+@@ -155,6 +156,7 @@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24267,7 +24261,7 @@ index a2f0fe1..9507937 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24275,7 +24269,7 @@ index a2f0fe1..9507937 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@ libdir = @libdir@
+@@ -226,7 +229,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24283,4 +24277,3 @@ index a2f0fe1..9507937 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
---
--
Saga GIS
More information about the Pkg-grass-devel
mailing list