[SCM] saga branch, master, updated. 6f0f46531243365ca20a43a0d28d704a7ec9809c
Johan Van de Wauw
johan.vandewauw at gmail.com
Mon Dec 12 20:35:53 UTC 2011
The following commit has been merged in the master branch:
commit 9b02d354644631086f1e1f55a522d99251135809
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date: Tue Dec 11 21:14:10 2012 -0500
Update patches for 2.0.8
diff --git a/debian/patches/0002-Remove-references-to-libfire.patch b/debian/patches/0002-Remove-references-to-libfire.patch
index 10a255a..212e5c2 100644
--- a/debian/patches/0002-Remove-references-to-libfire.patch
+++ b/debian/patches/0002-Remove-references-to-libfire.patch
@@ -8,10 +8,10 @@ Subject: Remove references to libfire
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/configure.in b/configure.in
-index f4fa495..5b0a363 100755
+index 39bb709..bfab6be 100755
--- a/configure.in
+++ b/configure.in
-@@ -205,8 +205,6 @@ AC_OUTPUT(Makefile \
+@@ -261,8 +261,6 @@ AC_OUTPUT(Makefile \
src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile \
src/modules_simulation/ecosystems/Makefile \
src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile \
diff --git a/debian/patches/0003-Use-debian-version-of-grib2.patch b/debian/patches/0003-Use-debian-version-of-grib2.patch
index 01c4012..ffe5c9c 100644
--- a/debian/patches/0003-Use-debian-version-of-grib2.patch
+++ b/debian/patches/0003-Use-debian-version-of-grib2.patch
@@ -3,19 +3,15 @@ Date: Wed, 15 Jun 2011 14:31:19 -0400
Subject: Use debian version of grib2
---
- src/modules_io/grid/io_grid_grib2/Makefile.am | 50 +------------------------
- 1 files changed, 1 insertions(+), 49 deletions(-)
+ src/modules_io/grid/io_grid_grib2/Makefile.am | 48 -------------------------
+ 1 files changed, 0 insertions(+), 48 deletions(-)
diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.am b/src/modules_io/grid/io_grid_grib2/Makefile.am
-index 89da77c..2f8d525 100644
+index 7a2c840..3d6b3f7 100644
--- a/src/modules_io/grid/io_grid_grib2/Makefile.am
+++ b/src/modules_io/grid/io_grid_grib2/Makefile.am
-@@ -11,57 +11,9 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG200
- CXX_INCS = -I$(top_srcdir)/src/saga_core
- AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
- #AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper
--AM_LDFLAGS = -fPIC -shared -avoid-version -ljasper
-+AM_LDFLAGS = -fPIC -shared -avoid-version -lgrib2c -ljasper
+@@ -14,54 +14,6 @@ AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
+ AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
pkglib_LTLIBRARIES = libio_grid_grib2.la
libio_grid_grib2_la_SOURCES =\
-./g2clib-1.0.4/cmplxpack.c\
diff --git a/debian/patches/0006-Use-debian-version-of-grib2.patch b/debian/patches/0004-Use-debian-version-of-grib2.patch
similarity index 100%
copy from debian/patches/0006-Use-debian-version-of-grib2.patch
copy to debian/patches/0004-Use-debian-version-of-grib2.patch
diff --git a/debian/patches/0004-Run-autoreconf-fi.patch b/debian/patches/0005-autoreconf-fi.patch
similarity index 87%
copy from debian/patches/0004-Run-autoreconf-fi.patch
copy to debian/patches/0005-autoreconf-fi.patch
index b0c028e..2ac0061 100644
--- a/debian/patches/0004-Run-autoreconf-fi.patch
+++ b/debian/patches/0005-autoreconf-fi.patch
@@ -1,16 +1,14 @@
From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Wed, 15 Jun 2011 14:52:31 -0400
-Subject: Run autoreconf -fi
+Date: Tue, 11 Dec 2012 20:46:23 -0500
+Subject: autoreconf -fi
---
Makefile.in | 4 +-
aclocal.m4 | 4 +-
- config.guess | 360 +-
- config.sub | 181 +-
- configure | 4609 +++++++++++---------
- ltmain.sh | 3967 +++++++++++------
- m4/libtool.m4 | 1996 ++++++----
- m4/ltoptions.m4 | 13 +-
+ configure | 4786 +++++++++++---------
+ ltmain.sh | 4016 +++++++++++------
+ m4/libtool.m4 | 2236 ++++++----
+ m4/ltoptions.m4 | 32 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 12 +-
src/Makefile.in | 4 +-
@@ -47,6 +45,7 @@ Subject: Run autoreconf -fi
.../contrib_s_liersch/ihacres/Makefile.in | 4 +-
src/modules_contrib/garden/Makefile.in | 4 +-
.../garden/garden_3d_viewer/Makefile.in | 4 +-
+ .../garden/garden_webservices/Makefile.in | 4 +-
src/modules_geostatistics/Makefile.in | 4 +-
.../geostatistics/Makefile.in | 4 +-
.../geostatistics/geostatistics_grid/Makefile.in | 4 +-
@@ -77,7 +76,7 @@ Subject: Run autoreconf -fi
src/modules_io/gps/io_gps/Makefile.in | 4 +-
src/modules_io/grid/Makefile.in | 4 +-
src/modules_io/grid/io_grid/Makefile.in | 4 +-
- src/modules_io/grid/io_grid_grib2/Makefile.in | 459 +--
+ src/modules_io/grid/io_grid_grib2/Makefile.in | 457 +--
src/modules_io/grid/io_grid_image/Makefile.in | 4 +-
src/modules_io/shapes/Makefile.in | 4 +-
src/modules_io/shapes/io_shapes/Makefile.in | 4 +-
@@ -107,6 +106,7 @@ Subject: Run autoreconf -fi
src/modules_terrain_analysis/Makefile.in | 4 +-
.../terrain_analysis/Makefile.in | 4 +-
.../terrain_analysis/ta_channels/Makefile.in | 4 +-
+ .../terrain_analysis/ta_compound/Makefile.in | 4 +-
.../terrain_analysis/ta_hydrology/Makefile.in | 4 +-
.../terrain_analysis/ta_lighting/Makefile.in | 4 +-
.../terrain_analysis/ta_morphometry/Makefile.in | 4 +-
@@ -120,13 +120,14 @@ Subject: Run autoreconf -fi
src/saga_core/saga_gui/Makefile.in | 4 +-
src/saga_core/saga_gui/man/Makefile.in | 4 +-
src/saga_core/saga_odbc/Makefile.in | 4 +-
- 117 files changed, 7131 insertions(+), 4926 deletions(-)
+ 117 files changed, 7196 insertions(+), 4811 deletions(-)
+ mode change 100755 => 100644 ltmain.sh
diff --git a/Makefile.in b/Makefile.in
-index 6140a33..c53ed22 100644
+index 8200f70..17b99b6 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -134,15 +135,15 @@ index 6140a33..c53ed22 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -150,7 +151,7 @@ index 6140a33..c53ed22 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@
+@@ -227,7 +230,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -173,1126 +174,15 @@ 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/config.guess b/config.guess
-index e3a2116..40eaed4 100755
---- a/config.guess
-+++ b/config.guess
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
--# Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011 Free Software Foundation, Inc.
-
--timestamp='2009-06-10'
-+timestamp='2011-05-11'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -27,16 +27,16 @@ timestamp='2009-06-10'
- # the same distribution terms that you use for the rest of that program.
-
-
--# Originally written by Per Bothner <per at bothner.com>.
--# Please send patches to <config-patches at gnu.org>. Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Originally written by Per Bothner. Please send patches (context
-+# diff format) to <config-patches at gnu.org> and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub. If it succeeds, it prints the system name on stdout, and
- # exits with 0. Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
- me=`echo "$0" | sed -e 's,.*/,,'`
-
-@@ -56,8 +56,9 @@ version="\
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-+Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -180,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- fi
- ;;
- *)
-- os=netbsd
-+ os=netbsd
- ;;
- esac
- # The OS release
-@@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
-- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- exit ;;
-+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-+ exitcode=$?
-+ trap '' 0
-+ exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
-@@ -295,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
-- echo powerpc-ibm-os400
-+ echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
-@@ -333,6 +337,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+ echo i386-pc-auroraux${UNAME_RELEASE}
-+ exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
-@@ -391,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit ;;
-+ exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-- echo m68k-milan-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-- echo m68k-hades-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-- echo m68k-unknown-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
-@@ -477,8 +484,8 @@ EOF
- echo m88k-motorola-sysv3
- exit ;;
- AViiON:dgux:*:*)
-- # DG/UX returns AViiON for all architectures
-- UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ # DG/UX returns AViiON for all architectures
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -491,7 +498,7 @@ EOF
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
-- exit ;;
-+ exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
-@@ -548,7 +555,7 @@ EOF
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[456])
-+ *:AIX:*:[4567])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
-@@ -591,52 +598,52 @@ EOF
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-- case "${sc_cpu_version}" in
-- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-- 532) # CPU_PA_RISC2_0
-- case "${sc_kernel_bits}" in
-- 32) HP_ARCH="hppa2.0n" ;;
-- 64) HP_ARCH="hppa2.0w" ;;
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-- esac ;;
-- esac
-+ esac ;;
-+ esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ sed 's/^ //' << EOF >$dummy.c
-
-- #define _HPUX_SOURCE
-- #include <stdlib.h>
-- #include <unistd.h>
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-
-- int main ()
-- {
-- #if defined(_SC_KERNEL_BITS)
-- long bits = sysconf(_SC_KERNEL_BITS);
-- #endif
-- long cpu = sysconf (_SC_CPU_VERSION);
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-
-- switch (cpu)
-- {
-- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-- case CPU_PA_RISC2_0:
-- #if defined(_SC_KERNEL_BITS)
-- switch (bits)
-- {
-- case 64: puts ("hppa2.0w"); break;
-- case 32: puts ("hppa2.0n"); break;
-- default: puts ("hppa2.0"); break;
-- } break;
-- #else /* !defined(_SC_KERNEL_BITS) */
-- puts ("hppa2.0"); break;
-- #endif
-- default: puts ("hppa1.0"); break;
-- }
-- exit (0);
-- }
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
- EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -727,22 +734,22 @@ EOF
- exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
-- exit ;;
-+ exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
-- exit ;;
-+ exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
-- exit ;;
-+ exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
-- exit ;;
-+ exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
-- exit ;;
-+ exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
-@@ -766,14 +773,14 @@ EOF
- exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-- exit ;;
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit ;;
- 5000:UNIX_System_V:4.*:*)
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -801,18 +808,18 @@ EOF
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
-- # uname -m includes "-pc" on this system.
-- echo ${UNAME_MACHINE}-mingw32
-+ # uname -m includes "-pc" on this system.
-+ echo ${UNAME_MACHINE}-mingw32
- exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- *:Interix*:[3456]*)
-- case ${UNAME_MACHINE} in
-+ *:Interix*:*)
-+ case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-- EM64T | authenticamd | genuineintel)
-+ authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
-@@ -854,6 +861,20 @@ EOF
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
-+ alpha:Linux:*:*)
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ exit ;;
- arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-@@ -861,7 +882,13 @@ EOF
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
-- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep -q __ARM_PCS_VFP
-+ then
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+ fi
- fi
- exit ;;
- avr32*:Linux:*:*)
-@@ -874,7 +901,18 @@ EOF
- echo crisv32-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
-- echo frv-unknown-linux-gnu
-+ echo frv-unknown-linux-gnu
-+ exit ;;
-+ i*86:Linux:*:*)
-+ LIBC=gnu
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -901,39 +939,18 @@ EOF
- #endif
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
- echo or32-unknown-linux-gnu
- exit ;;
-- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-gnu
-- exit ;;
-- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-gnu
-- exit ;;
-- alpha:Linux:*:*)
-- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-- EV5) UNAME_MACHINE=alphaev5 ;;
-- EV56) UNAME_MACHINE=alphaev56 ;;
-- PCA56) UNAME_MACHINE=alphapca56 ;;
-- PCA57) UNAME_MACHINE=alphapca56 ;;
-- EV6) UNAME_MACHINE=alphaev6 ;;
-- EV67) UNAME_MACHINE=alphaev67 ;;
-- EV68*) UNAME_MACHINE=alphaev68 ;;
-- esac
-- objdump --private-headers /bin/sh | grep -q ld.so.1
-- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-- exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
- exit ;;
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
-+ exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -942,14 +959,17 @@ EOF
- *) echo hppa-unknown-linux-gnu ;;
- esac
- exit ;;
-- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-unknown-linux-gnu
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
-+ exit ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
- sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -957,6 +977,9 @@ EOF
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ tile*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-tilera-linux-gnu
-+ exit ;;
- vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
-@@ -964,60 +987,8 @@ EOF
- echo x86_64-unknown-linux-gnu
- exit ;;
- xtensa*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- i*86:Linux:*:*)
-- # The BFD linker knows what the default object file format is, so
-- # first see if it will tell us. cd to the root directory to prevent
-- # problems with other programs or directories called `ld' in the path.
-- # Set LC_ALL=C to ensure ld outputs messages in English.
-- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-- | sed -ne '/supported targets:/!d
-- s/[ ][ ]*/ /g
-- s/.*supported targets: *//
-- s/ .*//
-- p'`
-- case "$ld_supported_targets" in
-- elf32-i386)
-- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-- ;;
-- esac
-- # Determine whether the default compiler is a.out or elf
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #include <features.h>
-- #ifdef __ELF__
-- # ifdef __GLIBC__
-- # if __GLIBC__ >= 2
-- LIBC=gnu
-- # else
-- LIBC=gnulibc1
-- # endif
-- # else
-- LIBC=gnulibc1
-- # endif
-- #else
-- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-- LIBC=gnu
-- #else
-- LIBC=gnuaout
-- #endif
-- #endif
-- #ifdef __dietlibc__
-- LIBC=dietlibc
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^LIBC/{
-- s: ::g
-- p
-- }'`"
-- test x"${LIBC}" != x && {
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-- exit
-- }
-- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-- ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- # earlier versions are messed up and put the nodename in both
-@@ -1025,11 +996,11 @@ EOF
- echo i386-sequent-sysv4
- exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
-- # Unixware is an offshoot of SVR4, but it has its own version
-- # number series starting with 2...
-- # I am not positive that other SVR4 systems won't match this,
-+ # Unixware is an offshoot of SVR4, but it has its own version
-+ # number series starting with 2...
-+ # I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
-- # Use sysv4.2uw... so that sysv4* matches it.
-+ # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit ;;
- i*86:OS/2:*:*)
-@@ -1061,7 +1032,7 @@ EOF
- fi
- exit ;;
- i*86:*:5:[678]*)
-- # UnixWare 7.x, OpenUNIX and OpenServer 6.
-+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
-@@ -1089,13 +1060,13 @@ EOF
- exit ;;
- pc:*:*:*)
- # Left here for compatibility:
-- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-- # the processor, so we play safe by assuming i586.
-+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+ # the processor, so we play safe by assuming i586.
- # Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
- # this is a cross-build.
- echo i586-pc-msdosdjgpp
-- exit ;;
-+ exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
-@@ -1130,8 +1101,8 @@ EOF
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-- && { echo i486-ncr-sysv4; exit; } ;;
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4; exit; } ;;
- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- OS_REL='.3'
- test -r /etc/.relid \
-@@ -1174,10 +1145,10 @@ EOF
- echo ns32k-sni-sysv
- fi
- exit ;;
-- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-- # says <Richard.M.Bartel at ccMail.Census.GOV>
-- echo i586-unisys-sysv4
-- exit ;;
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says <Richard.M.Bartel at ccMail.Census.GOV>
-+ echo i586-unisys-sysv4
-+ exit ;;
- *:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes <hewes at openmarket.com>.
- # How about differentiating between stratus architectures? -djm
-@@ -1203,11 +1174,11 @@ EOF
- exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
-- echo mips-nec-sysv${UNAME_RELEASE}
-+ echo mips-nec-sysv${UNAME_RELEASE}
- else
-- echo mips-unknown-sysv${UNAME_RELEASE}
-+ echo mips-unknown-sysv${UNAME_RELEASE}
- fi
-- exit ;;
-+ exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
-@@ -1247,6 +1218,16 @@ EOF
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
-+ i386)
-+ eval $set_cc_for_build
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ UNAME_PROCESSOR="x86_64"
-+ fi
-+ fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1262,6 +1243,9 @@ EOF
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
-+ NEO-?:NONSTOP_KERNEL:*:*)
-+ echo neo-tandem-nsk${UNAME_RELEASE}
-+ exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
-@@ -1307,13 +1291,13 @@ EOF
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
-- echo mips-sei-seiux${UNAME_RELEASE}
-+ echo mips-sei-seiux${UNAME_RELEASE}
- exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit ;;
- *:*VMS:*:*)
-- UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
-@@ -1353,11 +1337,11 @@ main ()
- #include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
- #ifdef NEWSOS4
-- "4"
-+ "4"
- #else
-- ""
-+ ""
- #endif
-- ); exit (0);
-+ ); exit (0);
- #endif
- #endif
-
-diff --git a/config.sub b/config.sub
-index eb0389a..30fdca8 100755
---- a/config.sub
-+++ b/config.sub
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
--# Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011 Free Software Foundation, Inc.
-
--timestamp='2009-06-11'
-+timestamp='2011-03-23'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -32,13 +32,16 @@ timestamp='2009-06-11'
-
-
- # Please send patches to <config-patches at gnu.org>. Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# diff and a properly formatted GNU ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
-
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches at gnu.org>."
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-+Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -120,8 +124,9 @@ esac
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+ knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -149,12 +154,12 @@ case $os in
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-- -apple | -axis | -knuth | -cray)
-+ -apple | -axis | -knuth | -cray | -microblaze)
- os=
- basic_machine=$1
- ;;
-- -bluegene*)
-- os=-cnk
-+ -bluegene*)
-+ os=-cnk
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
-@@ -170,10 +175,10 @@ case $os in
- os=-chorusos
- basic_machine=$1
- ;;
-- -chorusrdb)
-- os=-chorusrdb
-+ -chorusrdb)
-+ os=-chorusrdb
- basic_machine=$1
-- ;;
-+ ;;
- -hiux*)
- os=-hiuxwe2
- ;;
-@@ -278,26 +283,39 @@ case $basic_machine in
- | moxie \
- | mt \
- | msp430 \
-+ | nds32 | nds32le | nds32be \
- | nios | nios2 \
- | ns16k | ns32k \
-+ | open8 \
- | or32 \
- | pdp10 | pdp11 | pj | pjl \
-- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
-+ | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-- | spu | strongarm \
-- | tahoe | thumb | tic4x | tic80 | tron \
-+ | spu \
-+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-+ | ubicom32 \
- | v850 | v850e \
- | we32k \
-- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
-- m6811 | m68hc11 | m6812 | m68hc12)
-+ c54x)
-+ basic_machine=tic54x-unknown
-+ ;;
-+ c55x)
-+ basic_machine=tic55x-unknown
-+ ;;
-+ c6x)
-+ basic_machine=tic6x-unknown
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
- os=-none
-@@ -308,6 +326,18 @@ case $basic_machine in
- basic_machine=mt-unknown
- ;;
-
-+ strongarm | thumb | xscale)
-+ basic_machine=arm-unknown
-+ ;;
-+
-+ xscaleeb)
-+ basic_machine=armeb-unknown
-+ ;;
-+
-+ xscaleel)
-+ basic_machine=armel-unknown
-+ ;;
-+
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
-@@ -328,7 +358,7 @@ case $basic_machine in
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- | bfin-* | bs2000-* \
-- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
-@@ -340,7 +370,7 @@ case $basic_machine in
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-@@ -362,24 +392,28 @@ case $basic_machine in
- | mmix-* \
- | mt-* \
- | msp430-* \
-+ | nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
-+ | open8-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pyramid-* \
-- | romp-* | rs6000-* \
-+ | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-- | tahoe-* | thumb-* \
-- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+ | tahoe-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tile-* | tilegx-* \
- | tron-* \
-+ | ubicom32-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
-@@ -404,7 +438,7 @@ case $basic_machine in
- basic_machine=a29k-amd
- os=-udi
- ;;
-- abacus)
-+ abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
-@@ -474,11 +508,20 @@ case $basic_machine in
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
-+ c54x-*)
-+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ c55x-*)
-+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ c6x-*)
-+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
-- cegcc)
-+ cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
-@@ -510,7 +553,7 @@ case $basic_machine in
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16)
-+ cr16 | cr16-*)
- basic_machine=cr16-unknown
- os=-elf
- ;;
-@@ -726,6 +769,9 @@ case $basic_machine in
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-+ microblaze)
-+ basic_machine=microblaze-xilinx
-+ ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
-@@ -830,6 +876,12 @@ case $basic_machine in
- np1)
- basic_machine=np1-gould
- ;;
-+ neo-tandem)
-+ basic_machine=neo-tandem
-+ ;;
-+ nse-tandem)
-+ basic_machine=nse-tandem
-+ ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
-@@ -912,9 +964,10 @@ case $basic_machine in
- ;;
- power) basic_machine=power-ibm
- ;;
-- ppc) basic_machine=powerpc-unknown
-+ ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
-- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ppc-* | ppcbe-*)
-+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
-@@ -1008,6 +1061,9 @@ case $basic_machine in
- basic_machine=i860-stratus
- os=-sysv4
- ;;
-+ strongarm-* | thumb-*)
-+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- sun2)
- basic_machine=m68000-sun
- ;;
-@@ -1064,17 +1120,10 @@ case $basic_machine in
- basic_machine=t90-cray
- os=-unicos
- ;;
-- tic54x | c54x*)
-- basic_machine=tic54x-unknown
-- os=-coff
-- ;;
-- tic55x | c55x*)
-- basic_machine=tic55x-unknown
-- os=-coff
-- ;;
-- tic6x | c6x*)
-- basic_machine=tic6x-unknown
-- os=-coff
-+ # This must be matched before tile*.
-+ tilegx*)
-+ basic_machine=tilegx-unknown
-+ os=-linux-gnu
- ;;
- tile*)
- basic_machine=tile-unknown
-@@ -1147,6 +1196,9 @@ case $basic_machine in
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-+ xscale-* | xscalee[bl]-*)
-+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+ ;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
-@@ -1244,9 +1296,12 @@ esac
- if [ x"$os" != x"" ]
- then
- case $os in
-- # First match some system type aliases
-- # that might get confused with valid system types.
-+ # First match some system type aliases
-+ # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
-+ -auroraux)
-+ os=-auroraux
-+ ;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
-@@ -1268,8 +1323,8 @@ case $os in
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-- | -kopensolaris* \
-+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+ | -sym* | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-@@ -1282,7 +1337,8 @@ case $os in
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -mingw32* | -linux-gnu* | -linux-android* \
-+ | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-@@ -1290,7 +1346,7 @@ case $os in
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1329,7 +1385,7 @@ case $os in
- -opened*)
- os=-openedition
- ;;
-- -os400*)
-+ -os400*)
- os=-os400
- ;;
- -wince*)
-@@ -1378,7 +1434,7 @@ case $os in
- -sinix*)
- os=-sysv4
- ;;
-- -tpf*)
-+ -tpf*)
- os=-tpf
- ;;
- -triton*)
-@@ -1423,6 +1479,8 @@ case $os in
- -dicos*)
- os=-dicos
- ;;
-+ -nacl*)
-+ ;;
- -none)
- ;;
- *)
-@@ -1445,10 +1503,10 @@ else
- # system, and we'll never get to this point.
-
- case $basic_machine in
-- score-*)
-+ score-*)
- os=-elf
- ;;
-- spu-*)
-+ spu-*)
- os=-elf
- ;;
- *-acorn)
-@@ -1460,8 +1518,17 @@ case $basic_machine in
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
-+ tic54x-*)
-+ os=-coff
-+ ;;
-+ tic55x-*)
-+ os=-coff
-+ ;;
-+ tic6x-*)
-+ os=-coff
- ;;
- # This must come before the *-dec entry.
- pdp10-*)
-@@ -1488,7 +1555,7 @@ case $basic_machine in
- m68*-cisco)
- os=-aout
- ;;
-- mep-*)
-+ mep-*)
- os=-elf
- ;;
- mips*-cisco)
-@@ -1515,7 +1582,7 @@ case $basic_machine in
- *-ibm)
- os=-aix
- ;;
-- *-knuth)
-+ *-knuth)
- os=-mmixware
- ;;
- *-wec)
diff --git a/configure b/configure
-index dd734e3..4ba6891 100755
+index 6f0f083..8e6a822 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.65 for saga 2.0.7.
-+# Generated by GNU Autoconf 2.68 for saga 2.0.7.
+-# Generated by GNU Autoconf 2.65 for saga 2.0.8.
++# Generated by GNU Autoconf 2.68 for saga 2.0.8.
#
# Report bugs to <BUG-REPORT-ADDRESS>.
#
@@ -1548,7 +438,7 @@ index dd734e3..4ba6891 100755
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-@@ -789,9 +658,11 @@ OTOOL
+@@ -795,9 +664,11 @@ OTOOL
LIPO
NMEDIT
DSYMUTIL
@@ -1561,15 +451,15 @@ index dd734e3..4ba6891 100755
OBJDUMP
LN_S
NM
-@@ -903,6 +774,7 @@ enable_static
+@@ -909,6 +780,7 @@ enable_static
with_pic
enable_fast_install
with_gnu_ld
+with_sysroot
enable_libtool_lock
+ with_local
enable_debug
- enable_unicode
-@@ -984,8 +856,9 @@ do
+@@ -993,8 +865,9 @@ do
fi
case $ac_option in
@@ -1581,7 +471,7 @@ index dd734e3..4ba6891 100755
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1030,7 +903,7 @@ do
+@@ -1039,7 +912,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1590,7 +480,7 @@ index dd734e3..4ba6891 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1056,7 +929,7 @@ do
+@@ -1065,7 +938,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1599,7 +489,7 @@ index dd734e3..4ba6891 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1260,7 +1133,7 @@ do
+@@ -1269,7 +1142,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1608,7 +498,7 @@ index dd734e3..4ba6891 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1276,7 +1149,7 @@ do
+@@ -1285,7 +1158,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1617,7 +507,7 @@ index dd734e3..4ba6891 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1306,8 +1179,8 @@ do
+@@ -1315,8 +1188,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1628,7 +518,7 @@ index dd734e3..4ba6891 100755
;;
*=*)
-@@ -1315,7 +1188,7 @@ Try \`$0 --help' for more information."
+@@ -1324,7 +1197,7 @@ Try \`$0 --help' for more information."
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
@@ -1637,7 +527,7 @@ index dd734e3..4ba6891 100755
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1325,7 +1198,7 @@ Try \`$0 --help' for more information."
+@@ -1334,7 +1207,7 @@ Try \`$0 --help' for more information."
$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
@@ -1646,7 +536,7 @@ index dd734e3..4ba6891 100755
;;
esac
-@@ -1333,13 +1206,13 @@ done
+@@ -1342,13 +1215,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1662,7 +552,7 @@ index dd734e3..4ba6891 100755
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1362,7 +1235,7 @@ do
+@@ -1371,7 +1244,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1671,7 +561,7 @@ index dd734e3..4ba6891 100755
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1376,8 +1249,8 @@ target=$target_alias
+@@ -1385,8 +1258,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -1682,7 +572,7 @@ index dd734e3..4ba6891 100755
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1392,9 +1265,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1401,9 +1274,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1694,7 +584,7 @@ index dd734e3..4ba6891 100755
# Find the source files, if location was not specified.
-@@ -1433,11 +1306,11 @@ else
+@@ -1442,11 +1315,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1708,7 +598,7 @@ index dd734e3..4ba6891 100755
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1477,7 +1350,7 @@ Configuration:
+@@ -1486,7 +1359,7 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
@@ -1717,19 +607,23 @@ index dd734e3..4ba6891 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
-@@ -1558,6 +1431,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
+@@ -1566,9 +1439,11 @@ Optional Features:
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+- --with-pic try to use only PIC/non-PIC objects [default=use
++ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-sysroot=DIR Search for dependent libraries within DIR
+ (or the compiler's sysroot if not specified).
+ --with-local=dir search /usr/local or other directory for includes and libs
Some influential environment variables:
- CXX C++ compiler command
-@@ -1643,9 +1518,9 @@ test -n "$ac_init_help" && exit $ac_status
+@@ -1655,9 +1530,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- saga configure 2.0.7
+ saga configure 2.0.8
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.68
@@ -1738,7 +632,7 @@ index dd734e3..4ba6891 100755
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
-@@ -1689,7 +1564,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1701,7 +1576,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -1747,7 +641,7 @@ index dd734e3..4ba6891 100755
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
-@@ -1727,7 +1602,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1739,7 +1614,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -1756,7 +650,7 @@ index dd734e3..4ba6891 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
-@@ -1773,7 +1648,7 @@ fi
+@@ -1785,7 +1660,7 @@ fi
# 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
@@ -1765,7 +659,7 @@ index dd734e3..4ba6891 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
-@@ -1787,7 +1662,7 @@ ac_fn_c_check_header_compile ()
+@@ -1799,7 +1674,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -1774,7 +668,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1805,7 +1680,7 @@ fi
+@@ -1817,7 +1692,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -1783,7 +677,7 @@ index dd734e3..4ba6891 100755
} # ac_fn_c_check_header_compile
-@@ -1830,7 +1705,7 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -1842,7 +1717,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -1792,7 +686,7 @@ index dd734e3..4ba6891 100755
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -1841,7 +1716,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1853,7 +1728,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -1801,7 +695,7 @@ index dd734e3..4ba6891 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
-@@ -1883,7 +1758,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1895,7 +1770,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
@@ -1810,7 +704,7 @@ index dd734e3..4ba6891 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
-@@ -1896,7 +1771,7 @@ ac_fn_c_check_func ()
+@@ -1908,7 +1783,7 @@ ac_fn_c_check_func ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -1819,7 +713,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1951,7 +1826,7 @@ fi
+@@ -1963,7 +1838,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -1828,7 +722,7 @@ index dd734e3..4ba6891 100755
} # ac_fn_c_check_func
-@@ -1976,7 +1851,7 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -1988,7 +1863,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -1837,7 +731,7 @@ index dd734e3..4ba6891 100755
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -1987,7 +1862,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1999,7 +1874,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -1846,7 +740,7 @@ index dd734e3..4ba6891 100755
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_cpp
-@@ -2033,7 +1908,7 @@ fi
+@@ -2045,7 +1920,7 @@ fi
# 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
@@ -1855,7 +749,7 @@ index dd734e3..4ba6891 100755
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
-@@ -2046,10 +1921,10 @@ fi
+@@ -2058,10 +1933,10 @@ fi
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -1868,7 +762,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
-@@ -2085,7 +1960,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -2097,7 +1972,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ac_header_preproc=no
fi
@@ -1877,7 +771,7 @@ index dd734e3..4ba6891 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
-@@ -2108,17 +1983,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+@@ -2120,17 +1995,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$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;}
@@ -1898,7 +792,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
-@@ -2127,7 +2000,7 @@ eval ac_res=\$$3
+@@ -2139,7 +2012,7 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
@@ -1907,7 +801,7 @@ index dd734e3..4ba6891 100755
} # ac_fn_c_check_header_mongrel
-@@ -2140,7 +2013,7 @@ ac_fn_c_check_type ()
+@@ -2152,7 +2025,7 @@ ac_fn_c_check_type ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -1916,7 +810,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
eval "$3=no"
-@@ -2181,7 +2054,7 @@ fi
+@@ -2193,7 +2066,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -1925,16 +819,16 @@ index dd734e3..4ba6891 100755
} # ac_fn_c_check_type
cat >config.log <<_ACEOF
-@@ -2189,7 +2062,7 @@ This file contains any messages produced by compilers while
+@@ -2201,7 +2074,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by saga $as_me 2.0.7, which was
+ It was created by saga $as_me 2.0.8, which was
-generated by GNU Autoconf 2.65. Invocation command line was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
-@@ -2299,11 +2172,9 @@ trap 'exit_status=$?
+@@ -2311,11 +2184,9 @@ trap 'exit_status=$?
{
echo
@@ -1948,7 +842,7 @@ index dd734e3..4ba6891 100755
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -2337,11 +2208,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+@@ -2349,11 +2220,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
@@ -1962,7 +856,7 @@ index dd734e3..4ba6891 100755
echo
for ac_var in $ac_subst_vars
do
-@@ -2354,11 +2223,9 @@ _ASBOX
+@@ -2366,11 +2235,9 @@ _ASBOX
echo
if test -n "$ac_subst_files"; then
@@ -1976,7 +870,7 @@ index dd734e3..4ba6891 100755
echo
for ac_var in $ac_subst_files
do
-@@ -2372,11 +2239,9 @@ _ASBOX
+@@ -2384,11 +2251,9 @@ _ASBOX
fi
if test -s confdefs.h; then
@@ -1990,7 +884,7 @@ index dd734e3..4ba6891 100755
echo
cat confdefs.h
echo
-@@ -2431,7 +2296,12 @@ _ACEOF
+@@ -2443,7 +2308,12 @@ _ACEOF
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
@@ -2004,7 +898,7 @@ index dd734e3..4ba6891 100755
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
-@@ -2446,7 +2316,11 @@ do
+@@ -2458,7 +2328,11 @@ do
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
@@ -2017,7 +911,7 @@ index dd734e3..4ba6891 100755
fi
done
-@@ -2522,7 +2396,7 @@ if $ac_cache_corrupted; then
+@@ -2534,7 +2408,7 @@ if $ac_cache_corrupted; then
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
@@ -2026,7 +920,7 @@ index dd734e3..4ba6891 100755
fi
## -------------------- ##
## Main body of script. ##
-@@ -2542,16 +2416,22 @@ am__api_version='1.11'
+@@ -2555,16 +2429,22 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2057,7 +951,7 @@ index dd734e3..4ba6891 100755
fi
# These three variables are undocumented and unsupported,
-@@ -2580,7 +2460,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+@@ -2593,7 +2473,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
{ $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
@@ -2066,7 +960,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2667,11 +2547,11 @@ am_lf='
+@@ -2680,11 +2560,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2080,7 +974,7 @@ index dd734e3..4ba6891 100755
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2693,7 +2573,7 @@ if (
+@@ -2706,7 +2586,7 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -2089,7 +983,7 @@ index dd734e3..4ba6891 100755
alias in your environment" "$LINENO" 5
fi
-@@ -2703,7 +2583,7 @@ then
+@@ -2716,7 +2596,7 @@ then
# Ok.
:
else
@@ -2098,7 +992,7 @@ index dd734e3..4ba6891 100755
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -2757,7 +2637,7 @@ if test "$cross_compiling" != no; then
+@@ -2770,7 +2650,7 @@ if test "$cross_compiling" != no; then
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; }
@@ -2107,7 +1001,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2797,7 +2677,7 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2810,7 +2690,7 @@ if test -z "$ac_cv_prog_STRIP"; then
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; }
@@ -2116,7 +1010,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2850,7 +2730,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+@@ -2863,7 +2743,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
{ $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
@@ -2125,7 +1019,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2901,7 +2781,7 @@ do
+@@ -2914,7 +2794,7 @@ do
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; }
@@ -2134,7 +1028,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2941,7 +2821,7 @@ done
+@@ -2954,7 +2834,7 @@ done
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
@@ -2143,7 +1037,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2949,7 +2829,7 @@ SHELL = /bin/sh
+@@ -2962,7 +2842,7 @@ SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
@@ -2152,7 +1046,7 @@ index dd734e3..4ba6891 100755
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -2983,7 +2863,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+@@ -2996,7 +2876,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2161,7 +1055,7 @@ index dd734e3..4ba6891 100755
fi
fi
-@@ -3107,7 +2987,7 @@ do
+@@ -3120,7 +3000,7 @@ do
done
rm -rf conftest.dir
@@ -2170,7 +1064,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
am_cv_prog_tar_ustar=$_am_tool
-@@ -3138,7 +3018,7 @@ if test -z "$CXX"; then
+@@ -3151,7 +3031,7 @@ if test -z "$CXX"; then
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; }
@@ -2179,7 +1073,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -3182,7 +3062,7 @@ do
+@@ -3195,7 +3075,7 @@ do
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; }
@@ -2188,7 +1082,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -3345,9 +3225,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3358,9 +3238,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -2200,7 +1094,7 @@ index dd734e3..4ba6891 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3389,8 +3268,8 @@ done
+@@ -3402,8 +3281,8 @@ done
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -2211,7 +1105,7 @@ index dd734e3..4ba6891 100755
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3447,9 +3326,9 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -3460,9 +3339,9 @@ $as_echo "$ac_try_echo"; } >&5
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -2223,7 +1117,7 @@ index dd734e3..4ba6891 100755
fi
fi
fi
-@@ -3460,7 +3339,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+@@ -3473,7 +3352,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
@@ -2232,7 +1126,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3500,8 +3379,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3513,8 +3392,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -2243,7 +1137,7 @@ index dd734e3..4ba6891 100755
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -3511,7 +3390,7 @@ OBJEXT=$ac_cv_objext
+@@ -3524,7 +3403,7 @@ OBJEXT=$ac_cv_objext
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; }
@@ -2252,7 +1146,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3548,7 +3427,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
+@@ -3561,7 +3440,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
@@ -2261,7 +1155,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-@@ -3696,7 +3575,7 @@ depcc="$CXX" am_compiler_list=
+@@ -3709,7 +3588,7 @@ depcc="$CXX" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
@@ -2270,7 +1164,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3829,7 +3708,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -3842,7 +3721,7 @@ if test -n "$ac_tool_prefix"; then
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; }
@@ -2279,7 +1173,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3869,7 +3748,7 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -3882,7 +3761,7 @@ if test -z "$ac_cv_prog_CC"; then
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; }
@@ -2288,7 +1182,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3922,7 +3801,7 @@ if test -z "$CC"; then
+@@ -3935,7 +3814,7 @@ if test -z "$CC"; then
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; }
@@ -2297,7 +1191,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3962,7 +3841,7 @@ if test -z "$CC"; then
+@@ -3975,7 +3854,7 @@ if test -z "$CC"; then
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; }
@@ -2306,7 +1200,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4021,7 +3900,7 @@ if test -z "$CC"; then
+@@ -4034,7 +3913,7 @@ if test -z "$CC"; then
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; }
@@ -2315,7 +1209,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4065,7 +3944,7 @@ do
+@@ -4078,7 +3957,7 @@ do
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; }
@@ -2324,7 +1218,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4119,8 +3998,8 @@ fi
+@@ -4132,8 +4011,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -2335,7 +1229,7 @@ index dd734e3..4ba6891 100755
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4149,7 +4028,7 @@ done
+@@ -4162,7 +4041,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
@@ -2344,7 +1238,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4186,7 +4065,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+@@ -4199,7 +4078,7 @@ ac_test_CFLAGS=${CFLAGS+set}
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; }
@@ -2353,7 +1247,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -4264,7 +4143,7 @@ else
+@@ -4277,7 +4156,7 @@ else
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; }
@@ -2362,7 +1256,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
-@@ -4363,7 +4242,7 @@ depcc="$CC" am_compiler_list=
+@@ -4376,7 +4255,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
@@ -2371,18 +1265,18 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4495,8 +4374,8 @@ esac
+@@ -4508,8 +4387,8 @@ esac
-macro_version='2.2.6b'
-macro_revision='1.3017'
-+macro_version='2.4'
-+macro_revision='1.3293'
++macro_version='2.4.2'
++macro_revision='1.3337'
-@@ -4514,27 +4393,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -4527,27 +4406,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2415,7 +1309,7 @@ index dd734e3..4ba6891 100755
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -4552,14 +4431,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+@@ -4565,14 +4444,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
@@ -2432,7 +1326,7 @@ index dd734e3..4ba6891 100755
fi
fi
-@@ -4567,7 +4446,7 @@ fi
+@@ -4580,7 +4459,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
@@ -2441,7 +1335,7 @@ index dd734e3..4ba6891 100755
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -4583,9 +4462,78 @@ IFS=$ac_save_IFS
+@@ -4596,9 +4475,78 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -2521,7 +1415,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4640,7 +4588,7 @@ esac
+@@ -4653,7 +4601,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
@@ -2530,7 +1424,7 @@ index dd734e3..4ba6891 100755
fi
else
ac_cv_path_SED=$SED
-@@ -4667,7 +4615,7 @@ Xsed="$SED -e 1s/^X//"
+@@ -4680,7 +4628,7 @@ Xsed="$SED -e 1s/^X//"
{ $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; }
@@ -2539,7 +1433,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4716,7 +4664,7 @@ esac
+@@ -4729,7 +4677,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
@@ -2548,7 +1442,7 @@ index dd734e3..4ba6891 100755
fi
else
ac_cv_path_GREP=$GREP
-@@ -4730,7 +4678,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
+@@ -4743,7 +4691,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
@@ -2557,7 +1451,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4782,7 +4730,7 @@ esac
+@@ -4795,7 +4743,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
@@ -2566,7 +1460,7 @@ index dd734e3..4ba6891 100755
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4797,7 +4745,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+@@ -4810,7 +4758,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
@@ -2575,7 +1469,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4849,7 +4797,7 @@ esac
+@@ -4862,7 +4810,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
@@ -2584,7 +1478,7 @@ index dd734e3..4ba6891 100755
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4928,7 +4876,7 @@ else
+@@ -4941,7 +4889,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
@@ -2593,7 +1487,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4965,10 +4913,10 @@ else
+@@ -4978,10 +4926,10 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2606,7 +1500,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4995,7 +4943,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -5008,7 +4956,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
{ $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; }
@@ -2615,7 +1509,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -5048,14 +4996,17 @@ if test "$lt_cv_path_NM" != "no"; then
+@@ -5061,14 +5009,17 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -2636,7 +1530,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -5093,13 +5044,13 @@ fi
+@@ -5106,13 +5057,13 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -2652,7 +1546,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -5148,6 +5099,15 @@ esac
+@@ -5161,6 +5112,15 @@ esac
fi
fi
@@ -2668,7 +1562,7 @@ index dd734e3..4ba6891 100755
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -5162,18 +5122,18 @@ test -z "$NM" && NM=nm
+@@ -5175,18 +5135,18 @@ test -z "$NM" && NM=nm
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
@@ -2678,20 +1572,20 @@ index dd734e3..4ba6891 100755
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:5170: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:5183: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5173: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:5186: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5176: output\"" >&5)
+- (eval echo "\"\$as_me:5189: output\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5197,7 +5157,7 @@ fi
+@@ -5210,7 +5170,7 @@ fi
# 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; }
@@ -2700,7 +1594,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
i=0
-@@ -5230,6 +5190,11 @@ else
+@@ -5243,6 +5203,11 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
@@ -2712,18 +1606,30 @@ index dd734e3..4ba6891 100755
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -5294,8 +5259,8 @@ else
+@@ -5268,6 +5233,11 @@ else
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
++ os2*)
++ # The test takes a long time on OS/2.
++ lt_cv_sys_max_cmd_len=8192
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+@@ -5307,8 +5277,8 @@ else
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -5337,8 +5302,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
+@@ -5350,8 +5320,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
@@ -2734,7 +1640,7 @@ index dd734e3..4ba6891 100755
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-@@ -5387,9 +5352,83 @@ esac
+@@ -5400,9 +5370,83 @@ esac
@@ -2819,7 +1725,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
-@@ -5403,6 +5442,11 @@ case $reload_flag in
+@@ -5416,6 +5460,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
@@ -2831,7 +1737,7 @@ index dd734e3..4ba6891 100755
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -5425,7 +5469,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -5438,7 +5487,7 @@ if test -n "$ac_tool_prefix"; then
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; }
@@ -2840,7 +1746,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5465,7 +5509,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -5478,7 +5527,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
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; }
@@ -2849,7 +1755,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5524,7 +5568,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -5537,7 +5586,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
@@ -2858,7 +1764,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5566,16 +5610,18 @@ mingw* | pw32*)
+@@ -5579,16 +5628,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -2880,7 +1786,7 @@ index dd734e3..4ba6891 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'
-@@ -5605,6 +5651,10 @@ gnu*)
+@@ -5618,6 +5669,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2891,7 +1797,7 @@ index dd734e3..4ba6891 100755
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -5613,11 +5663,11 @@ hpux10.20* | hpux11*)
+@@ -5626,11 +5681,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -2905,7 +1811,16 @@ index dd734e3..4ba6891 100755
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -5720,6 +5770,21 @@ esac
+@@ -5651,7 +5706,7 @@ irix5* | irix6* | nonstopux*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -5733,6 +5788,21 @@ esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2927,7 +1842,7 @@ index dd734e3..4ba6891 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
-@@ -5735,16 +5800,26 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -5748,16 +5818,26 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -2959,7 +1874,7 @@ index dd734e3..4ba6891 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5753,7 +5828,7 @@ do
+@@ -5766,7 +5846,7 @@ 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
@@ -2968,7 +1883,7 @@ index dd734e3..4ba6891 100755
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5763,10 +5838,10 @@ IFS=$as_save_IFS
+@@ -5776,10 +5856,10 @@ IFS=$as_save_IFS
fi
fi
@@ -2983,7 +1898,7 @@ index dd734e3..4ba6891 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -5774,17 +5849,17 @@ fi
+@@ -5787,17 +5867,17 @@ fi
fi
@@ -3008,7 +1923,7 @@ index dd734e3..4ba6891 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5793,7 +5868,7 @@ do
+@@ -5806,7 +5886,7 @@ 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
@@ -3017,7 +1932,7 @@ index dd734e3..4ba6891 100755
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5803,17 +5878,17 @@ IFS=$as_save_IFS
+@@ -5816,17 +5896,17 @@ IFS=$as_save_IFS
fi
fi
@@ -3041,7 +1956,7 @@ index dd734e3..4ba6891 100755
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -5821,17 +5896,54 @@ yes:)
+@@ -5834,18 +5914,55 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3062,8 +1977,8 @@ index dd734e3..4ba6891 100755
+
+
+
-+
-+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
@@ -3091,16 +2006,17 @@ index dd734e3..4ba6891 100755
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+esac
-
++
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
++
-@@ -5841,15 +5953,17 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -5854,15 +5971,17 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
if test -n "$ac_tool_prefix"; then
@@ -3123,7 +2039,7 @@ index dd734e3..4ba6891 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5858,7 +5972,7 @@ do
+@@ -5871,7 +5990,7 @@ 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
@@ -3132,7 +2048,7 @@ index dd734e3..4ba6891 100755
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5868,28 +5982,32 @@ IFS=$as_save_IFS
+@@ -5881,28 +6000,32 @@ IFS=$as_save_IFS
fi
fi
@@ -3176,21 +2092,21 @@ index dd734e3..4ba6891 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5898,7 +6016,7 @@ do
+@@ -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"
+ ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -5908,8 +6026,173 @@ IFS=$as_save_IFS
-
- fi
- fi
--ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
--if test -n "$ac_ct_STRIP"; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
@@ -3347,21 +2263,10 @@ index dd734e3..4ba6891 100755
+ 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
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
- $as_echo "$ac_ct_STRIP" >&6; }
- else
-@@ -5944,7 +6227,7 @@ if test -n "$ac_tool_prefix"; then
+ $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
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; }
@@ -3370,7 +2275,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5984,7 +6267,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -5997,7 +6285,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
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; }
@@ -3379,8 +2284,20 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -6055,6 +6338,18 @@ if test -n "$RANLIB"; then
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+@@ -6059,15 +6347,27 @@ old_postuninstall_cmds=
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
+ esac
+- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
+case $host_os in
@@ -3398,7 +2315,7 @@ index dd734e3..4ba6891 100755
-@@ -6101,7 +6396,7 @@ compiler=$CC
+@@ -6114,7 +6414,7 @@ compiler=$CC
# 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; }
@@ -3407,7 +2324,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
-@@ -6162,8 +6457,8 @@ esac
+@@ -6175,8 +6475,8 @@ esac
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
@@ -3418,7 +2335,15 @@ index dd734e3..4ba6891 100755
# Handle CRLF in mingw tool chain
opt_cr=
-@@ -6199,6 +6494,7 @@ for ac_symprfx in "" "_"; do
+@@ -6200,6 +6500,7 @@ for ac_symprfx in "" "_"; do
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+ " {last_section=section; section=\$ 3};"\
++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /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
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
@@ -3426,7 +2351,7 @@ index dd734e3..4ba6891 100755
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -6224,8 +6520,8 @@ _LT_EOF
+@@ -6237,8 +6539,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -3437,7 +2362,7 @@ index dd734e3..4ba6891 100755
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -6240,6 +6536,18 @@ _LT_EOF
+@@ -6253,6 +6555,18 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
@@ -3456,7 +2381,7 @@ index dd734e3..4ba6891 100755
#ifdef __cplusplus
extern "C" {
#endif
-@@ -6251,7 +6559,7 @@ _LT_EOF
+@@ -6264,7 +6578,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
@@ -3465,7 +2390,7 @@ index dd734e3..4ba6891 100755
const char *name;
void *address;
}
-@@ -6277,8 +6585,8 @@ static const void *lt_preloaded_setup() {
+@@ -6290,8 +6604,8 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
@@ -3476,7 +2401,7 @@ index dd734e3..4ba6891 100755
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -6288,8 +6596,8 @@ _LT_EOF
+@@ -6301,8 +6615,8 @@ _LT_EOF
test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
@@ -3487,7 +2412,7 @@ index dd734e3..4ba6891 100755
else
echo "cannot find nm_test_func in $nlist" >&5
fi
-@@ -6326,6 +6634,17 @@ else
+@@ -6339,6 +6653,19 @@ else
$as_echo "ok" >&6; }
fi
@@ -3502,10 +2427,12 @@ index dd734e3..4ba6891 100755
+
+
+
++
++
-@@ -6348,6 +6667,43 @@ fi
+@@ -6359,6 +6686,41 @@ fi
@@ -3544,21 +2471,19 @@ index dd734e3..4ba6891 100755
+
+
+
-+
-+
+
+
# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then :
- enableval=$enable_libtool_lock;
-@@ -6379,7 +6735,7 @@ ia64-*-hpux*)
+@@ -6392,7 +6754,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6382 "configure"' > conftest.$ac_ext
+- echo '#line 6395 "configure"' > conftest.$ac_ext
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6473,7 +6829,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+@@ -6486,7 +6848,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
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; }
@@ -3567,7 +2492,38 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6541,6 +6897,123 @@ esac
+@@ -6527,7 +6889,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+-sparc*-*solaris*)
++*-*solaris*)
+ # 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*)
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+- yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ yes*)
++ case $host in
++ i?86-*-solaris*)
++ LD="${LD-ld} -m elf_x86_64"
++ ;;
++ sparc*-*-solaris*)
++ LD="${LD-ld} -m elf64_sparc"
++ ;;
++ esac
++ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
++ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
++ LD="${LD-ld}_sol2"
++ fi
++ ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+@@ -6554,6 +6929,123 @@ esac
need_locks="$enable_libtool_lock"
@@ -3691,7 +2647,7 @@ index dd734e3..4ba6891 100755
case $host_os in
rhapsody* | darwin*)
-@@ -6549,7 +7022,7 @@ need_locks="$enable_libtool_lock"
+@@ -6562,7 +7054,7 @@ need_locks="$enable_libtool_lock"
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; }
@@ -3700,7 +2656,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6589,7 +7062,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -6602,7 +7094,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
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; }
@@ -3709,7 +2665,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6641,7 +7114,7 @@ fi
+@@ -6654,7 +7146,7 @@ fi
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; }
@@ -3718,7 +2674,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6681,7 +7154,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -6694,7 +7186,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
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; }
@@ -3727,7 +2683,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6733,7 +7206,7 @@ fi
+@@ -6746,7 +7238,7 @@ fi
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; }
@@ -3736,7 +2692,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6773,7 +7246,7 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -6786,7 +7278,7 @@ if test -z "$ac_cv_prog_LIPO"; then
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; }
@@ -3745,7 +2701,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6825,7 +7298,7 @@ fi
+@@ -6838,7 +7330,7 @@ fi
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; }
@@ -3754,7 +2710,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6865,7 +7338,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -6878,7 +7370,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
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; }
@@ -3763,7 +2719,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6917,7 +7390,7 @@ fi
+@@ -6930,7 +7422,7 @@ fi
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; }
@@ -3772,7 +2728,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6957,7 +7430,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -6970,7 +7462,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
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; }
@@ -3781,7 +2737,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -7032,7 +7505,7 @@ fi
+@@ -7045,7 +7537,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
@@ -3790,8 +2746,26 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -7061,7 +7534,7 @@ fi
+@@ -7061,7 +7553,13 @@ else
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++ # If there is a non-empty error log, and "single_module"
++ # appears in it, assume the flag caused a linker warning
++ if test -s conftest.err && $GREP single_module conftest.err; then
++ cat conftest.err >&5
++ # Otherwise, if the output was created with a 0 exit code from
++ # the compiler, it worked.
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&5
+@@ -7072,9 +7570,10 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
++
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
@@ -3799,15 +2773,13 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
-@@ -7091,11 +7564,43 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -7104,8 +7603,43 @@ rm -f core conftest.err conftest.$ac_objext \
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' ;;
-- darwin1.*)
-- _lt_dar_allow_undefined='${wl}-flat_namespace ${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; }
+if ${lt_cv_ld_force_load+:} false; then :
@@ -3829,7 +2801,9 @@ index dd734e3..4ba6891 100755
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
-+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
++ if test -s conftest.err && $GREP force_load conftest.err; then
++ cat conftest.err >&5
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
@@ -3842,13 +2816,10 @@ index dd734e3..4ba6891 100755
+$as_echo "$lt_cv_ld_force_load" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
-@@ -7118,7 +7623,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ _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; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -3857,7 +2828,7 @@ index dd734e3..4ba6891 100755
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -7138,7 +7643,7 @@ if test -n "$CPP" && test -d "$CPP"; then
+@@ -7151,7 +7685,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
@@ -3866,7 +2837,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -7168,7 +7673,7 @@ else
+@@ -7181,7 +7715,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -3875,7 +2846,7 @@ index dd734e3..4ba6891 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -7184,11 +7689,11 @@ else
+@@ -7197,11 +7731,11 @@ else
ac_preproc_ok=:
break
fi
@@ -3889,7 +2860,7 @@ index dd734e3..4ba6891 100755
if $ac_preproc_ok; then :
break
fi
-@@ -7227,7 +7732,7 @@ else
+@@ -7240,7 +7774,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -3898,7 +2869,7 @@ index dd734e3..4ba6891 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -7243,18 +7748,18 @@ else
+@@ -7256,18 +7790,18 @@ else
ac_preproc_ok=:
break
fi
@@ -3921,7 +2892,7 @@ index dd734e3..4ba6891 100755
fi
ac_ext=c
-@@ -7266,7 +7771,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -7279,7 +7813,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
@@ -3930,44 +2901,25 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -7368,569 +7873,54 @@ fi
-
- fi
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
--$as_echo "#define STDC_HEADERS 1" >>confdefs.h
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
--do :
-- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
--"
+@@ -7396,8 +7930,7 @@ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--for ac_header in dlfcn.h
--do :
-- ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
--"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -7411,539 +7944,25 @@ for ac_header in dlfcn.h
+ do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+ "
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_DLFCN_H 1
--_ACEOF
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DLFCN_H 1
+ _ACEOF
-
-fi
-
@@ -4424,15 +3376,11 @@ index dd734e3..4ba6891 100755
-if $ac_preproc_ok; then :
- break
-fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-
+-
- done
- ac_cv_prog_CXXCPP=$CXXCPP
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
- fi
+-
+-fi
- CXXCPP=$ac_cv_prog_CXXCPP
-else
- ac_cv_prog_CXXCPP=$CXXCPP
@@ -4456,42 +3404,21 @@ index dd734e3..4ba6891 100755
-# include <assert.h>
-#endif
- Syntax error
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
+-
-else
- # Broken: fails on valid input.
-continue
- fi
+-fi
-rm -f conftest.err conftest.$ac_ext
-
+-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-+done
-+
-+
-+for ac_header in dlfcn.h
-+do :
-+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DLFCN_H 1
- _ACEOF
+-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
@@ -4534,15 +3461,43 @@ index dd734e3..4ba6891 100755
-@@ -8088,6 +8078,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8024,7 +8043,22 @@ fi
+
+ # Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then :
+- withval=$with_pic; pic_mode="$withval"
++ withval=$with_pic; lt_p=${PACKAGE-default}
++ case $withval in
++ yes|no) pic_mode=$withval ;;
++ *)
++ pic_mode=default
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for lt_pkg in $withval; do
++ IFS="$lt_save_ifs"
++ if test "X$lt_pkg" = "X$lt_p"; then
++ pic_mode=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
+ else
+ pic_mode=default
+ fi
+@@ -8101,6 +8135,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
++
++
++
++
test -z "$LN_S" && LN_S="ln -s"
-@@ -8109,7 +8100,7 @@ fi
+@@ -8122,7 +8161,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
@@ -4551,7 +3506,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -8137,19 +8128,6 @@ _ACEOF
+@@ -8150,19 +8189,6 @@ _ACEOF
@@ -4571,7 +3526,7 @@ index dd734e3..4ba6891 100755
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
-@@ -8162,23 +8140,6 @@ aix3*)
+@@ -8175,23 +8201,6 @@ aix3*)
;;
esac
@@ -4595,7 +3550,7 @@ index dd734e3..4ba6891 100755
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -8207,7 +8168,7 @@ for cc_temp in $compiler""; do
+@@ -8220,7 +8229,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -4604,7 +3559,7 @@ index dd734e3..4ba6891 100755
# Only perform the check for file, if the check method requires it
-@@ -8217,7 +8178,7 @@ file_magic*)
+@@ -8230,7 +8239,7 @@ file_magic*)
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; }
@@ -4613,7 +3568,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8283,7 +8244,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -8296,7 +8305,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
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; }
@@ -4622,7 +3577,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8416,11 +8377,16 @@ if test -n "$compiler"; then
+@@ -8429,11 +8438,16 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
@@ -4641,16 +3596,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -8436,15 +8402,15 @@ else
+@@ -8449,15 +8463,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8439: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8452: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8443: \$? = $ac_status" >&5
+- echo "$as_me:8456: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -4660,7 +3615,7 @@ index dd734e3..4ba6891 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
-@@ -8473,8 +8439,6 @@ fi
+@@ -8486,8 +8500,6 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -4669,7 +3624,7 @@ index dd734e3..4ba6891 100755
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -8522,6 +8486,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8535,6 +8547,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fno-common'
;;
@@ -4682,7 +3637,7 @@ index dd734e3..4ba6891 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
-@@ -8564,6 +8534,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8577,6 +8595,15 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -4690,13 +3645,15 @@ index dd734e3..4ba6891 100755
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ lt_prog_compiler_wl='-Xlinker '
-+ lt_prog_compiler_pic='-Xcompiler -fPIC'
++ if test -n "$lt_prog_compiler_pic"; then
++ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
++ fi
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8626,7 +8603,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8639,7 +8666,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
@@ -4711,7 +3668,7 @@ index dd734e3..4ba6891 100755
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8638,25 +8621,25 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8651,25 +8684,40 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -4725,27 +3682,40 @@ index dd734e3..4ba6891 100755
;;
*)
case `$CC -V 2>&1 | sed 5q` in
-- *Sun\ C*)
-- # Sun C 5.9
-+ *Sun\ F* | *Sun*Fortran*)
++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl=''
++ ;;
++ *Sun\ F* | *Sun*Fortran*)
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl='-Qoption ld '
++ ;;
+ *Sun\ C*)
+ # Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-- lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_wl=''
+ lt_prog_compiler_wl='-Wl,'
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ *Sun\ C*)
-+ # Sun C 5.9
- lt_prog_compiler_pic='-KPIC'
+- lt_prog_compiler_pic='-KPIC'
++ *Intel*\ [CF]*Compiler*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-fPIC'
++ lt_prog_compiler_static='-static'
++ ;;
++ *Portland\ Group*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-fpic'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
-+ lt_prog_compiler_wl='-Wl,'
;;
esac
;;
-@@ -8688,7 +8671,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8701,7 +8749,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
@@ -4754,7 +3724,7 @@ index dd734e3..4ba6891 100755
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -8745,13 +8728,17 @@ case $host_os in
+@@ -8758,13 +8806,17 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -4778,7 +3748,7 @@ index dd734e3..4ba6891 100755
#
# Check to make sure the PIC flag actually works.
-@@ -8759,7 +8746,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -8772,7 +8824,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
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; }
@@ -4787,16 +3757,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8775,15 +8762,15 @@ else
+@@ -8788,15 +8840,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8778: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8791: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8782: \$? = $ac_status" >&5
+- echo "$as_me:8795: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -4806,7 +3776,7 @@ index dd734e3..4ba6891 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
-@@ -8812,13 +8799,18 @@ fi
+@@ -8825,13 +8877,18 @@ fi
@@ -4826,7 +3796,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8831,7 +8823,7 @@ else
+@@ -8844,7 +8901,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -4835,7 +3805,7 @@ index dd734e3..4ba6891 100755
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -8861,7 +8853,7 @@ fi
+@@ -8874,7 +8931,7 @@ fi
{ $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; }
@@ -4844,16 +3814,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8880,16 +8872,16 @@ else
+@@ -8893,16 +8950,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8883: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8896: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8887: \$? = $ac_status" >&5
+- echo "$as_me:8900: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -4864,7 +3834,7 @@ index dd734e3..4ba6891 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
-@@ -8916,7 +8908,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+@@ -8929,7 +8986,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
{ $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; }
@@ -4873,16 +3843,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8935,16 +8927,16 @@ else
+@@ -8948,16 +9005,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8938: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8951: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8942: \$? = $ac_status" >&5
+- echo "$as_me:8955: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -4893,7 +3863,15 @@ index dd734e3..4ba6891 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
-@@ -9054,13 +9046,39 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -9023,7 +9080,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ hardcode_libdir_flag_spec=
+- hardcode_libdir_flag_spec_ld=
+ hardcode_libdir_separator=
+ hardcode_minus_L=no
+ hardcode_shlibpath_var=unsupported
+@@ -9067,13 +9123,39 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
@@ -4934,7 +3912,7 @@ index dd734e3..4ba6891 100755
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9094,11 +9112,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -9107,11 +9189,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -4950,7 +3928,7 @@ index dd734e3..4ba6891 100755
_LT_EOF
fi
-@@ -9134,10 +9153,12 @@ _LT_EOF
+@@ -9147,10 +9230,12 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -4964,7 +3942,7 @@ index dd734e3..4ba6891 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'
-@@ -9155,6 +9176,11 @@ _LT_EOF
+@@ -9168,6 +9253,11 @@ _LT_EOF
fi
;;
@@ -4976,7 +3954,7 @@ index dd734e3..4ba6891 100755
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -9180,15 +9206,16 @@ _LT_EOF
+@@ -9193,15 +9283,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
@@ -4997,7 +3975,7 @@ index dd734e3..4ba6891 100755
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -9199,13 +9226,17 @@ _LT_EOF
+@@ -9212,13 +9303,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -5017,7 +3995,7 @@ index dd734e3..4ba6891 100755
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -9221,17 +9252,17 @@ _LT_EOF
+@@ -9234,17 +9329,16 @@ _LT_EOF
fi
case $cc_basename in
@@ -5025,9 +4003,10 @@ index dd734e3..4ba6891 100755
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
+- hardcode_libdir_flag_spec=
+- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5038,7 +4017,7 @@ index dd734e3..4ba6891 100755
fi
;;
esac
-@@ -9245,8 +9276,8 @@ _LT_EOF
+@@ -9258,8 +9352,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -5049,7 +4028,7 @@ index dd734e3..4ba6891 100755
fi
;;
-@@ -9264,8 +9295,8 @@ _LT_EOF
+@@ -9277,8 +9371,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -5060,7 +4039,7 @@ index dd734e3..4ba6891 100755
else
ld_shlibs=no
fi
-@@ -9311,8 +9342,8 @@ _LT_EOF
+@@ -9324,8 +9418,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -5071,7 +4050,7 @@ index dd734e3..4ba6891 100755
else
ld_shlibs=no
fi
-@@ -9352,8 +9383,10 @@ _LT_EOF
+@@ -9365,8 +9459,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -5083,7 +4062,7 @@ index dd734e3..4ba6891 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
-@@ -9441,7 +9474,13 @@ _LT_EOF
+@@ -9454,7 +9550,13 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5098,7 +4077,7 @@ index dd734e3..4ba6891 100755
/* end confdefs.h. */
int
-@@ -9454,25 +9493,32 @@ main ()
+@@ -9467,25 +9569,32 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -5145,7 +4124,7 @@ index dd734e3..4ba6891 100755
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9481,7 +9527,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9494,7 +9603,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5160,7 +4139,7 @@ index dd734e3..4ba6891 100755
/* end confdefs.h. */
int
-@@ -9494,30 +9546,42 @@ main ()
+@@ -9507,30 +9622,42 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -5218,7 +4197,7 @@ index dd734e3..4ba6891 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'
-@@ -9549,20 +9613,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9562,20 +9689,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
@@ -5259,6 +4238,7 @@ index dd734e3..4ba6891 100755
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+ enable_shared_with_static_runtimes=yes
++ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ old_postinstall_cmds='chmod 644 $oldlib'
@@ -5296,20 +4276,21 @@ index dd734e3..4ba6891 100755
;;
darwin* | rhapsody*)
-@@ -9572,7 +9679,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9585,7 +9756,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++
+ else
+ whole_archive_flag_spec=''
+ fi
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -9580,7 +9691,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9593,7 +9769,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -5318,7 +4299,27 @@ index dd734e3..4ba6891 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}"
-@@ -9623,7 +9734,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9611,10 +9787,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
+- ld_shlibs=no
+- ;;
+-
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+@@ -9627,7 +9799,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -9636,7 +9808,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
@@ -5327,7 +4328,7 @@ index dd734e3..4ba6891 100755
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9631,7 +9742,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9644,7 +9816,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hpux9*)
if test "$GCC" = yes; then
@@ -5336,7 +4337,7 @@ index dd734e3..4ba6891 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
-@@ -9646,8 +9757,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9659,14 +9831,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux10*)
@@ -5347,7 +4348,13 @@ index dd734e3..4ba6891 100755
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -9665,16 +9776,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_flag_spec_ld='+b $libdir'
+ 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
;;
hpux11*)
@@ -5367,7 +4374,7 @@ index dd734e3..4ba6891 100755
;;
esac
else
-@@ -9686,7 +9797,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9699,7 +9870,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -5415,7 +4422,7 @@ index dd734e3..4ba6891 100755
;;
esac
fi
-@@ -9714,26 +9864,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9727,26 +9937,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5465,7 +4472,7 @@ index dd734e3..4ba6891 100755
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9795,17 +9958,17 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9808,17 +10031,17 @@ rm -f core conftest.err conftest.$ac_objext \
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5486,7 +4493,7 @@ index dd734e3..4ba6891 100755
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9815,13 +9978,13 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9828,13 +10051,13 @@ rm -f core conftest.err conftest.$ac_objext \
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5503,7 +4510,7 @@ index dd734e3..4ba6891 100755
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -9834,9 +9997,9 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9847,9 +10070,9 @@ rm -f core conftest.err conftest.$ac_objext \
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
@@ -5515,7 +4522,7 @@ index dd734e3..4ba6891 100755
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -10024,44 +10187,50 @@ x|xyes)
+@@ -10037,44 +10260,50 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -5595,7 +4602,19 @@ index dd734e3..4ba6891 100755
;;
esac
fi
-@@ -10232,16 +10401,23 @@ if test "$GCC" = yes; then
+@@ -10232,11 +10461,6 @@ esac
+
+
+
+-
+-
+-
+-
+-
+ { $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
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -5625,7 +4644,7 @@ index dd734e3..4ba6891 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=
-@@ -10254,7 +10430,7 @@ if test "$GCC" = yes; then
+@@ -10267,7 +10498,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -5634,7 +4653,7 @@ index dd734e3..4ba6891 100755
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -10274,7 +10450,13 @@ BEGIN {RS=" "; FS="/|\n";} {
+@@ -10287,7 +10518,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -5649,7 +4668,25 @@ index dd734e3..4ba6891 100755
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10362,7 +10544,7 @@ amigaos*)
+@@ -10313,7 +10550,7 @@ need_version=unknown
+
+ case $host_os in
+ aix3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+@@ -10322,7 +10559,7 @@ aix3*)
+ ;;
+
+ aix[4-9]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+@@ -10375,7 +10612,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5658,7 +4695,16 @@ index dd734e3..4ba6891 100755
;;
esac
;;
-@@ -10393,8 +10575,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -10387,7 +10624,7 @@ beos*)
+ ;;
+
+ bsdi[45]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -10406,8 +10643,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
@@ -5670,7 +4716,7 @@ index dd734e3..4ba6891 100755
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -10415,36 +10598,83 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -10428,36 +10666,83 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -5768,7 +4814,52 @@ index dd734e3..4ba6891 100755
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -10528,6 +10758,20 @@ gnu*)
+@@ -10478,7 +10763,7 @@ darwin* | rhapsody*)
+ ;;
+
+ dgux*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -10486,10 +10771,6 @@ dgux*)
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
+- dynamic_linker=no
+- ;;
+-
+ freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -10497,7 +10778,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[23].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -10515,7 +10796,7 @@ freebsd* | dragonfly*)
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -10535,12 +10816,26 @@ freebsd* | dragonfly*)
+ ;;
+
+ gnu*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -5777,7 +4868,7 @@ index dd734e3..4ba6891 100755
+ ;;
+
+haiku*)
-+ version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
@@ -5789,7 +4880,7 @@ index dd734e3..4ba6891 100755
hardcode_into_libs=yes
;;
-@@ -10573,8 +10817,10 @@ hpux9* | hpux10* | hpux11*)
+@@ -10586,12 +10881,14 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -5801,7 +4892,33 @@ index dd734e3..4ba6891 100755
;;
interix[3-9]*)
-@@ -10641,12 +10887,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -10607,7 +10904,7 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+ fi ;;
+@@ -10644,9 +10941,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10654,12 +10951,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -5824,7 +4941,7 @@ index dd734e3..4ba6891 100755
/* end confdefs.h. */
int
-@@ -10659,13 +10910,17 @@ main ()
+@@ -10672,13 +10974,17 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -5845,7 +4962,7 @@ index dd734e3..4ba6891 100755
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
-@@ -10674,7 +10929,7 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -10687,7 +10993,7 @@ rm -f core conftest.err conftest.$ac_objext \
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -5854,7 +4971,61 @@ index dd734e3..4ba6891 100755
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -10989,6 +11244,11 @@ fi
+@@ -10731,7 +11037,7 @@ netbsd*)
+ ;;
+
+ newsos6)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+@@ -10800,7 +11106,7 @@ rdos*)
+ ;;
+
+ solaris*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10825,7 +11131,7 @@ sunos4*)
+ ;;
+
+ sysv4 | sysv4.3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -10849,7 +11155,7 @@ sysv4 | sysv4.3*)
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -10880,7 +11186,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+
+ tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10890,7 +11196,7 @@ tpf*)
+ ;;
+
+ uts4*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -11002,6 +11308,11 @@ fi
@@ -5866,7 +5037,7 @@ index dd734e3..4ba6891 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=
-@@ -11061,7 +11321,7 @@ else
+@@ -11074,7 +11385,7 @@ else
# 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; }
@@ -5875,7 +5046,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11095,7 +11355,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11108,7 +11419,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
@@ -5884,7 +5055,7 @@ index dd734e3..4ba6891 100755
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11109,12 +11369,12 @@ fi
+@@ -11122,12 +11433,12 @@ fi
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
@@ -5899,7 +5070,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11148,16 +11408,16 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11161,16 +11472,16 @@ LIBS=$ac_check_lib_save_LIBS
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; }
@@ -5919,7 +5090,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11191,12 +11451,12 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11204,12 +11515,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
@@ -5934,7 +5105,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11230,12 +11490,12 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11243,12 +11554,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
@@ -5949,7 +5120,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11269,7 +11529,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11282,7 +11593,7 @@ LIBS=$ac_check_lib_save_LIBS
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; }
@@ -5958,7 +5129,7 @@ index dd734e3..4ba6891 100755
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11310,7 +11570,7 @@ fi
+@@ -11323,7 +11634,7 @@ fi
{ $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; }
@@ -5967,16 +5138,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11319,7 +11579,7 @@ else
+@@ -11332,7 +11643,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11322 "configure"
+-#line 11335 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11360,7 +11620,13 @@ else
+@@ -11373,7 +11684,13 @@ else
# endif
#endif
@@ -5991,7 +5162,7 @@ index dd734e3..4ba6891 100755
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11369,7 +11635,11 @@ int main ()
+@@ -11382,7 +11699,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -6004,7 +5175,7 @@ index dd734e3..4ba6891 100755
/* dlclose (self); */
}
else
-@@ -11406,7 +11676,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
+@@ -11419,7 +11740,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
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; }
@@ -6013,16 +5184,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11415,7 +11685,7 @@ else
+@@ -11428,7 +11749,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11418 "configure"
+-#line 11431 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11456,7 +11726,13 @@ else
+@@ -11469,7 +11790,13 @@ else
# endif
#endif
@@ -6037,7 +5208,7 @@ index dd734e3..4ba6891 100755
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11465,7 +11741,11 @@ int main ()
+@@ -11478,7 +11805,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -6050,7 +5221,7 @@ index dd734e3..4ba6891 100755
/* dlclose (self); */
}
else
-@@ -11622,6 +11902,145 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -11635,6 +11966,145 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC="$lt_save_CC"
@@ -6196,7 +5367,15 @@ index dd734e3..4ba6891 100755
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -11648,6 +12067,8 @@ module_cmds_CXX=
+@@ -11651,7 +12121,6 @@ export_dynamic_flag_spec_CXX=
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ hardcode_libdir_flag_spec_CXX=
+-hardcode_libdir_flag_spec_ld_CXX=
+ hardcode_libdir_separator_CXX=
+ hardcode_minus_L_CXX=no
+ hardcode_shlibpath_var_CXX=unsupported
+@@ -11661,6 +12130,8 @@ module_cmds_CXX=
module_expsym_cmds_CXX=
link_all_deplibs_CXX=unknown
old_archive_cmds_CXX=$old_archive_cmds
@@ -6205,7 +5384,7 @@ index dd734e3..4ba6891 100755
no_undefined_flag_CXX=
whole_archive_flag_spec_CXX=
enable_shared_with_static_runtimes_CXX=no
-@@ -11703,6 +12124,7 @@ $RM -r conftest*
+@@ -11716,6 +12187,7 @@ $RM -r conftest*
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
@@ -6213,7 +5392,7 @@ index dd734e3..4ba6891 100755
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
-@@ -11720,6 +12142,7 @@ $RM -r conftest*
+@@ -11733,6 +12205,7 @@ $RM -r conftest*
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
@@ -6221,7 +5400,7 @@ index dd734e3..4ba6891 100755
compiler=$CC
compiler_CXX=$CC
for cc_temp in $compiler""; do
-@@ -11730,7 +12153,7 @@ $RM -r conftest*
+@@ -11743,7 +12216,7 @@ $RM -r conftest*
*) break;;
esac
done
@@ -6230,7 +5409,7 @@ index dd734e3..4ba6891 100755
if test -n "$compiler"; then
-@@ -11793,7 +12216,7 @@ else
+@@ -11806,7 +12279,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
@@ -6239,7 +5418,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -11830,10 +12253,10 @@ else
+@@ -11843,10 +12316,10 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6252,7 +5431,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -11859,8 +12282,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -11872,8 +12345,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -6263,7 +5442,7 @@ index dd734e3..4ba6891 100755
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -11892,7 +12315,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -11905,7 +12378,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6272,7 +5451,7 @@ index dd734e3..4ba6891 100755
else
GXX=no
-@@ -12002,7 +12425,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -12015,7 +12488,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -6287,7 +5466,7 @@ index dd734e3..4ba6891 100755
/* end confdefs.h. */
int
-@@ -12015,26 +12444,33 @@ main ()
+@@ -12028,26 +12507,33 @@ main ()
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
@@ -6335,7 +5514,7 @@ index dd734e3..4ba6891 100755
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -12043,7 +12479,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12056,7 +12542,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -6350,7 +5529,7 @@ index dd734e3..4ba6891 100755
/* end confdefs.h. */
int
-@@ -12056,30 +12498,42 @@ main ()
+@@ -12069,30 +12561,42 @@ main ()
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
@@ -6408,7 +5587,7 @@ index dd734e3..4ba6891 100755
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -12109,28 +12563,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12122,28 +12626,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
cygwin* | mingw* | pw32* | cegcc*)
@@ -6506,20 +5685,21 @@ index dd734e3..4ba6891 100755
darwin* | rhapsody*)
-@@ -12138,7 +12639,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12151,7 +12702,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
- whole_archive_flag_spec_CXX=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++
+ else
+ whole_archive_flag_spec_CXX=''
+ fi
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -12146,7 +12651,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12159,7 +12715,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -6528,7 +5708,16 @@ index dd734e3..4ba6891 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}"
-@@ -12199,6 +12704,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12193,7 +12749,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ esac
+ ;;
+
+- freebsd[12]*)
++ freebsd2.*)
+ # 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
gnu*)
;;
@@ -6540,7 +5729,7 @@ index dd734e3..4ba6891 100755
hpux9*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12223,11 +12733,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12236,11 +12797,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -6554,7 +5743,7 @@ index dd734e3..4ba6891 100755
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12288,7 +12798,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12301,7 +12862,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -6563,7 +5752,7 @@ index dd734e3..4ba6891 100755
;;
*)
if test "$GXX" = yes; then
-@@ -12298,10 +12808,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12311,10 +12872,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
@@ -6576,7 +5765,7 @@ index dd734e3..4ba6891 100755
;;
esac
fi
-@@ -12331,7 +12841,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12344,7 +12905,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $cc_basename in
CC*)
# SGI C++
@@ -6585,7 +5774,7 @@ index dd734e3..4ba6891 100755
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -12342,9 +12852,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12355,9 +12916,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6597,7 +5786,7 @@ index dd734e3..4ba6891 100755
fi
fi
link_all_deplibs_CXX=yes
-@@ -12373,7 +12883,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12386,7 +12947,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -6606,7 +5795,7 @@ index dd734e3..4ba6891 100755
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12410,26 +12920,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12423,26 +12984,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -6639,7 +5828,7 @@ index dd734e3..4ba6891 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'
;;
-@@ -12437,7 +12947,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12450,7 +13011,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -6648,7 +5837,7 @@ index dd734e3..4ba6891 100755
;;
cxx*)
# Compaq C++
-@@ -12456,9 +12966,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12469,9 +13030,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -6660,7 +5849,7 @@ index dd734e3..4ba6891 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'
-@@ -12478,13 +12988,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12491,13 +13052,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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'
@@ -6676,7 +5865,7 @@ index dd734e3..4ba6891 100755
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -12553,7 +13063,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12566,7 +13127,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
export_dynamic_flag_spec_CXX='${wl}-E'
whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -6685,7 +5874,7 @@ index dd734e3..4ba6891 100755
else
ld_shlibs_CXX=no
fi
-@@ -12588,15 +13098,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12601,15 +13162,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $host in
osf3*)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6704,7 +5893,7 @@ index dd734e3..4ba6891 100755
$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
-@@ -12612,17 +13122,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12625,17 +13186,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -6725,7 +5914,7 @@ index dd734e3..4ba6891 100755
;;
esac
-@@ -12632,7 +13142,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12645,7 +13206,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6734,7 +5923,7 @@ index dd734e3..4ba6891 100755
else
# FIXME: insert proper C++ library support
-@@ -12668,7 +13178,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12681,7 +13242,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
solaris*)
case $cc_basename in
@@ -6743,7 +5932,7 @@ index dd734e3..4ba6891 100755
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
-@@ -12689,7 +13199,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12702,7 +13263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
esac
link_all_deplibs_CXX=yes
@@ -6752,7 +5941,7 @@ index dd734e3..4ba6891 100755
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -12709,14 +13219,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12722,14 +13283,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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
@@ -6770,7 +5959,7 @@ index dd734e3..4ba6891 100755
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -12727,7 +13237,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12740,7 +13301,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6779,7 +5968,7 @@ index dd734e3..4ba6891 100755
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -12781,6 +13291,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12794,6 +13355,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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'
@@ -6790,7 +5979,7 @@ index dd734e3..4ba6891 100755
;;
*)
archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -12842,6 +13356,13 @@ private:
+@@ -12855,6 +13420,14 @@ private:
};
_LT_EOF
@@ -6799,12 +5988,13 @@ index dd734e3..4ba6891 100755
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
++*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -12855,7 +13376,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -12868,7 +13441,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
@@ -6813,7 +6003,7 @@ index dd734e3..4ba6891 100755
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
-@@ -12864,13 +13385,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -12877,13 +13450,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
test $p = "-R"; then
prev=$p
continue
@@ -6840,7 +6030,7 @@ index dd734e3..4ba6891 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.
-@@ -12890,8 +13420,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -12903,8 +13485,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
postdeps_CXX="${postdeps_CXX} ${prev}${p}"
fi
fi
@@ -6851,7 +6041,7 @@ index dd734e3..4ba6891 100755
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
-@@ -12927,6 +13459,7 @@ else
+@@ -12940,6 +13524,7 @@ else
fi
$RM -f confest.$objext
@@ -6859,7 +6049,7 @@ index dd734e3..4ba6891 100755
# PORTME: override above test on systems where it is broken
case $host_os in
-@@ -12962,7 +13495,7 @@ linux*)
+@@ -12975,7 +13560,7 @@ linux*)
solaris*)
case $cc_basename in
@@ -6868,7 +6058,7 @@ index dd734e3..4ba6891 100755
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -13027,8 +13560,6 @@ fi
+@@ -13040,8 +13625,6 @@ fi
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -6877,7 +6067,7 @@ index dd734e3..4ba6891 100755
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13078,6 +13609,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -13091,6 +13674,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -6889,7 +6079,7 @@ index dd734e3..4ba6891 100755
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -13127,6 +13663,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -13140,6 +13728,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
esac
;;
@@ -6901,7 +6091,7 @@ index dd734e3..4ba6891 100755
dgux*)
case $cc_basename in
ec++*)
-@@ -13216,8 +13757,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -13229,8 +13822,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
@@ -6912,7 +6102,7 @@ index dd734e3..4ba6891 100755
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-qpic'
lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -13279,7 +13820,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -13292,7 +13885,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
solaris*)
case $cc_basename in
@@ -6921,7 +6111,7 @@ index dd734e3..4ba6891 100755
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
-@@ -13344,10 +13885,17 @@ case $host_os in
+@@ -13357,10 +13950,17 @@ case $host_os in
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -6942,7 +6132,7 @@ index dd734e3..4ba6891 100755
#
# Check to make sure the PIC flag actually works.
-@@ -13355,7 +13903,7 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+@@ -13368,7 +13968,7 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
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; }
@@ -6951,16 +6141,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -13371,15 +13919,15 @@ else
+@@ -13384,15 +13984,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13374: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13387: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13378: \$? = $ac_status" >&5
+- echo "$as_me:13391: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -6970,7 +6160,7 @@ index dd734e3..4ba6891 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
-@@ -13405,13 +13953,15 @@ fi
+@@ -13418,13 +14018,15 @@ fi
@@ -6987,7 +6177,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -13424,7 +13974,7 @@ else
+@@ -13437,7 +14039,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -6996,7 +6186,7 @@ index dd734e3..4ba6891 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
-@@ -13451,7 +14001,7 @@ fi
+@@ -13464,7 +14066,7 @@ fi
{ $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; }
@@ -7005,16 +6195,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -13470,16 +14020,16 @@ else
+@@ -13483,16 +14085,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13473: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13486: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13477: \$? = $ac_status" >&5
+- echo "$as_me:13490: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -7025,7 +6215,7 @@ index dd734e3..4ba6891 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
-@@ -13503,7 +14053,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+@@ -13516,7 +14118,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
{ $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; }
@@ -7034,16 +6224,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -13522,16 +14072,16 @@ else
+@@ -13535,16 +14137,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13525: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13538: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13529: \$? = $ac_status" >&5
+- echo "$as_me:13542: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -7054,7 +6244,7 @@ index dd734e3..4ba6891 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
-@@ -13582,30 +14132,38 @@ fi
+@@ -13595,30 +14197,40 @@ fi
$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'
@@ -7081,7 +6271,9 @@ index dd734e3..4ba6891 100755
- ;;
- linux* | k*bsd*-gnu)
+ case $cc_basename in
-+ cl*) ;;
++ cl*)
++ exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
++ ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
@@ -7101,7 +6293,7 @@ index dd734e3..4ba6891 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
-@@ -13637,44 +14195,50 @@ x|xyes)
+@@ -13650,44 +14262,50 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -7181,7 +6373,34 @@ index dd734e3..4ba6891 100755
;;
esac
fi
-@@ -13831,7 +14395,7 @@ amigaos*)
+@@ -13755,8 +14373,6 @@ esac
+
+
+
+-
+-
+ { $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
+
+ case $host_os in
+ aix3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+@@ -13791,7 +14407,7 @@ aix3*)
+ ;;
+
+ aix[4-9]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+@@ -13844,7 +14460,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7190,7 +6409,16 @@ index dd734e3..4ba6891 100755
;;
esac
;;
-@@ -13862,8 +14426,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -13856,7 +14472,7 @@ beos*)
+ ;;
+
+ bsdi[45]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -13875,8 +14491,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
@@ -7202,7 +6430,7 @@ index dd734e3..4ba6891 100755
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -13884,36 +14449,82 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -13897,36 +14514,82 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -7299,7 +6527,52 @@ index dd734e3..4ba6891 100755
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -13996,6 +14607,20 @@ gnu*)
+@@ -13946,7 +14609,7 @@ darwin* | rhapsody*)
+ ;;
+
+ dgux*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -13954,10 +14617,6 @@ dgux*)
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
+- dynamic_linker=no
+- ;;
+-
+ freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -13965,7 +14624,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[23].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -13983,7 +14642,7 @@ freebsd* | dragonfly*)
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -14003,12 +14662,26 @@ freebsd* | dragonfly*)
+ ;;
+
+ gnu*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -7308,7 +6581,7 @@ index dd734e3..4ba6891 100755
+ ;;
+
+haiku*)
-+ version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
@@ -7320,7 +6593,7 @@ index dd734e3..4ba6891 100755
hardcode_into_libs=yes
;;
-@@ -14041,8 +14666,10 @@ hpux9* | hpux10* | hpux11*)
+@@ -14054,12 +14727,14 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -7332,7 +6605,33 @@ index dd734e3..4ba6891 100755
;;
interix[3-9]*)
-@@ -14109,12 +14736,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -14075,7 +14750,7 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+ fi ;;
+@@ -14112,9 +14787,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14122,12 +14797,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -7355,7 +6654,7 @@ index dd734e3..4ba6891 100755
/* end confdefs.h. */
int
-@@ -14127,13 +14759,17 @@ main ()
+@@ -14140,13 +14820,17 @@ main ()
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -7376,7 +6675,7 @@ index dd734e3..4ba6891 100755
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
-@@ -14142,7 +14778,7 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -14155,7 +14839,7 @@ rm -f core conftest.err conftest.$ac_objext \
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -7385,7 +6684,61 @@ index dd734e3..4ba6891 100755
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -14406,6 +15042,8 @@ fi
+@@ -14199,7 +14883,7 @@ netbsd*)
+ ;;
+
+ newsos6)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+@@ -14268,7 +14952,7 @@ rdos*)
+ ;;
+
+ solaris*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14293,7 +14977,7 @@ sunos4*)
+ ;;
+
+ sysv4 | sysv4.3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -14317,7 +15001,7 @@ sysv4 | sysv4.3*)
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -14348,7 +15032,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+
+ tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14358,7 +15042,7 @@ tpf*)
+ ;;
+
+ uts4*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -14419,6 +15103,8 @@ fi
@@ -7394,7 +6747,7 @@ index dd734e3..4ba6891 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=
-@@ -14453,6 +15091,7 @@ fi
+@@ -14466,6 +15152,7 @@ fi
fi # test -n "$compiler"
CC=$lt_save_CC
@@ -7402,7 +6755,16 @@ index dd734e3..4ba6891 100755
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
-@@ -14493,7 +15132,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -14494,6 +15181,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
++
++
+ ac_config_commands="$ac_config_commands libtool"
+
+
+@@ -14506,7 +15195,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# 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; }
@@ -7411,7 +6773,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14527,13 +15166,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14540,13 +15229,13 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cv_cvGetRows" >&5
$as_echo "$ac_cv_lib_cv_cvGetRows" >&6; }
@@ -7427,7 +6789,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14567,7 +15206,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14580,7 +15269,7 @@ LIBS=$ac_check_lib_save_LIBS
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; }
@@ -7436,7 +6798,7 @@ index dd734e3..4ba6891 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGEOTRANS 1
_ACEOF
-@@ -14578,7 +15217,7 @@ fi
+@@ -14591,7 +15280,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5
$as_echo_n "checking for fftw_execute in -lfftw3... " >&6; }
@@ -7445,7 +6807,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14612,13 +15251,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14625,13 +15314,13 @@ LIBS=$ac_check_lib_save_LIBS
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; }
@@ -7461,7 +6823,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14652,13 +15291,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14665,13 +15354,13 @@ LIBS=$ac_check_lib_save_LIBS
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; }
@@ -7477,7 +6839,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14692,13 +15331,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14705,13 +15394,13 @@ LIBS=$ac_check_lib_save_LIBS
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; }
@@ -7493,7 +6855,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14732,13 +15371,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14745,13 +15434,13 @@ LIBS=$ac_check_lib_save_LIBS
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; }
@@ -7509,14 +6871,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14772,13 +15411,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14785,7 +15474,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLFetch" >&5
$as_echo "$ac_cv_lib_odbc_SQLFetch" >&6; }
-if test "x$ac_cv_lib_odbc_SQLFetch" = x""yes; then :
+if test "x$ac_cv_lib_odbc_SQLFetch" = xyes; then :
ODBCFOUND=1
- fi
+ else
+ ODBC \(libodbc\) library not found
+@@ -14793,7 +15482,7 @@ fi
{ $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; }
@@ -7525,7 +6889,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14812,13 +15451,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14827,13 +15516,13 @@ LIBS=$ac_check_lib_save_LIBS
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; }
@@ -7541,7 +6905,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14852,7 +15491,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14867,7 +15556,7 @@ LIBS=$ac_check_lib_save_LIBS
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; }
@@ -7550,7 +6914,7 @@ index dd734e3..4ba6891 100755
VIGRAFOUND=1
fi
-@@ -14860,7 +15499,7 @@ fi
+@@ -14875,7 +15564,7 @@ fi
# 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; }
@@ -7559,7 +6923,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14974,8 +15613,7 @@ for ac_header in float.h malloc.h memory.h stdlib.h string.h unistd.h
+@@ -14989,8 +15678,7 @@ for ac_header in float.h malloc.h memory.h stdlib.h string.h unistd.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -7569,7 +6933,7 @@ index dd734e3..4ba6891 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -14987,7 +15625,7 @@ done
+@@ -15002,7 +15690,7 @@ done
for ac_header in wchar.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
@@ -7578,7 +6942,7 @@ index dd734e3..4ba6891 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_WCHAR_H 1
_ACEOF
-@@ -15001,7 +15639,7 @@ done
+@@ -15016,7 +15704,7 @@ done
# 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; }
@@ -7587,7 +6951,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15033,7 +15671,7 @@ else
+@@ -15048,7 +15736,7 @@ else
char b[false == 0 ? 1 : -1];
char c[__bool_true_false_are_defined == 1 ? 1 : -1];
char d[(bool) 0.5 == true ? 1 : -1];
@@ -7596,7 +6960,7 @@ index dd734e3..4ba6891 100755
char f[(_Bool) 0.0 == false ? 1 : -1];
char g[true];
char h[sizeof (_Bool)];
-@@ -15044,25 +15682,6 @@ else
+@@ -15059,25 +15747,6 @@ else
_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];
@@ -7622,7 +6986,7 @@ index dd734e3..4ba6891 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
-@@ -15074,6 +15693,7 @@ int
+@@ -15089,6 +15758,7 @@ int
main ()
{
@@ -7630,7 +6994,7 @@ index dd734e3..4ba6891 100755
*pq |= q;
*pq |= ! q;
/* Refer to every declared value, to avoid compiler optimizations. */
-@@ -15094,7 +15714,7 @@ fi
+@@ -15109,7 +15779,7 @@ fi
{ $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"
@@ -7639,7 +7003,7 @@ index dd734e3..4ba6891 100755
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
-@@ -15111,7 +15731,7 @@ fi
+@@ -15126,7 +15796,7 @@ fi
{ $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; }
@@ -7648,7 +7012,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15191,7 +15811,7 @@ fi
+@@ -15206,7 +15876,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
$as_echo_n "checking for inline... " >&6; }
@@ -7657,7 +7021,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
-@@ -15232,7 +15852,7 @@ _ACEOF
+@@ -15247,7 +15917,7 @@ _ACEOF
esac
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
@@ -7666,7 +7030,7 @@ index dd734e3..4ba6891 100755
else
-@@ -15244,7 +15864,7 @@ fi
+@@ -15259,7 +15929,7 @@ fi
{ $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; }
@@ -7675,7 +7039,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15282,7 +15902,7 @@ fi
+@@ -15297,7 +15967,7 @@ fi
for ac_header in stdlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
@@ -7684,7 +7048,7 @@ index dd734e3..4ba6891 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
-@@ -15293,7 +15913,7 @@ done
+@@ -15308,7 +15978,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
@@ -7693,7 +7057,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15348,7 +15968,7 @@ fi
+@@ -15363,7 +16033,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
$as_echo_n "checking for working memcmp... " >&6; }
@@ -7702,7 +7066,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15411,7 +16031,7 @@ esac
+@@ -15426,7 +16096,7 @@ esac
for ac_header in stdlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
@@ -7711,7 +7075,7 @@ index dd734e3..4ba6891 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
-@@ -15422,7 +16042,7 @@ done
+@@ -15437,7 +16107,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
@@ -7720,7 +7084,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15477,7 +16097,7 @@ fi
+@@ -15492,7 +16162,7 @@ fi
{ $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; }
@@ -7729,7 +7093,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
rm -f conftest.sym conftest.file
-@@ -15539,7 +16159,7 @@ fi
+@@ -15554,7 +16224,7 @@ fi
{ $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; }
@@ -7738,7 +7102,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15585,7 +16205,7 @@ fi
+@@ -15600,7 +16270,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
$as_echo_n "checking for working strtod... " >&6; }
@@ -7747,7 +7111,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15644,14 +16264,14 @@ if test $ac_cv_func_strtod = no; then
+@@ -15659,14 +16329,14 @@ if test $ac_cv_func_strtod = no; then
esac
ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
@@ -7764,7 +7128,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -15685,7 +16305,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -15700,7 +16370,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
$as_echo "$ac_cv_lib_m_pow" >&6; }
@@ -7773,7 +7137,7 @@ index dd734e3..4ba6891 100755
POW_LIB=-lm
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
-@@ -15699,13 +16319,13 @@ fi
+@@ -15714,13 +16384,13 @@ fi
for ac_func in vprintf
do :
ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
@@ -7789,7 +7153,7 @@ index dd734e3..4ba6891 100755
$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-@@ -15719,8 +16339,7 @@ for ac_func in floor memmove memset modf pow sqrt strchr strdup strerror strrchr
+@@ -15734,8 +16404,7 @@ for ac_func in floor memmove memset modf pow sqrt strchr strdup strerror strrchr
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"
@@ -7799,7 +7163,7 @@ index dd734e3..4ba6891 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15735,7 +16354,7 @@ if test "${enable_debug+set}" = set; then :
+@@ -15784,7 +16453,7 @@ if test "${enable_debug+set}" = set; then :
enableval=$enable_debug; case "${enableval}" in
yes) debug=true ;;
no) debug=false ;;
@@ -7808,7 +7172,7 @@ index dd734e3..4ba6891 100755
esac
else
debug=false
-@@ -15755,7 +16374,7 @@ if test "${enable_unicode+set}" = set; then :
+@@ -15804,7 +16473,7 @@ if test "${enable_unicode+set}" = set; then :
enableval=$enable_unicode; case "${enableval}" in
yes) unicode=true ;;
no) unicode=false ;;
@@ -7817,7 +7181,25 @@ index dd734e3..4ba6891 100755
esac
else
unicode=false
-@@ -15826,7 +16445,7 @@ if test "${enable_python+set}" = set; then :
+@@ -15824,7 +16493,7 @@ if test "${enable_gui+set}" = set; then :
+ enableval=$enable_gui; case "${enableval}" in
+ yes) gui=true ;;
+ no) gui=false ;;
+- *) as_fn_error "bad value ${enableval} for --disable-gui" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-gui" "$LINENO" 5 ;;
+ esac
+ else
+ gui=true
+@@ -15855,7 +16524,7 @@ if test "${enable_odbc+set}" = set; then :
+ enableval=$enable_odbc; case "${enableval}" in
+ yes) odbc=true ;;
+ no) odbc=false ;;
+- *) as_fn_error "bad value ${enableval} for --disable-odbc" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --disable-odbc" "$LINENO" 5 ;;
+ esac
+ else
+ odbc=true
+@@ -15936,7 +16605,7 @@ if test "${enable_python+set}" = set; then :
enableval=$enable_python; case "${enableval}" in
yes) python=true ;;
no) python=false ;;
@@ -7826,7 +7208,7 @@ index dd734e3..4ba6891 100755
esac
else
python=false
-@@ -15853,7 +16472,7 @@ do
+@@ -15963,7 +16632,7 @@ do
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; }
@@ -7835,7 +7217,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -15898,13 +16517,13 @@ test -n "$PYTHON" || PYTHON=":"
+@@ -16008,13 +16677,13 @@ test -n "$PYTHON" || PYTHON=":"
if test "$PYTHON" = :; then
@@ -7851,7 +7233,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-@@ -15923,7 +16542,7 @@ $as_echo "$am_cv_python_version" >&6; }
+@@ -16033,7 +16702,7 @@ $as_echo "$am_cv_python_version" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
@@ -7860,7 +7242,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
-@@ -15937,7 +16556,7 @@ $as_echo "$am_cv_python_platform" >&6; }
+@@ -16047,7 +16716,7 @@ $as_echo "$am_cv_python_platform" >&6; }
{ $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; }
@@ -7869,7 +7251,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -15975,7 +16594,7 @@ $as_echo "$am_cv_python_pythondir" >&6; }
+@@ -16085,7 +16754,7 @@ $as_echo "$am_cv_python_pythondir" >&6; }
{ $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; }
@@ -7878,7 +7260,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -16025,7 +16644,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
+@@ -16135,7 +16804,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
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; }
@@ -7887,7 +7269,7 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -16062,7 +16681,7 @@ fi
+@@ -16172,7 +16841,7 @@ fi
if test -z "$PYTHON"; then
@@ -7896,7 +7278,7 @@ index dd734e3..4ba6891 100755
PYTHON_VERSION=""
fi
-@@ -16080,7 +16699,7 @@ $as_echo_n "checking for a version of Python >= '2.1.0'... " >&6; }
+@@ -16190,7 +16859,7 @@ $as_echo_n "checking for a version of Python >= '2.1.0'... " >&6; }
$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;}
@@ -7905,7 +7287,7 @@ index dd734e3..4ba6891 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
-@@ -16089,7 +16708,7 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+@@ -16199,7 +16868,7 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
to something else than an empty string.
@@ -7914,7 +7296,7 @@ index dd734e3..4ba6891 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5
$as_echo "skip at user request" >&6; }
-@@ -16114,7 +16733,7 @@ $as_echo "yes" >&6; }
+@@ -16224,7 +16893,7 @@ $as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7923,7 +7305,7 @@ index dd734e3..4ba6891 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.
-@@ -16135,7 +16754,7 @@ $as_echo "yes" >&6; }
+@@ -16245,7 +16914,7 @@ $as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7932,7 +7314,7 @@ index dd734e3..4ba6891 100755
Please check your Python installation. The error was:
$ac_distutils_result" "$LINENO" 5
PYTHON_VERSION=""
-@@ -16240,7 +16859,7 @@ EOD`
+@@ -16350,7 +17019,7 @@ EOD`
fi
if test -z "PYTHON_LDFLAGS"; then
@@ -7941,7 +7323,7 @@ index dd734e3..4ba6891 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
-@@ -16343,7 +16962,7 @@ $as_echo "$pythonexists" >&6; }
+@@ -16453,7 +17122,7 @@ $as_echo "$pythonexists" >&6; }
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;}
@@ -7950,7 +7332,7 @@ index dd734e3..4ba6891 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.
-@@ -16354,7 +16973,7 @@ as_fn_error "
+@@ -16464,7 +17133,7 @@ as_fn_error "
for your distribution. The exact name of this package varies among them.
============================================================================
@@ -7959,7 +7341,7 @@ index dd734e3..4ba6891 100755
PYTHON_VERSION=""
fi
-@@ -16368,7 +16987,7 @@ See \`config.log' for more details." "$LINENO" 5; }
+@@ -16478,7 +17147,7 @@ See \`config.log' for more details." "$LINENO" 5; }
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; }
@@ -7968,16 +7350,16 @@ index dd734e3..4ba6891 100755
$as_echo_n "(cached) " >&6
else
case $SWIG in
-@@ -16491,7 +17110,7 @@ $as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
+@@ -16601,7 +17270,7 @@ $as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
fi
#AC_CONFIG_FILES([Makefile])
--ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_odbc/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/modules/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile src/modules_contrib/Makefile src/modules_contrib/contrib_a_perego/Makefile src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile src/modules_contrib/contrib_s_liersch/Makefile src/modules_contrib/contrib_s_liersch/ihacres/Makefile src/modules_contrib/garden/Makefile src/modules_contrib/garden/garden_3d_viewer/Makefile src/modules_geostatistics/Makefile src/modules_geostatistics/geostatistics/Makefile src/modules_geostatistics/geostatistics/geostatistics_points/Makefile src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile src/modules_images/Makefile src/modules_images/modules_imagery/Makefile src/modules_images/modules_imagery/imagery_classification/Makefile src/modules_images/modules_imagery/imagery_rga/Makefile src/modules_images/modules_imagery/imagery_segmentation/Makefile src/modules_images/modules_imagery/imagery_tools/Makefile src/modules_images/modules_opencv/Makefile src/modules_images/modules_opencv/opencv/Makefile src/modules_images/modules_vigra/Makefile src/modules_images/modules_vigra/vigra/Makefile src/modules_io/Makefile src/modules_io/esri_e00/Makefile src/modules_io/esri_e00/io_esri_e00/Makefile src/modules_io/db/Makefile src/modules_io/db/io_odbc/Makefile src/modules_io/docs/Makefile src/modules_io/docs/docs_html/Makefile src/modules_io/docs/docs_pdf/Makefile src/modules_io/gdal/Makefile src/modules_io/gdal/io_gdal/Makefile src/modules_io/grid/Makefile src/modules_io/grid/io_grid/Makefile src/modules_io/grid/io_grid_image/Makefile src/modules_io/grid/io_grid_grib2/Makefile src/modules_io/gps/Makefile src/modules_io/gps/io_gps/Makefile src/modules_io/shapes/Makefile src/modules_io/shapes/io_shapes/Makefile src/modules_io/shapes/io_shapes_dxf/Makefile src/modules_io/shapes/io_shapes_las/Makefile src/modules_io/table/Makefile src/modules_io/table/io_table/Makefile src/modules_lectures/Makefile src/modules_lectures/lectures/Makefile src/modules_lectures/lectures/lectures_introduction/Makefile src/modules_projection/Makefile src/modules_projection/pj_georeference/Makefile src/modules_projection/pj_georeference/pj_georeference/Makefile src/modules_projection/pj_proj4/Makefile src/modules_projection/pj_proj4/pj_proj4/Makefile src/modules_recreations/Makefile src/modules_recreations/recreations/Makefile src/modules_recreations/recreations/recreations_fractals/Makefile src/modules_recreations/recreations/recreations_games/Makefile src/modules_simulation/Makefile src/modules_simulation/hydrology/Makefile src/modules_simulation/hydrology/sim_hydrology/Makefile src/modules_simulation/cellular_automata/Makefile src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile src/modules_simulation/ecosystems/Makefile src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile src/modules_simulation/fire/Makefile src/modules_simulation/fire/sim_fire_spreading/Makefile src/modules_terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile"
-+ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_odbc/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/modules/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile src/modules_contrib/Makefile src/modules_contrib/contrib_a_perego/Makefile src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile src/modules_contrib/contrib_s_liersch/Makefile src/modules_contrib/contrib_s_liersch/ihacres/Makefile src/modules_contrib/garden/Makefile src/modules_contrib/garden/garden_3d_viewer/Makefile src/modules_geostatistics/Makefile src/modules_geostatistics/geostatistics/Makefile src/modules_geostatistics/geostatistics/geostatistics_points/Makefile src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile src/modules_images/Makefile src/modules_images/modules_imagery/Makefile src/modules_images/modules_imagery/imagery_classification/Makefile src/modules_images/modules_imagery/imagery_rga/Makefile src/modules_images/modules_imagery/imagery_segmentation/Makefile src/modules_images/modules_imagery/imagery_tools/Makefile src/modules_images/modules_opencv/Makefile src/modules_images/modules_opencv/opencv/Makefile src/modules_images/modules_vigra/Makefile src/modules_images/modules_vigra/vigra/Makefile src/modules_io/Makefile src/modules_io/esri_e00/Makefile src/modules_io/esri_e00/io_esri_e00/Makefile src/modules_io/db/Makefile src/modules_io/db/io_odbc/Makefile src/modules_io/docs/Makefile src/modules_io/docs/docs_html/Makefile src/modules_io/docs/docs_pdf/Makefile src/modules_io/gdal/Makefile src/modules_io/gdal/io_gdal/Makefile src/modules_io/grid/Makefile src/modules_io/grid/io_grid/Makefile src/modules_io/grid/io_grid_image/Makefile src/modules_io/grid/io_grid_grib2/Makefile src/modules_io/gps/Makefile src/modules_io/gps/io_gps/Makefile src/modules_io/shapes/Makefile src/modules_io/shapes/io_shapes/Makefile src/modules_io/shapes/io_shapes_dxf/Makefile src/modules_io/shapes/io_shapes_las/Makefile src/modules_io/table/Makefile src/modules_io/table/io_table/Makefile src/modules_lectures/Makefile src/modules_lectures/lectures/Makefile src/modules_lectures/lectures/lectures_introduction/Makefile src/modules_projection/Makefile src/modules_projection/pj_georeference/Makefile src/modules_projection/pj_georeference/pj_georeference/Makefile src/modules_projection/pj_proj4/Makefile src/modules_projection/pj_proj4/pj_proj4/Makefile src/modules_recreations/Makefile src/modules_recreations/recreations/Makefile src/modules_recreations/recreations/recreations_fractals/Makefile src/modules_recreations/recreations/recreations_games/Makefile src/modules_simulation/Makefile src/modules_simulation/hydrology/Makefile src/modules_simulation/hydrology/sim_hydrology/Makefile src/modules_simulation/cellular_automata/Makefile src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile src/modules_simulation/ecosystems/Makefile src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile src/modules_terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile"
+-ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_odbc/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile src/modules_contrib/Makefile src/modules_contrib/contrib_a_perego/Makefile src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile src/modules_contrib/contrib_s_liersch/Makefile src/modules_contrib/contrib_s_liersch/ihacres/Makefile src/modules_contrib/garden/Makefile src/modules_contrib/garden/garden_3d_viewer/Makefile src/modules_contrib/garden/garden_webservices/Makefile src/modules_geostatistics/Makefile src/modules_geostatistics/geostatistics/Makefile src/modules_geostatistics/geostatistics/geostatistics_points/Makefile src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile src/modules_images/Makefile src/modules_images/modules_imagery/Makefile src/modules_images/modules_imagery/imagery_classification/Makefile src/modules_images/modules_imagery/imagery_rga/Makefile src/modules_images/modules_imagery/imagery_segmentation/Makefile src/modules_images/modules_imagery/imagery_tools/Makefile src/modules_images/modules_opencv/Makefile src/modules_images/modules_opencv/opencv/Makefile src/modules_images/modules_vigra/Makefile src/modules_images/modules_vigra/vigra/Makefile src/modules_io/Makefile src/modules_io/esri_e00/Makefile src/modules_io/esri_e00/io_esri_e00/Makefile src/modules_io/db/Makefile src/modules_io/db/io_odbc/Makefile src/modules_io/docs/Makefile src/modules_io/docs/docs_html/Makefile src/modules_io/docs/docs_pdf/Makefile src/modules_io/gdal/Makefile src/modules_io/gdal/io_gdal/Makefile src/modules_io/grid/Makefile src/modules_io/grid/io_grid/Makefile src/modules_io/grid/io_grid_image/Makefile src/modules_io/grid/io_grid_grib2/Makefile src/modules_io/gps/Makefile src/modules_io/gps/io_gps/Makefile src/modules_io/shapes/Makefile src/modules_io/shapes/io_shapes/Makefile src/modules_io/shapes/io_shapes_dxf/Makefile src/modules_io/shapes/io_shapes_las/Makefile src/modules_io/table/Makefile src/modules_io/table/io_table/Makefile src/modules_lectures/Makefile src/modules_lectures/lectures/Makefile src/modules_lectures/lectures/lectures_introduction/Makefile src/modules_projection/Makefile src/modules_projection/pj_georeference/Makefile src/modules_projection/pj_georeference/pj_georeference/Makefile src/modules_projection/pj_proj4/Makefile src/modules_projection/pj_proj4/pj_proj4/Makefile src/modules_recreations/Makefile src/modules_recreations/recreations/Makefile src/modules_recreations/recreations/recreations_fractals/Makefile src/modules_recreations/recreations/recreations_games/Makefile src/modules_simulation/Makefile src/modules_simulation/hydrology/Makefile src/modules_simulation/hydrology/sim_hydrology/Makefile src/modules_simulation/cellular_automata/Makefile src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile src/modules_simulation/ecosystems/Makefile src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile src/modules_simulation/fire/Makefile src/modules_simulation/fire/sim_fire_spreading/Makefile src/modules_terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile"
++ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_odbc/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile src/modules_contrib/Makefile src/modules_contrib/contrib_a_perego/Makefile src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile src/modules_contrib/contrib_s_liersch/Makefile src/modules_contrib/contrib_s_liersch/ihacres/Makefile src/modules_contrib/garden/Makefile src/modules_contrib/garden/garden_3d_viewer/Makefile src/modules_contrib/garden/garden_webservices/Makefile src/modules_geostatistics/Makefile src/modules_geostatistics/geostatistics/Makefile src/modules_geostatistics/geostatistics/geostatistics_points/Makefile src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile src/modules_images/Makefile src/modules_images/modules_imagery/Makefile src/modules_images/modules_imagery/imagery_classification/Makefile src/modules_images/modules_imagery/imagery_rga/Makefile src/modules_images/modules_imagery/imagery_segmentation/Makefile src/modules_images/modules_imagery/imagery_tools/Makefile src/modules_images/modules_opencv/Makefile src/modules_images/modules_opencv/opencv/Makefile src/modules_images/modules_vigra/Makefile src/modules_images/modules_vigra/vigra/Makefile src/modules_io/Makefile src/modules_io/esri_e00/Makefile src/modules_io/esri_e00/io_esri_e00/Makefile src/modules_io/db/Makefile src/modules_io/db/io_odbc/Makefile src/modules_io/docs/Makefile src/modules_io/docs/docs_html/Makefile src/modules_io/docs/docs_pdf/Makefile src/modules_io/gdal/Makefile src/modules_io/gdal/io_gdal/Makefile src/modules_io/grid/Makefile src/modules_io/grid/io_grid/Makefile src/modules_io/grid/io_grid_image/Makefile src/modules_io/grid/io_grid_grib2/Makefile src/modules_io/gps/Makefile src/modules_io/gps/io_gps/Makefile src/modules_io/shapes/Makefile src/modules_io/shapes/io_shapes/Makefile src/modules_io/shapes/io_shapes_dxf/Makefile src/modules_io/shapes/io_shapes_las/Makefile src/modules_io/table/Makefile src/modules_io/table/io_table/Makefile src/modules_lectures/Makefile src/modules_lectures/lectures/Makefile src/modules_lectures/lectures/lectures_introduction/Makefile src/modules_projection/Makefile src/modules_projection/pj_georeference/Makefile src/modules_projection/pj_georeference/pj_georeference/Makefile src/modules_projection/pj_proj4/Makefile src/modules_projection/pj_proj4/pj_proj4/Makefile src/modules_recreations/Makefile src/modules_recreations/recreations/Makefile src/modules_recreations/recreations/recreations_fractals/Makefile src/modules_recreations/recreations/recreations_games/Makefile src/modules_simulation/Makefile src/modules_simulation/hydrology/Makefile src/modules_simulation/hydrology/sim_hydrology/Makefile src/modules_simulation/cellular_automata/Makefile src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile src/modules_simulation/ecosystems/Makefile src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile src/modules_terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -16557,10 +17176,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+@@ -16667,10 +17336,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
@@ -8001,7 +7383,7 @@ index dd734e3..4ba6891 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;}
-@@ -16612,6 +17242,7 @@ DEFS=`sed -n "$ac_script" confdefs.h`
+@@ -16686,6 +17366,7 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
@@ -8009,7 +7391,7 @@ index dd734e3..4ba6891 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$//'
-@@ -16635,51 +17266,47 @@ else
+@@ -16709,59 +17390,55 @@ else
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -8041,6 +7423,16 @@ index dd734e3..4ba6891 100755
+ as_fn_error $? "conditional \"SAGA_UNICODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${WITH_GUI_TRUE}" && test -z "${WITH_GUI_FALSE}"; then
+- as_fn_error "conditional \"WITH_GUI\" was never defined.
++ as_fn_error $? "conditional \"WITH_GUI\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${WITH_ODBC_TRUE}" && test -z "${WITH_ODBC_FALSE}"; then
+- as_fn_error "conditional \"WITH_ODBC\" was never defined.
++ as_fn_error $? "conditional \"WITH_ODBC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${HAVE_CV_TRUE}" && test -z "${HAVE_CV_FALSE}"; then
- as_fn_error "conditional \"HAVE_CV\" was never defined.
+ as_fn_error $? "conditional \"HAVE_CV\" was never defined.
@@ -8072,7 +7464,7 @@ index dd734e3..4ba6891 100755
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-@@ -16780,6 +17407,7 @@ fi
+@@ -16862,6 +17539,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -8080,7 +7472,7 @@ index dd734e3..4ba6891 100755
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -16825,19 +17453,19 @@ export LANGUAGE
+@@ -16907,19 +17585,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -8108,7 +7500,7 @@ index dd734e3..4ba6891 100755
as_fn_exit $as_status
} # as_fn_error
-@@ -17033,7 +17661,7 @@ $as_echo X"$as_dir" |
+@@ -17115,7 +17793,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -8117,19 +7509,19 @@ index dd734e3..4ba6891 100755
} # as_fn_mkdir_p
-@@ -17087,7 +17715,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+@@ -17169,7 +17847,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
- This file was extended by saga $as_me 2.0.7, which was
+ This file was extended by saga $as_me 2.0.8, which was
-generated by GNU Autoconf 2.65. Invocation command line was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17144,10 +17772,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -17235,10 +17913,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- saga config.status 2.0.7
+ saga config.status 2.0.8
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -8139,7 +7531,7 @@ index dd734e3..4ba6891 100755
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -17165,11 +17793,16 @@ ac_need_defaults=:
+@@ -17256,11 +17934,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
@@ -8157,7 +7549,7 @@ index dd734e3..4ba6891 100755
*)
ac_option=$1
ac_optarg=$2
-@@ -17191,6 +17824,7 @@ do
+@@ -17282,6 +17965,7 @@ do
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -8165,7 +7557,16 @@ index dd734e3..4ba6891 100755
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
-@@ -17201,7 +17835,7 @@ do
+@@ -17294,7 +17978,7 @@ do
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+- as_fn_error "ambiguous option: \`$1'
++ as_fn_error $? "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+@@ -17303,7 +17987,7 @@ Try \`$0 --help' for more information.";;
ac_cs_silent=: ;;
# This is an error.
@@ -8174,7 +7575,7 @@ index dd734e3..4ba6891 100755
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
-@@ -17255,184 +17889,208 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+@@ -17357,184 +18041,208 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -8357,6 +7758,7 @@ index dd734e3..4ba6891 100755
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
++PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -8439,7 +7841,6 @@ index dd734e3..4ba6891 100755
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -8511,7 +7912,6 @@ index dd734e3..4ba6891 100755
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -8551,11 +7951,12 @@ index dd734e3..4ba6891 100755
-for var in SED \
+for var in SHELL \
+ECHO \
++PATH_SEPARATOR \
+SED \
GREP \
EGREP \
FGREP \
-@@ -17445,8 +18103,13 @@ reload_flag \
+@@ -17547,8 +18255,13 @@ reload_flag \
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
@@ -8569,7 +7970,7 @@ index dd734e3..4ba6891 100755
STRIP \
RANLIB \
CC \
-@@ -17456,14 +18119,14 @@ lt_cv_sys_global_symbol_pipe \
+@@ -17558,14 +18271,14 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -8587,15 +7988,17 @@ index dd734e3..4ba6891 100755
DSYMUTIL \
NMEDIT \
LIPO \
-@@ -17479,7 +18142,6 @@ no_undefined_flag \
+@@ -17579,9 +18292,7 @@ with_gnu_ld \
+ allow_undefined_flag \
+ no_undefined_flag \
hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
+-hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
-fix_srcfile_path \
exclude_expsyms \
include_expsyms \
file_list_spec \
-@@ -17487,6 +18149,7 @@ variables_saved_for_relink \
+@@ -17589,6 +18300,7 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
@@ -8603,7 +8006,7 @@ index dd734e3..4ba6891 100755
finish_eval \
old_striplib \
striplib \
-@@ -17497,10 +18160,11 @@ predeps \
+@@ -17599,10 +18311,11 @@ predeps \
postdeps \
compiler_lib_search_path \
LD_CXX \
@@ -8616,15 +8019,17 @@ index dd734e3..4ba6891 100755
lt_prog_compiler_static_CXX \
lt_cv_prog_compiler_c_o_CXX \
export_dynamic_flag_spec_CXX \
-@@ -17512,7 +18176,6 @@ no_undefined_flag_CXX \
+@@ -17612,9 +18325,7 @@ with_gnu_ld_CXX \
+ allow_undefined_flag_CXX \
+ no_undefined_flag_CXX \
hardcode_libdir_flag_spec_CXX \
- hardcode_libdir_flag_spec_ld_CXX \
+-hardcode_libdir_flag_spec_ld_CXX \
hardcode_libdir_separator_CXX \
-fix_srcfile_path_CXX \
exclude_expsyms_CXX \
include_expsyms_CXX \
file_list_spec_CXX \
-@@ -17522,9 +18185,9 @@ postdep_objects_CXX \
+@@ -17624,9 +18335,9 @@ postdep_objects_CXX \
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
@@ -8636,7 +8041,7 @@ index dd734e3..4ba6891 100755
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17546,11 +18209,13 @@ module_cmds \
+@@ -17648,11 +18359,13 @@ module_cmds \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
@@ -8650,7 +8055,7 @@ index dd734e3..4ba6891 100755
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
-@@ -17559,10 +18224,11 @@ archive_expsym_cmds_CXX \
+@@ -17661,10 +18374,11 @@ archive_expsym_cmds_CXX \
module_cmds_CXX \
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
@@ -8665,7 +8070,7 @@ index dd734e3..4ba6891 100755
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17570,12 +18236,6 @@ prelink_cmds_CXX; do
+@@ -17672,12 +18386,6 @@ prelink_cmds_CXX; do
esac
done
@@ -8678,7 +8083,7 @@ index dd734e3..4ba6891 100755
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -17708,8 +18368,6 @@ do
+@@ -17812,8 +18520,6 @@ do
"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" ;;
@@ -8687,7 +8092,7 @@ index dd734e3..4ba6891 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" ;;
-@@ -17719,7 +18377,7 @@ do
+@@ -17824,7 +18530,7 @@ do
"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" ;;
@@ -8696,7 +8101,7 @@ index dd734e3..4ba6891 100755
esac
done
-@@ -17741,9 +18399,10 @@ fi
+@@ -17847,9 +18553,10 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
@@ -8709,7 +8114,7 @@ index dd734e3..4ba6891 100755
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
-@@ -17751,12 +18410,13 @@ $debug ||
+@@ -17857,12 +18564,13 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
@@ -8725,7 +8130,7 @@ index dd734e3..4ba6891 100755
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -17773,12 +18433,12 @@ if test "x$ac_cr" = x; then
+@@ -17879,12 +18587,12 @@ if test "x$ac_cr" = x; then
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
@@ -8740,7 +8145,7 @@ index dd734e3..4ba6891 100755
_ACEOF
-@@ -17787,18 +18447,18 @@ _ACEOF
+@@ -17893,18 +18601,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -8763,7 +8168,7 @@ index dd734e3..4ba6891 100755
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -17806,7 +18466,7 @@ done
+@@ -17912,7 +18620,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -8772,7 +8177,7 @@ index dd734e3..4ba6891 100755
_ACEOF
sed -n '
h
-@@ -17854,7 +18514,7 @@ t delim
+@@ -17960,7 +18668,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
@@ -8781,7 +8186,7 @@ index dd734e3..4ba6891 100755
for (key in S) S_is_set[key] = 1
FS = ""
-@@ -17886,21 +18546,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+@@ -17992,21 +18700,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
@@ -8820,7 +8225,40 @@ index dd734e3..4ba6891 100755
s/^[^=]*=[ ]*$//
}'
fi
-@@ -17918,7 +18586,7 @@ do
+@@ -18018,7 +18734,7 @@ fi # test -n "$CONFIG_FILES"
+ # 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
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+
+@@ -18030,11 +18746,11 @@ _ACEOF
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+- if test -z "$ac_t"; then
++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++ if test -z "$ac_tt"; then
+ break
+ elif $ac_last_try; then
+- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -18119,7 +18835,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+- as_fn_error "could not setup config headers machinery" "$LINENO" 5
++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+
+
+@@ -18132,7 +18848,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -8829,7 +8267,7 @@ index dd734e3..4ba6891 100755
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -17937,7 +18605,7 @@ do
+@@ -18151,7 +18867,7 @@ do
for ac_f
do
case $ac_f in
@@ -8838,7 +8276,7 @@ index dd734e3..4ba6891 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 `:'.
-@@ -17946,7 +18614,7 @@ do
+@@ -18160,7 +18876,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -8847,7 +8285,7 @@ index dd734e3..4ba6891 100755
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -17972,8 +18640,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
+@@ -18186,8 +18902,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
@@ -8858,7 +8296,7 @@ index dd734e3..4ba6891 100755
esac
;;
esac
-@@ -18109,23 +18777,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
+@@ -18323,23 +19039,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
@@ -8891,19 +8329,49 @@ index dd734e3..4ba6891 100755
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
-
-
-@@ -18252,7 +18921,8 @@ $as_echo X"$file" |
+ :H)
+ #
+@@ -18348,21 +19065,21 @@ which seems to be undefined. Please make sure it is defined." >&2;}
+ if test x"$ac_file" != x-; then
+ {
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+- } >"$tmp/config.h" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
+- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++ } >"$ac_tmp/config.h" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+- mv "$tmp/config.h" "$ac_file" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ mv "$ac_tmp/config.h" "$ac_file" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+- || as_fn_error "could not create -" "$LINENO" 5
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
++ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -18523,7 +19240,8 @@ $as_echo X"$file" |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-+# Inc.
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -18300,6 +18970,12 @@ pic_mode=$pic_mode
+@@ -18571,6 +19289,15 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -8913,10 +8381,13 @@ index dd734e3..4ba6891 100755
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
++# The PATH separator for the build system.
++PATH_SEPARATOR=$lt_PATH_SEPARATOR
++
# The host system.
host_alias=$host_alias
host=$host
-@@ -18349,9 +19025,11 @@ SP2NL=$lt_lt_SP2NL
+@@ -18620,9 +19347,11 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -8931,7 +8402,7 @@ index dd734e3..4ba6891 100755
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
-@@ -18359,13 +19037,30 @@ OBJDUMP=$lt_OBJDUMP
+@@ -18630,13 +19359,30 @@ OBJDUMP=$lt_OBJDUMP
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -8963,7 +8434,7 @@ index dd734e3..4ba6891 100755
# A symbol stripping program.
STRIP=$lt_STRIP
-@@ -18374,6 +19069,9 @@ RANLIB=$lt_RANLIB
+@@ -18645,6 +19391,9 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -8973,7 +8444,7 @@ index dd734e3..4ba6891 100755
# A C compiler.
LTCC=$lt_CC
-@@ -18392,14 +19090,14 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+@@ -18663,14 +19412,14 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
@@ -8994,7 +8465,7 @@ index dd734e3..4ba6891 100755
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -18407,6 +19105,9 @@ MAGIC_CMD=$MAGIC_CMD
+@@ -18678,6 +19427,9 @@ MAGIC_CMD=$MAGIC_CMD
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
@@ -9004,7 +8475,7 @@ index dd734e3..4ba6891 100755
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
-@@ -18463,6 +19164,9 @@ library_names_spec=$lt_library_names_spec
+@@ -18734,6 +19486,9 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -9014,7 +8485,7 @@ index dd734e3..4ba6891 100755
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -18502,6 +19206,10 @@ striplib=$lt_striplib
+@@ -18773,6 +19528,10 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
@@ -9025,7 +8496,7 @@ index dd734e3..4ba6891 100755
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -18514,12 +19222,12 @@ with_gcc=$GCC
+@@ -18785,12 +19544,12 @@ with_gcc=$GCC
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
@@ -9041,7 +8512,18 @@ index dd734e3..4ba6891 100755
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
-@@ -18606,9 +19314,6 @@ inherit_rpath=$inherit_rpath
+@@ -18840,10 +19599,6 @@ no_undefined_flag=$lt_no_undefined_flag
+ # This must work even if \$libdir does not exist
+ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+-# If ld is used when linking, flag to hardcode \$libdir into a binary
+-# during linking. This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+-
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+@@ -18877,9 +19632,6 @@ inherit_rpath=$inherit_rpath
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
@@ -9051,7 +8533,7 @@ index dd734e3..4ba6891 100755
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -18624,6 +19329,9 @@ include_expsyms=$lt_include_expsyms
+@@ -18895,6 +19647,9 @@ include_expsyms=$lt_include_expsyms
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
@@ -9061,7 +8543,7 @@ index dd734e3..4ba6891 100755
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
-@@ -18670,212 +19378,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -18941,212 +19696,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
# 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?
@@ -9437,7 +8919,7 @@ index dd734e3..4ba6891 100755
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
-@@ -18887,6 +19552,10 @@ _LT_EOF
+@@ -19158,6 +19870,10 @@ _LT_EOF
# The linker used to build libraries.
LD=$lt_LD_CXX
@@ -9448,7 +8930,7 @@ index dd734e3..4ba6891 100755
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
-@@ -18899,12 +19568,12 @@ with_gcc=$GCC_CXX
+@@ -19170,12 +19886,12 @@ with_gcc=$GCC_CXX
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
@@ -9464,7 +8946,18 @@ index dd734e3..4ba6891 100755
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static_CXX
-@@ -18991,9 +19660,6 @@ inherit_rpath=$inherit_rpath_CXX
+@@ -19225,10 +19941,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX
+ # This must work even if \$libdir does not exist
+ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+-# If ld is used when linking, flag to hardcode \$libdir into a binary
+-# during linking. This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+-
+ # 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
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs_CXX
@@ -9474,7 +8967,7 @@ index dd734e3..4ba6891 100755
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -19009,6 +19675,9 @@ include_expsyms=$lt_include_expsyms_CXX
+@@ -19280,6 +19989,9 @@ include_expsyms=$lt_include_expsyms_CXX
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds_CXX
@@ -9484,7 +8977,7 @@ index dd734e3..4ba6891 100755
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec_CXX
-@@ -19043,7 +19712,7 @@ _ACEOF
+@@ -19314,7 +20026,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
@@ -9493,7 +8986,7 @@ index dd734e3..4ba6891 100755
# configure is writing to config.log, and then calls config.status.
-@@ -19064,7 +19733,7 @@ if test "$no_create" != yes; then
+@@ -19335,7 +20047,7 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -9503,23 +8996,25 @@ index dd734e3..4ba6891 100755
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
-index 7ed280b..6f650ae 100755
+old mode 100755
+new mode 100644
+index 7ed280b..c7d06c3
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6b
-+# libtool (GNU libtool) 2.4
++# libtool (GNU libtool) 2.4.2
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
++# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-@@ -32,50 +32,56 @@
+@@ -32,50 +32,57 @@
#
# Provide generalized library-building support services.
#
@@ -9543,6 +9038,7 @@ index 7ed280b..6f650ae 100755
+# --quiet, --silent don't print informational messages
+# --no-quiet, --no-silent
+# print informational messages (default)
++# --no-warn don't display warning messages
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print more informational messages than default
+# --no-verbose don't print the extra informational messages
@@ -9587,7 +9083,7 @@ index 7ed280b..6f650ae 100755
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
-+# $progname: (GNU libtool) 2.4 Debian-2.4-2
++# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1
+# automake: $automake_version
+# autoconf: $autoconf_version
#
@@ -9599,14 +9095,14 @@ index 7ed280b..6f650ae 100755
+PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
-+VERSION="2.4 Debian-2.4-2"
++VERSION="2.4.2 Debian-2.4.2-1"
TIMESTAMP=""
-package_revision=1.3017
-+package_revision=1.3293
++package_revision=1.3337
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -91,10 +97,15 @@ fi
+@@ -91,10 +98,15 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
@@ -9625,7 +9121,7 @@ index 7ed280b..6f650ae 100755
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -107,15 +118,24 @@ do
+@@ -107,24 +119,28 @@ do
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
@@ -9647,11 +9143,20 @@ index 7ed280b..6f650ae 100755
: ${CP="cp -f"}
-: ${ECHO="echo"}
+-: ${EGREP="/bin/grep -E"}
+-: ${FGREP="/bin/grep -F"}
+-: ${GREP="/bin/grep"}
+-: ${LN_S="ln -s"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
- : ${EGREP="/bin/grep -E"}
- : ${FGREP="/bin/grep -F"}
- : ${GREP="/bin/grep"}
-@@ -144,6 +164,27 @@ IFS=" $lt_nl"
+ : ${MAKE="make"}
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+-: ${SED="/bin/sed"}
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+ : ${Xsed="$SED -e 1s/^X//"}
+
+@@ -144,6 +160,27 @@ IFS=" $lt_nl"
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
@@ -9679,7 +9184,7 @@ index 7ed280b..6f650ae 100755
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
-@@ -158,33 +199,183 @@ basename="s,^.*/,,"
+@@ -158,33 +195,183 @@ basename="s,^.*/,,"
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
@@ -9883,7 +9388,16 @@ index 7ed280b..6f650ae 100755
# Make sure we have an absolute path for reexecution:
case $progpath in
-@@ -215,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+@@ -196,7 +383,7 @@ case $progpath in
+ ;;
+ *)
+ save_IFS="$IFS"
+- IFS=:
++ IFS=${PATH_SEPARATOR-:}
+ for progdir in $PATH; do
+ IFS="$save_IFS"
+ test -x "$progdir/$progname" && break
+@@ -215,6 +402,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
@@ -9899,7 +9413,7 @@ index 7ed280b..6f650ae 100755
# 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 +443,7 @@ opt_warning=:
+@@ -243,7 +439,7 @@ opt_warning=:
# name if it has been set yet.
func_echo ()
{
@@ -9908,7 +9422,7 @@ index 7ed280b..6f650ae 100755
}
# func_verbose arg...
-@@ -258,18 +458,25 @@ func_verbose ()
+@@ -258,18 +454,25 @@ func_verbose ()
:
}
@@ -9936,7 +9450,7 @@ index 7ed280b..6f650ae 100755
# bash bug again:
:
-@@ -326,9 +533,9 @@ func_mkdir_p ()
+@@ -326,9 +529,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
@@ -9948,7 +9462,7 @@ index 7ed280b..6f650ae 100755
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
-@@ -378,7 +585,7 @@ func_mktempdir ()
+@@ -378,7 +581,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
@@ -9957,7 +9471,7 @@ index 7ed280b..6f650ae 100755
}
-@@ -392,7 +599,7 @@ func_quote_for_eval ()
+@@ -392,7 +595,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
@@ -9966,7 +9480,7 @@ index 7ed280b..6f650ae 100755
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
-@@ -419,7 +626,7 @@ func_quote_for_expand ()
+@@ -419,7 +622,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
@@ -9975,7 +9489,7 @@ index 7ed280b..6f650ae 100755
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
-@@ -488,15 +695,39 @@ func_show_eval_locale ()
+@@ -488,15 +691,39 @@ func_show_eval_locale ()
fi
}
@@ -10018,7 +9532,7 @@ index 7ed280b..6f650ae 100755
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -509,22 +740,28 @@ func_version ()
+@@ -509,22 +736,28 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
@@ -10051,9 +9565,14 @@ index 7ed280b..6f650ae 100755
s/^# //
s/^# *$//
s*\$progname*'$progname'*
-@@ -537,8 +774,15 @@ func_help ()
- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+@@ -534,11 +767,18 @@ func_help ()
+ s*\$LTCFLAGS*'"$LTCFLAGS"'*
+ s*\$LD*'"$LD"'*
+ s/\$with_gnu_ld/'"$with_gnu_ld"'/
+- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
++ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
++ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
p
- }' < "$progpath"
- exit $?
@@ -10069,7 +9588,7 @@ index 7ed280b..6f650ae 100755
}
# func_missing_arg argname
-@@ -546,63 +790,106 @@ func_help ()
+@@ -546,63 +786,106 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
@@ -10207,7 +9726,7 @@ index 7ed280b..6f650ae 100755
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
-@@ -636,16 +923,16 @@ func_config ()
+@@ -636,16 +919,16 @@ func_config ()
# Display the features supported by this script.
func_features ()
{
@@ -10229,7 +9748,7 @@ index 7ed280b..6f650ae 100755
fi
exit $?
-@@ -692,117 +979,204 @@ func_enable_tag ()
+@@ -692,117 +975,209 @@ func_enable_tag ()
esac
}
@@ -10265,31 +9784,7 @@ index 7ed280b..6f650ae 100755
+$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
+}
@@ -10332,32 +9827,57 @@ index 7ed280b..6f650ae 100755
+opt_help=false
+opt_help_all=false
+opt_silent=:
++opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
-- # 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.
-+{
-+ # this just eases exit handling
-+ while test $# -gt 0; do
- opt="$1"
- shift
--
- case $opt in
-- --config) func_config ;;
--
-- --debug) preserve_args="$preserve_args $opt"
-+ --debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
-- opt_debug='set -x'
- $opt_debug
- ;;
--
-- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
+- # 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.
++{
++ # this just eases exit handling
++ while test $# -gt 0; do
+ opt="$1"
+ shift
+-
+ case $opt in
+- --config) func_config ;;
+-
+- --debug) preserve_args="$preserve_args $opt"
++ --debug|-x) opt_debug='set -x'
+ func_echo "enabling shell trace mode"
+- opt_debug='set -x'
+ $opt_debug
+ ;;
+-
+- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
- execute_dlfiles="$execute_dlfiles $1"
- shift
+ --dry-run|--dryrun|-n)
@@ -10447,6 +9967,10 @@ index 7ed280b..6f650ae 100755
- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
- preserve_args="$preserve_args $opt $1"
- func_enable_tag "$1" # tagname is set here
++ --no-warning|--no-warn)
++ opt_warning=false
++func_append preserve_args " $opt"
++ ;;
+ --no-verbose)
+ opt_verbose=false
+func_append preserve_args " $opt"
@@ -10518,7 +10042,7 @@ index 7ed280b..6f650ae 100755
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
-@@ -810,82 +1184,44 @@ func_enable_tag ()
+@@ -810,82 +1185,44 @@ func_enable_tag ()
opt_duplicate_compiler_generated_deps=:
;;
*)
@@ -10625,7 +10149,7 @@ index 7ed280b..6f650ae 100755
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
-@@ -950,12 +1286,9 @@ func_ltwrapper_executable_p ()
+@@ -950,12 +1287,9 @@ func_ltwrapper_executable_p ()
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
@@ -10641,7 +10165,7 @@ index 7ed280b..6f650ae 100755
}
# func_ltwrapper_p file
-@@ -1001,6 +1334,37 @@ func_source ()
+@@ -1001,6 +1335,37 @@ func_source ()
}
@@ -10679,7 +10203,7 @@ index 7ed280b..6f650ae 100755
# 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 +1377,15 @@ func_infer_tag ()
+@@ -1013,13 +1378,15 @@ func_infer_tag ()
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -10698,7 +10222,7 @@ index 7ed280b..6f650ae 100755
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
-@@ -1030,11 +1396,13 @@ func_infer_tag ()
+@@ -1030,11 +1397,13 @@ func_infer_tag ()
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -10715,7 +10239,7 @@ index 7ed280b..6f650ae 100755
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
-@@ -1097,6 +1465,486 @@ EOF
+@@ -1097,6 +1466,486 @@ EOF
}
}
@@ -11202,7 +10726,7 @@ index 7ed280b..6f650ae 100755
# func_mode_compile arg...
func_mode_compile ()
{
-@@ -1137,12 +1985,12 @@ func_mode_compile ()
+@@ -1137,12 +1986,12 @@ func_mode_compile ()
;;
-pie | -fpie | -fPIE)
@@ -11217,7 +10741,7 @@ index 7ed280b..6f650ae 100755
continue
;;
-@@ -1163,15 +2011,14 @@ func_mode_compile ()
+@@ -1163,15 +2012,14 @@ func_mode_compile ()
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
@@ -11235,7 +10759,7 @@ index 7ed280b..6f650ae 100755
continue
;;
-@@ -1187,8 +2034,7 @@ func_mode_compile ()
+@@ -1187,8 +2035,7 @@ func_mode_compile ()
esac # case $arg_mode
# Aesthetically quote the previous argument.
@@ -11245,16 +10769,16 @@ index 7ed280b..6f650ae 100755
done # for arg
case $arg_mode in
-@@ -1213,7 +2059,7 @@ func_mode_compile ()
+@@ -1213,7 +2060,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
++ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
-@@ -1288,7 +2134,7 @@ func_mode_compile ()
+@@ -1288,7 +2135,7 @@ func_mode_compile ()
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
@@ -11263,7 +10787,7 @@ index 7ed280b..6f650ae 100755
lockfile="$output_obj.lock"
else
output_obj=
-@@ -1319,17 +2165,16 @@ compiler."
+@@ -1319,17 +2166,16 @@ compiler."
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
@@ -11285,7 +10809,7 @@ index 7ed280b..6f650ae 100755
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
-@@ -1349,7 +2194,7 @@ compiler."
+@@ -1349,7 +2195,7 @@ compiler."
if test -z "$output_obj"; then
# Place PIC objects in $objdir
@@ -11294,7 +10818,7 @@ index 7ed280b..6f650ae 100755
fi
func_show_eval_locale "$command" \
-@@ -1396,11 +2241,11 @@ compiler."
+@@ -1396,11 +2242,11 @@ compiler."
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
@@ -11308,7 +10832,7 @@ index 7ed280b..6f650ae 100755
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-@@ -1445,13 +2290,13 @@ compiler."
+@@ -1445,13 +2291,13 @@ compiler."
}
$opt_help || {
@@ -11324,7 +10848,7 @@ index 7ed280b..6f650ae 100755
"")
# Generic help is extracted from the usage comments
# at the start of this file.
-@@ -1482,10 +2327,11 @@ This mode accepts the following additional options:
+@@ -1482,10 +2328,11 @@ This mode accepts the following additional options:
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
@@ -11338,7 +10862,7 @@ index 7ed280b..6f650ae 100755
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
-@@ -1538,7 +2384,7 @@ either the \`install' or \`cp' program.
+@@ -1538,7 +2385,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -11347,7 +10871,7 @@ index 7ed280b..6f650ae 100755
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
-@@ -1558,6 +2404,8 @@ The following components of LINK-COMMAND are treated specially:
+@@ -1558,6 +2405,8 @@ The following components of LINK-COMMAND are treated specially:
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
@@ -11356,7 +10880,7 @@ index 7ed280b..6f650ae 100755
-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 +2434,11 @@ The following components of LINK-COMMAND are treated specially:
+@@ -1586,6 +2435,11 @@ The following components of LINK-COMMAND are treated specially:
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
@@ -11368,7 +10892,7 @@ index 7ed280b..6f650ae 100755
All other options (arguments beginning with \`-') are ignored.
-@@ -1619,18 +2472,44 @@ Otherwise, only FILE itself is deleted using RM."
+@@ -1619,18 +2473,44 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
@@ -11419,7 +10943,7 @@ index 7ed280b..6f650ae 100755
# func_mode_execute arg...
-@@ -1643,13 +2522,16 @@ func_mode_execute ()
+@@ -1643,13 +2523,16 @@ func_mode_execute ()
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
@@ -11437,7 +10961,7 @@ index 7ed280b..6f650ae 100755
# 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 +2553,7 @@ func_mode_execute ()
+@@ -1671,7 +2554,7 @@ func_mode_execute ()
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
@@ -11446,7 +10970,7 @@ index 7ed280b..6f650ae 100755
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-@@ -1712,7 +2594,7 @@ func_mode_execute ()
+@@ -1712,7 +2595,7 @@ func_mode_execute ()
for file
do
case $file in
@@ -11455,7 +10979,7 @@ index 7ed280b..6f650ae 100755
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
-@@ -1728,8 +2610,7 @@ func_mode_execute ()
+@@ -1728,8 +2611,7 @@ func_mode_execute ()
;;
esac
# Quote arguments (to preserve shell metacharacters).
@@ -11465,7 +10989,7 @@ index 7ed280b..6f650ae 100755
done
if test "X$opt_dry_run" = Xfalse; then
-@@ -1754,29 +2635,66 @@ func_mode_execute ()
+@@ -1754,29 +2636,66 @@ func_mode_execute ()
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
@@ -11479,16 +11003,22 @@ index 7ed280b..6f650ae 100755
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-+
-+
-+# func_mode_finish arg...
-+func_mode_finish ()
-+{
-+ $opt_debug
+
+
+ # func_mode_finish arg...
+ func_mode_finish ()
+ {
+ $opt_debug
+- libdirs="$nonopt"
+ libs=
+ libdirs=
-+ admincmds=
-+
+ admincmds=
+
+- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+- for dir
+- do
+- libdirs="$libdirs $dir"
+- done
+ for opt in "$nonopt" ${1+"$@"}
+ do
+ if test -d "$opt"; then
@@ -11505,7 +11035,7 @@ index 7ed280b..6f650ae 100755
+ 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"`
@@ -11513,13 +11043,7 @@ index 7ed280b..6f650ae 100755
+ 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
@@ -11536,16 +11060,11 @@ index 7ed280b..6f650ae 100755
+ fi
+ fi
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-- for dir
-- do
-- libdirs="$libdirs $dir"
-- done
--
++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
-@@ -1786,7 +2704,7 @@ func_mode_finish ()
+@@ -1786,7 +2705,7 @@ func_mode_finish ()
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
@@ -11554,7 +11073,7 @@ index 7ed280b..6f650ae 100755
$cmds"
fi
done
-@@ -1795,53 +2713,55 @@ func_mode_finish ()
+@@ -1795,53 +2714,55 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
@@ -11652,7 +11171,7 @@ index 7ed280b..6f650ae 100755
# func_mode_install arg...
-@@ -1852,7 +2772,7 @@ func_mode_install ()
+@@ -1852,7 +2773,7 @@ func_mode_install ()
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -11661,7 +11180,7 @@ index 7ed280b..6f650ae 100755
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
-@@ -1866,7 +2786,12 @@ func_mode_install ()
+@@ -1866,7 +2787,12 @@ func_mode_install ()
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
@@ -11675,7 +11194,7 @@ index 7ed280b..6f650ae 100755
# We need to accept at least all the BSD install flags.
dest=
-@@ -1876,10 +2801,12 @@ func_mode_install ()
+@@ -1876,10 +2802,12 @@ func_mode_install ()
install_type=
isdir=no
stripme=
@@ -11689,7 +11208,7 @@ index 7ed280b..6f650ae 100755
dest=$arg
continue
fi
-@@ -1887,10 +2814,9 @@ func_mode_install ()
+@@ -1887,10 +2815,9 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
@@ -11703,7 +11222,7 @@ index 7ed280b..6f650ae 100755
;;
-g | -m | -o)
prev=$arg
-@@ -1904,6 +2830,10 @@ func_mode_install ()
+@@ -1904,6 +2831,10 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
@@ -11714,7 +11233,7 @@ index 7ed280b..6f650ae 100755
prev=
else
dest=$arg
-@@ -1914,7 +2844,11 @@ func_mode_install ()
+@@ -1914,7 +2845,11 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
@@ -11727,7 +11246,7 @@ index 7ed280b..6f650ae 100755
done
test -z "$install_prog" && \
-@@ -1923,6 +2857,13 @@ func_mode_install ()
+@@ -1923,6 +2858,13 @@ func_mode_install ()
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
@@ -11741,7 +11260,7 @@ index 7ed280b..6f650ae 100755
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
-@@ -1977,10 +2918,13 @@ func_mode_install ()
+@@ -1977,10 +2919,13 @@ func_mode_install ()
case $file in
*.$libext)
# Do the static libraries later.
@@ -11756,7 +11275,7 @@ index 7ed280b..6f650ae 100755
# 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 +2938,23 @@ func_mode_install ()
+@@ -1994,23 +2939,23 @@ func_mode_install ()
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
@@ -11784,7 +11303,7 @@ index 7ed280b..6f650ae 100755
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
-@@ -2023,9 +2967,9 @@ func_mode_install ()
+@@ -2023,9 +2968,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -11796,7 +11315,7 @@ index 7ed280b..6f650ae 100755
fi
func_warning "relinking \`$file'"
-@@ -2043,7 +2987,7 @@ func_mode_install ()
+@@ -2043,7 +2988,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
@@ -11805,7 +11324,7 @@ index 7ed280b..6f650ae 100755
'exit $?'
tstripme="$stripme"
case $host_os in
-@@ -2083,7 +3027,7 @@ func_mode_install ()
+@@ -2083,7 +3028,7 @@ func_mode_install ()
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -11814,7 +11333,7 @@ index 7ed280b..6f650ae 100755
;;
*.lo)
-@@ -2183,7 +3127,7 @@ func_mode_install ()
+@@ -2183,7 +3128,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
@@ -11823,7 +11342,7 @@ index 7ed280b..6f650ae 100755
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
-@@ -2202,7 +3146,7 @@ func_mode_install ()
+@@ -2202,7 +3147,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -11832,7 +11351,7 @@ index 7ed280b..6f650ae 100755
$opt_silent || {
func_quote_for_expand "$relink_command"
-@@ -2221,7 +3165,7 @@ func_mode_install ()
+@@ -2221,7 +3166,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
@@ -11841,7 +11360,22 @@ index 7ed280b..6f650ae 100755
fi
fi
-@@ -2280,7 +3224,7 @@ func_mode_install ()
+@@ -2257,11 +3202,13 @@ func_mode_install ()
+
+ # Set up the ranlib parameters.
+ oldlib="$destdir/$name"
++ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
++ tool_oldlib=$func_to_tool_file_result
+
+ func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+ if test -n "$stripme" && test -n "$old_striplib"; then
+- func_show_eval "$old_striplib $oldlib" 'exit $?'
++ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+ fi
+
+ # Do each command in the postinstall commands.
+@@ -2280,7 +3227,7 @@ func_mode_install ()
fi
}
@@ -11850,7 +11384,7 @@ index 7ed280b..6f650ae 100755
# func_generate_dlsyms outputname originator pic_p
-@@ -2323,6 +3267,22 @@ func_generate_dlsyms ()
+@@ -2323,6 +3270,22 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
@@ -11873,7 +11407,7 @@ index 7ed280b..6f650ae 100755
/* External symbol declarations for the compiler. */\
"
-@@ -2332,10 +3292,11 @@ extern \"C\" {
+@@ -2332,10 +3295,11 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
@@ -11888,7 +11422,7 @@ index 7ed280b..6f650ae 100755
done
if test -n "$exclude_expsyms"; then
-@@ -2371,7 +3332,7 @@ extern \"C\" {
+@@ -2371,7 +3335,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -11897,7 +11431,7 @@ index 7ed280b..6f650ae 100755
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
-@@ -2384,10 +3345,52 @@ extern \"C\" {
+@@ -2384,10 +3348,52 @@ extern \"C\" {
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
@@ -11954,7 +11488,7 @@ index 7ed280b..6f650ae 100755
done
$opt_dry_run || {
-@@ -2415,36 +3418,19 @@ extern \"C\" {
+@@ -2415,36 +3421,19 @@ extern \"C\" {
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
@@ -11995,7 +11529,7 @@ index 7ed280b..6f650ae 100755
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
-@@ -2457,7 +3443,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
+@@ -2457,7 +3446,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
@@ -12004,7 +11538,16 @@ index 7ed280b..6f650ae 100755
{0, (void *) 0}
};
-@@ -2500,7 +3486,7 @@ static const void *lt_preloaded_setup() {
+@@ -2484,7 +3473,7 @@ static const void *lt_preloaded_setup() {
+ # linked before any other PIC object. But we must not use
+ # pic_flag when linking with -static. The problem exists in
+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
++ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+ *-*-hpux*)
+ pic_flag_for_symtable=" $pic_flag" ;;
+@@ -2500,7 +3489,7 @@ static const void *lt_preloaded_setup() {
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
@@ -12013,7 +11556,7 @@ index 7ed280b..6f650ae 100755
esac
done
-@@ -2515,16 +3501,16 @@ static const void *lt_preloaded_setup() {
+@@ -2515,16 +3504,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -12036,7 +11579,7 @@ index 7ed280b..6f650ae 100755
;;
esac
;;
-@@ -2538,8 +3524,8 @@ static const void *lt_preloaded_setup() {
+@@ -2538,8 +3527,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
@@ -12047,7 +11590,7 @@ index 7ed280b..6f650ae 100755
fi
}
-@@ -2549,6 +3535,7 @@ static const void *lt_preloaded_setup() {
+@@ -2549,6 +3538,7 @@ static const void *lt_preloaded_setup() {
# 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.
@@ -12055,7 +11598,7 @@ index 7ed280b..6f650ae 100755
func_win32_libid ()
{
$opt_debug
-@@ -2559,9 +3546,11 @@ func_win32_libid ()
+@@ -2559,9 +3549,11 @@ func_win32_libid ()
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
@@ -12069,7 +11612,7 @@ index 7ed280b..6f650ae 100755
$SED -n -e '
1,100{
/ I /{
-@@ -2590,6 +3579,131 @@ func_win32_libid ()
+@@ -2590,6 +3582,131 @@ func_win32_libid ()
$ECHO "$win32_libid_type"
}
@@ -12201,7 +11744,7 @@ index 7ed280b..6f650ae 100755
# func_extract_an_archive dir oldlib
-@@ -2598,7 +3712,18 @@ func_extract_an_archive ()
+@@ -2598,7 +3715,18 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
@@ -12221,7 +11764,7 @@ index 7ed280b..6f650ae 100755
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
-@@ -2669,7 +3794,7 @@ func_extract_archives ()
+@@ -2669,7 +3797,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -12230,7 +11773,7 @@ index 7ed280b..6f650ae 100755
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
-@@ -2684,25 +3809,30 @@ func_extract_archives ()
+@@ -2684,25 +3812,30 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
@@ -12272,7 +11815,7 @@ index 7ed280b..6f650ae 100755
$ECHO "\
#! $SHELL
-@@ -2718,7 +3848,6 @@ func_emit_wrapper_part1 ()
+@@ -2718,7 +3851,6 @@ func_emit_wrapper_part1 ()
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -12280,7 +11823,7 @@ index 7ed280b..6f650ae 100755
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
-@@ -2749,31 +3878,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
+@@ -2749,31 +3881,135 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
@@ -12403,14 +11946,17 @@ index 7ed280b..6f650ae 100755
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
-+ for lt_wr_arg
-+ do
-+ case \$lt_wr_arg in
-+ --lt-*) ;;
-+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-+ esac
-+ shift
-+ done
++ case \" \$* \" in
++ *\\ --lt-*)
++ for lt_wr_arg
++ do
++ case \$lt_wr_arg in
++ --lt-*) ;;
++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
++ esac
++ shift
++ done ;;
++ esac
+ func_exec_program_core \${1+\"\$@\"}
+}
+
@@ -12431,7 +11977,7 @@ index 7ed280b..6f650ae 100755
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
-@@ -2783,30 +4013,13 @@ else
+@@ -2783,30 +4019,13 @@ else
esac
fi
@@ -12465,7 +12011,7 @@ index 7ed280b..6f650ae 100755
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
-@@ -2814,7 +4027,7 @@ func_emit_wrapper_part2 ()
+@@ -2814,7 +4033,7 @@ func_emit_wrapper_part2 ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
@@ -12474,7 +12020,7 @@ index 7ed280b..6f650ae 100755
$objdir ) thisdir=. ;;
esac
fi
-@@ -2869,6 +4082,18 @@ func_emit_wrapper_part2 ()
+@@ -2869,6 +4088,18 @@ func_emit_wrapper_part2 ()
if test -f \"\$progdir/\$program\"; then"
@@ -12493,7 +12039,7 @@ index 7ed280b..6f650ae 100755
# 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 +4102,28 @@ func_emit_wrapper_part2 ()
+@@ -2877,253 +4108,28 @@ func_emit_wrapper_part2 ()
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
@@ -12750,7 +12296,7 @@ index 7ed280b..6f650ae 100755
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
-@@ -3141,31 +4141,23 @@ func_emit_cwrapperexe_src ()
+@@ -3141,31 +4147,23 @@ func_emit_cwrapperexe_src ()
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
@@ -12785,7 +12331,7 @@ index 7ed280b..6f650ae 100755
# endif
#endif
#include <malloc.h>
-@@ -3177,6 +4169,44 @@ int setenv (const char *, const char *, int);
+@@ -3177,6 +4175,44 @@ int setenv (const char *, const char *, int);
#include <fcntl.h>
#include <sys/stat.h>
@@ -12830,7 +12376,7 @@ index 7ed280b..6f650ae 100755
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
-@@ -3192,14 +4222,7 @@ int setenv (const char *, const char *, int);
+@@ -3192,14 +4228,7 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
@@ -12846,7 +12392,7 @@ index 7ed280b..6f650ae 100755
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
-@@ -3230,10 +4253,6 @@ int setenv (const char *, const char *, int);
+@@ -3230,10 +4259,6 @@ int setenv (const char *, const char *, int);
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
@@ -12857,7 +12403,7 @@ index 7ed280b..6f650ae 100755
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
-@@ -3246,22 +4265,13 @@ int setenv (const char *, const char *, int);
+@@ -3246,22 +4271,13 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
@@ -12884,7 +12430,7 @@ index 7ed280b..6f650ae 100755
void *xmalloc (size_t num);
char *xstrdup (const char *string);
-@@ -3271,41 +4281,27 @@ char *chase_symlinks (const char *pathspec);
+@@ -3271,41 +4287,27 @@ char *chase_symlinks (const char *pathspec);
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
@@ -12935,7 +12481,7 @@ index 7ed280b..6f650ae 100755
EOF
else
cat <<"EOF"
-@@ -3314,10 +4310,10 @@ EOF
+@@ -3314,10 +4316,10 @@ EOF
fi
if test -n "$dllsearchpath"; then
@@ -12948,7 +12494,7 @@ index 7ed280b..6f650ae 100755
EOF
else
cat <<"EOF"
-@@ -3340,24 +4336,10 @@ EOF
+@@ -3340,24 +4342,10 @@ EOF
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
@@ -12974,7 +12520,7 @@ index 7ed280b..6f650ae 100755
int
main (int argc, char *argv[])
-@@ -3374,10 +4356,13 @@ main (int argc, char *argv[])
+@@ -3374,10 +4362,13 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
@@ -12991,7 +12537,7 @@ index 7ed280b..6f650ae 100755
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3391,25 +4376,57 @@ EOF
+@@ -3391,25 +4382,57 @@ EOF
esac
cat <<"EOF"
@@ -13058,7 +12604,7 @@ index 7ed280b..6f650ae 100755
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
-@@ -3427,8 +4444,9 @@ EOF
+@@ -3427,8 +4450,9 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
@@ -13070,7 +12616,7 @@ index 7ed280b..6f650ae 100755
EOF
cat <<EOF
-@@ -3478,80 +4496,19 @@ EOF
+@@ -3478,80 +4502,19 @@ EOF
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
@@ -13160,7 +12706,7 @@ index 7ed280b..6f650ae 100755
}
EOF
-@@ -3560,11 +4517,14 @@ EOF
+@@ -3560,11 +4523,14 @@ EOF
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
@@ -13176,7 +12722,7 @@ index 7ed280b..6f650ae 100755
return 127;
}
return rval;
-@@ -3586,7 +4546,7 @@ xmalloc (size_t num)
+@@ -3586,7 +4552,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
@@ -13185,7 +12731,7 @@ index 7ed280b..6f650ae 100755
return p;
}
-@@ -3620,8 +4580,8 @@ check_executable (const char *path)
+@@ -3620,8 +4586,8 @@ check_executable (const char *path)
{
struct stat st;
@@ -13196,7 +12742,7 @@ index 7ed280b..6f650ae 100755
if ((!path) || (!*path))
return 0;
-@@ -3638,8 +4598,8 @@ make_executable (const char *path)
+@@ -3638,8 +4604,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
@@ -13207,7 +12753,7 @@ index 7ed280b..6f650ae 100755
if ((!path) || (!*path))
return 0;
-@@ -3665,8 +4625,8 @@ find_executable (const char *wrapper)
+@@ -3665,8 +4631,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
@@ -13218,7 +12764,7 @@ index 7ed280b..6f650ae 100755
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
-@@ -3719,7 +4679,8 @@ find_executable (const char *wrapper)
+@@ -3719,7 +4685,8 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -13228,7 +12774,7 @@ index 7ed280b..6f650ae 100755
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3744,7 +4705,8 @@ find_executable (const char *wrapper)
+@@ -3744,7 +4711,8 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -13238,7 +12784,7 @@ index 7ed280b..6f650ae 100755
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
-@@ -3770,8 +4732,9 @@ chase_symlinks (const char *pathspec)
+@@ -3770,8 +4738,9 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
@@ -13250,7 +12796,7 @@ index 7ed280b..6f650ae 100755
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
-@@ -3793,8 +4756,9 @@ chase_symlinks (const char *pathspec)
+@@ -3793,8 +4762,9 @@ chase_symlinks (const char *pathspec)
}
else
{
@@ -13262,7 +12808,7 @@ index 7ed280b..6f650ae 100755
}
}
XFREE (tmp_pathspec);
-@@ -3807,7 +4771,8 @@ chase_symlinks (const char *pathspec)
+@@ -3807,7 +4777,8 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
@@ -13272,7 +12818,7 @@ index 7ed280b..6f650ae 100755
}
return xstrdup (tmp_pathspec);
#endif
-@@ -3833,11 +4798,25 @@ strendzap (char *str, const char *pat)
+@@ -3833,11 +4804,25 @@ strendzap (char *str, const char *pat)
return str;
}
@@ -13300,7 +12846,7 @@ index 7ed280b..6f650ae 100755
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
-@@ -3846,20 +4825,32 @@ lt_error_core (int exit_status, const char *mode,
+@@ -3846,20 +4831,32 @@ lt_error_core (int exit_status, const char *mode,
}
void
@@ -13338,7 +12884,7 @@ index 7ed280b..6f650ae 100755
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
-@@ -3904,95 +4895,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
+@@ -3904,95 +4901,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
return new_value;
}
@@ -13437,7 +12983,7 @@ index 7ed280b..6f650ae 100755
if (name && *name && value && *value)
{
-@@ -4011,9 +4919,9 @@ lt_update_exe_path (const char *name, const char *value)
+@@ -4011,9 +4925,9 @@ lt_update_exe_path (const char *name, const char *value)
void
lt_update_lib_path (const char *name, const char *value)
{
@@ -13450,7 +12996,7 @@ index 7ed280b..6f650ae 100755
if (name && *name && value && *value)
{
-@@ -4023,11 +4931,152 @@ lt_update_lib_path (const char *name, const char *value)
+@@ -4023,11 +4937,158 @@ lt_update_lib_path (const char *name, const char *value)
}
}
@@ -13574,15 +13120,21 @@ index 7ed280b..6f650ae 100755
+EOF
+ ;;
+ esac
-+
+
+ cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+ func_emit_wrapper yes |
-+ $SED -e 's/\([\\"]\)/\\\1/g' \
-+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
-
++ $SED -n -e '
++s/^\(.\{79\}\)\(..*\)/\1\
++\2/
++h
++s/\([\\"]\)/\\\1/g
++s/$/\\n/
++s/\([^\n]*\).*/ fputs ("\1", f);/p
++g
++D'
+ cat <<"EOF"
+}
EOF
@@ -13603,7 +13155,7 @@ index 7ed280b..6f650ae 100755
# func_mode_link arg...
func_mode_link ()
{
-@@ -4072,6 +5121,7 @@ func_mode_link ()
+@@ -4072,6 +5133,7 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
@@ -13611,7 +13163,7 @@ index 7ed280b..6f650ae 100755
dlfiles=
dlprefiles=
dlself=no
-@@ -4164,6 +5214,11 @@ func_mode_link ()
+@@ -4164,6 +5226,11 @@ func_mode_link ()
esac
case $prev in
@@ -13623,7 +13175,7 @@ index 7ed280b..6f650ae 100755
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
-@@ -4195,9 +5250,9 @@ func_mode_link ()
+@@ -4195,9 +5262,9 @@ func_mode_link ()
;;
*)
if test "$prev" = dlfiles; then
@@ -13635,7 +13187,7 @@ index 7ed280b..6f650ae 100755
fi
prev=
continue
-@@ -4221,7 +5276,7 @@ func_mode_link ()
+@@ -4221,7 +5288,7 @@ func_mode_link ()
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
@@ -13644,7 +13196,7 @@ index 7ed280b..6f650ae 100755
;;
esac
;;
-@@ -4240,7 +5295,7 @@ func_mode_link ()
+@@ -4240,7 +5307,7 @@ func_mode_link ()
moreargs=
for fil in `cat "$save_arg"`
do
@@ -13653,7 +13205,7 @@ index 7ed280b..6f650ae 100755
arg=$fil
# A libtool-controlled object.
-@@ -4269,7 +5324,7 @@ func_mode_link ()
+@@ -4269,7 +5336,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -13662,7 +13214,7 @@ index 7ed280b..6f650ae 100755
prev=
continue
else
-@@ -4281,7 +5336,7 @@ func_mode_link ()
+@@ -4281,7 +5348,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
@@ -13671,7 +13223,7 @@ index 7ed280b..6f650ae 100755
prev=
fi
-@@ -4351,12 +5406,12 @@ func_mode_link ()
+@@ -4351,12 +5418,12 @@ func_mode_link ()
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
@@ -13686,7 +13238,7 @@ index 7ed280b..6f650ae 100755
esac
fi
prev=
-@@ -4368,28 +5423,28 @@ func_mode_link ()
+@@ -4368,28 +5435,28 @@ func_mode_link ()
continue
;;
weak)
@@ -13721,7 +13273,7 @@ index 7ed280b..6f650ae 100755
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
-@@ -4425,6 +5480,11 @@ func_mode_link ()
+@@ -4425,6 +5492,11 @@ func_mode_link ()
continue
;;
@@ -13733,7 +13285,7 @@ index 7ed280b..6f650ae 100755
-dlopen)
prev=dlfiles
continue
-@@ -4475,15 +5535,16 @@ func_mode_link ()
+@@ -4475,15 +5547,16 @@ func_mode_link ()
;;
-L*)
@@ -13753,7 +13305,7 @@ index 7ed280b..6f650ae 100755
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -4495,24 +5556,30 @@ func_mode_link ()
+@@ -4495,24 +5568,30 @@ func_mode_link ()
;;
esac
case "$deplibs " in
@@ -13790,7 +13342,7 @@ index 7ed280b..6f650ae 100755
esac
;;
esac
-@@ -4522,7 +5589,7 @@ func_mode_link ()
+@@ -4522,7 +5601,7 @@ func_mode_link ()
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -13799,7 +13351,7 @@ index 7ed280b..6f650ae 100755
# These systems don't actually have a C or math library (as such)
continue
;;
-@@ -4536,7 +5603,7 @@ func_mode_link ()
+@@ -4536,7 +5615,7 @@ func_mode_link ()
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -13808,7 +13360,7 @@ index 7ed280b..6f650ae 100755
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
-@@ -4556,7 +5623,7 @@ func_mode_link ()
+@@ -4556,7 +5635,7 @@ func_mode_link ()
;;
esac
fi
@@ -13817,7 +13369,7 @@ index 7ed280b..6f650ae 100755
continue
;;
-@@ -4568,8 +5635,8 @@ func_mode_link ()
+@@ -4568,21 +5647,22 @@ func_mode_link ()
# 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.
@@ -13828,11 +13380,13 @@ index 7ed280b..6f650ae 100755
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
-@@ -4577,12 +5644,12 @@ func_mode_link ()
+ continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
++ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -13843,7 +13397,7 @@ index 7ed280b..6f650ae 100755
esac
continue
;;
-@@ -4649,13 +5716,17 @@ func_mode_link ()
+@@ -4649,13 +5729,17 @@ func_mode_link ()
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -13862,7 +13416,7 @@ index 7ed280b..6f650ae 100755
esac
continue
;;
-@@ -4708,8 +5779,8 @@ func_mode_link ()
+@@ -4708,8 +5792,8 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
@@ -13873,7 +13427,7 @@ index 7ed280b..6f650ae 100755
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
-@@ -4724,9 +5795,9 @@ func_mode_link ()
+@@ -4724,9 +5808,9 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
@@ -13886,7 +13440,7 @@ index 7ed280b..6f650ae 100755
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
-@@ -4754,23 +5825,27 @@ func_mode_link ()
+@@ -4754,23 +5838,27 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
@@ -13926,7 +13480,7 @@ index 7ed280b..6f650ae 100755
continue
;;
-@@ -4782,7 +5857,7 @@ func_mode_link ()
+@@ -4782,7 +5870,7 @@ func_mode_link ()
*.$objext)
# A standard object.
@@ -13935,7 +13489,7 @@ index 7ed280b..6f650ae 100755
;;
*.lo)
-@@ -4813,7 +5888,7 @@ func_mode_link ()
+@@ -4813,7 +5901,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -13944,7 +13498,7 @@ index 7ed280b..6f650ae 100755
prev=
continue
else
-@@ -4825,7 +5900,7 @@ func_mode_link ()
+@@ -4825,7 +5913,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
@@ -13953,7 +13507,7 @@ index 7ed280b..6f650ae 100755
prev=
fi
-@@ -4870,24 +5945,25 @@ func_mode_link ()
+@@ -4870,24 +5958,25 @@ func_mode_link ()
*.$libext)
# An archive.
@@ -13984,7 +13538,7 @@ index 7ed280b..6f650ae 100755
fi
continue
;;
-@@ -4925,7 +6001,7 @@ func_mode_link ()
+@@ -4925,7 +6014,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
@@ -13993,7 +13547,7 @@ index 7ed280b..6f650ae 100755
else
shlib_search_path=
fi
-@@ -4934,6 +6010,8 @@ func_mode_link ()
+@@ -4934,6 +6023,8 @@ func_mode_link ()
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
@@ -14002,7 +13556,7 @@ index 7ed280b..6f650ae 100755
# Create the object directory.
func_mkdir_p "$output_objdir"
-@@ -4954,12 +6032,12 @@ func_mode_link ()
+@@ -4954,12 +6045,12 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
@@ -14018,7 +13572,7 @@ index 7ed280b..6f650ae 100755
done
if test "$linkmode" = lib; then
-@@ -4972,9 +6050,9 @@ func_mode_link ()
+@@ -4972,9 +6063,9 @@ func_mode_link ()
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
@@ -14030,7 +13584,7 @@ index 7ed280b..6f650ae 100755
done
fi
pre_post_deps=
-@@ -5044,17 +6122,19 @@ func_mode_link ()
+@@ -5044,17 +6135,19 @@ func_mode_link ()
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
@@ -14053,7 +13607,14 @@ index 7ed280b..6f650ae 100755
esac
done
done
-@@ -5075,11 +6155,11 @@ func_mode_link ()
+@@ -5070,16 +6163,17 @@ func_mode_link ()
+ lib=
+ found=no
+ case $deplib in
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
++ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
@@ -14067,7 +13628,7 @@ index 7ed280b..6f650ae 100755
esac
fi
fi
-@@ -5164,7 +6244,7 @@ func_mode_link ()
+@@ -5164,7 +6258,7 @@ func_mode_link ()
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
@@ -14076,7 +13637,7 @@ index 7ed280b..6f650ae 100755
esac
fi
fi
-@@ -5177,7 +6257,8 @@ func_mode_link ()
+@@ -5177,7 +6271,8 @@ func_mode_link ()
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
@@ -14086,7 +13647,7 @@ index 7ed280b..6f650ae 100755
;;
prog)
if test "$pass" = conv; then
-@@ -5191,7 +6272,8 @@ func_mode_link ()
+@@ -5191,7 +6286,8 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
@@ -14096,7 +13657,7 @@ index 7ed280b..6f650ae 100755
;;
*)
func_warning "\`-L' is ignored for archives/objects"
-@@ -5202,17 +6284,21 @@ func_mode_link ()
+@@ -5202,17 +6298,21 @@ func_mode_link ()
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
@@ -14121,7 +13682,7 @@ index 7ed280b..6f650ae 100755
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
-@@ -5230,7 +6316,7 @@ func_mode_link ()
+@@ -5230,7 +6330,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
@@ -14130,7 +13691,7 @@ index 7ed280b..6f650ae 100755
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
-@@ -5240,15 +6326,15 @@ func_mode_link ()
+@@ -5240,15 +6340,15 @@ func_mode_link ()
;;
esac
if test "$valid_a_lib" != yes; then
@@ -14153,7 +13714,7 @@ index 7ed280b..6f650ae 100755
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
-@@ -5275,11 +6361,11 @@ func_mode_link ()
+@@ -5275,11 +6375,11 @@ func_mode_link ()
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.
@@ -14167,7 +13728,7 @@ index 7ed280b..6f650ae 100755
fi
fi
continue
-@@ -5321,20 +6407,20 @@ func_mode_link ()
+@@ -5321,20 +6421,20 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
@@ -14193,7 +13754,7 @@ index 7ed280b..6f650ae 100755
fi
if test "$pass" = conv; then
-@@ -5345,17 +6431,17 @@ func_mode_link ()
+@@ -5345,17 +6445,17 @@ func_mode_link ()
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
@@ -14216,7 +13777,7 @@ index 7ed280b..6f650ae 100755
done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
-@@ -5366,9 +6452,15 @@ func_mode_link ()
+@@ -5366,9 +6466,15 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
@@ -14235,7 +13796,7 @@ index 7ed280b..6f650ae 100755
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
-@@ -5385,9 +6477,9 @@ func_mode_link ()
+@@ -5385,9 +6491,9 @@ func_mode_link ()
# 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.
@@ -14247,7 +13808,7 @@ index 7ed280b..6f650ae 100755
fi
continue
fi # $pass = dlopen
-@@ -5409,14 +6501,14 @@ func_mode_link ()
+@@ -5409,14 +6515,14 @@ func_mode_link ()
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
@@ -14265,7 +13826,7 @@ index 7ed280b..6f650ae 100755
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
-@@ -5424,12 +6516,12 @@ func_mode_link ()
+@@ -5424,12 +6530,12 @@ func_mode_link ()
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
@@ -14280,7 +13841,7 @@ index 7ed280b..6f650ae 100755
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
-@@ -5440,20 +6532,46 @@ func_mode_link ()
+@@ -5440,20 +6546,46 @@ func_mode_link ()
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
@@ -14341,7 +13902,7 @@ index 7ed280b..6f650ae 100755
fi # $pass = dlpreopen
if test -z "$libdir"; then
-@@ -5471,7 +6589,7 @@ func_mode_link ()
+@@ -5471,7 +6603,7 @@ func_mode_link ()
if test "$linkmode" = prog && test "$pass" != link; then
@@ -14350,7 +13911,7 @@ index 7ed280b..6f650ae 100755
deplibs="$lib $deplibs"
linkalldeplibs=no
-@@ -5484,7 +6602,8 @@ func_mode_link ()
+@@ -5484,7 +6616,8 @@ func_mode_link ()
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
@@ -14360,7 +13921,7 @@ index 7ed280b..6f650ae 100755
;;
esac
# Need to link against all dependency_libs?
-@@ -5495,12 +6614,12 @@ func_mode_link ()
+@@ -5495,12 +6628,12 @@ func_mode_link ()
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
@@ -14376,7 +13937,7 @@ index 7ed280b..6f650ae 100755
done # for deplib
continue
fi # $linkmode = prog...
-@@ -5515,7 +6634,7 @@ func_mode_link ()
+@@ -5515,7 +6648,7 @@ func_mode_link ()
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
@@ -14385,7 +13946,7 @@ index 7ed280b..6f650ae 100755
esac
fi
-@@ -5527,7 +6646,7 @@ func_mode_link ()
+@@ -5527,7 +6660,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
@@ -14394,7 +13955,7 @@ index 7ed280b..6f650ae 100755
esac
;;
esac
-@@ -5536,7 +6655,7 @@ func_mode_link ()
+@@ -5536,7 +6669,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -14403,7 +13964,7 @@ index 7ed280b..6f650ae 100755
esac
;;
esac
-@@ -5561,12 +6680,12 @@ func_mode_link ()
+@@ -5561,12 +6694,12 @@ func_mode_link ()
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
@@ -14418,7 +13979,7 @@ index 7ed280b..6f650ae 100755
need_relink=yes
fi
;;
-@@ -5583,7 +6702,7 @@ func_mode_link ()
+@@ -5583,7 +6716,7 @@ func_mode_link ()
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
@@ -14427,7 +13988,7 @@ index 7ed280b..6f650ae 100755
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
-@@ -5601,7 +6720,7 @@ func_mode_link ()
+@@ -5601,7 +6734,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
@@ -14436,7 +13997,7 @@ index 7ed280b..6f650ae 100755
esac
;;
esac
-@@ -5610,7 +6729,7 @@ func_mode_link ()
+@@ -5610,7 +6743,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -14445,7 +14006,7 @@ index 7ed280b..6f650ae 100755
esac
;;
esac
-@@ -5664,7 +6783,7 @@ func_mode_link ()
+@@ -5664,7 +6797,7 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
@@ -14454,7 +14015,7 @@ index 7ed280b..6f650ae 100755
add_shlibpath=
add_dir=
add=
-@@ -5686,9 +6805,9 @@ func_mode_link ()
+@@ -5686,9 +6819,9 @@ func_mode_link ()
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
@@ -14467,7 +14028,13 @@ index 7ed280b..6f650ae 100755
else
add="$dir/$old_library"
fi
-@@ -5720,7 +6839,7 @@ func_mode_link ()
+@@ -5715,12 +6848,12 @@ func_mode_link ()
+ test "$hardcode_direct_absolute" = no; then
+ add="$dir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+- add_dir="-L$dir"
++ add_dir="-L$absdir"
+ # Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
@@ -14476,7 +14043,7 @@ index 7ed280b..6f650ae 100755
;;
esac
fi
-@@ -5742,7 +6861,7 @@ func_mode_link ()
+@@ -5742,7 +6875,7 @@ func_mode_link ()
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
@@ -14485,7 +14052,7 @@ index 7ed280b..6f650ae 100755
esac
fi
if test "$linkmode" = prog; then
-@@ -5756,13 +6875,13 @@ func_mode_link ()
+@@ -5756,13 +6889,13 @@ func_mode_link ()
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
@@ -14501,7 +14068,7 @@ index 7ed280b..6f650ae 100755
add_shlibpath=
add_dir=
add=
-@@ -5776,7 +6895,7 @@ func_mode_link ()
+@@ -5776,7 +6909,7 @@ func_mode_link ()
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
@@ -14510,7 +14077,7 @@ index 7ed280b..6f650ae 100755
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
-@@ -5793,7 +6912,7 @@ func_mode_link ()
+@@ -5793,7 +6926,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
@@ -14519,7 +14086,7 @@ index 7ed280b..6f650ae 100755
;;
esac
fi
-@@ -5828,21 +6947,21 @@ func_mode_link ()
+@@ -5828,21 +6961,21 @@ func_mode_link ()
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
@@ -14553,7 +14120,7 @@ index 7ed280b..6f650ae 100755
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
-@@ -5870,27 +6989,33 @@ func_mode_link ()
+@@ -5870,27 +7003,33 @@ func_mode_link ()
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
@@ -14593,7 +14160,7 @@ index 7ed280b..6f650ae 100755
done
if test "$link_all_deplibs" != no; then
-@@ -5900,8 +7025,10 @@ func_mode_link ()
+@@ -5900,8 +7039,10 @@ func_mode_link ()
case $deplib in
-L*) path="$deplib" ;;
*.la)
@@ -14605,7 +14172,7 @@ index 7ed280b..6f650ae 100755
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-@@ -5928,8 +7055,8 @@ func_mode_link ()
+@@ -5928,8 +7069,8 @@ func_mode_link ()
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
@@ -14616,7 +14183,7 @@ index 7ed280b..6f650ae 100755
path=
fi
fi
-@@ -5962,7 +7089,7 @@ func_mode_link ()
+@@ -5962,7 +7103,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
@@ -14625,7 +14192,7 @@ index 7ed280b..6f650ae 100755
fi
fi
dependency_libs="$newdependency_libs"
-@@ -5979,7 +7106,7 @@ func_mode_link ()
+@@ -5979,7 +7120,7 @@ func_mode_link ()
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
@@ -14634,7 +14201,7 @@ index 7ed280b..6f650ae 100755
esac
done
newlib_search_path=
-@@ -6037,10 +7164,10 @@ func_mode_link ()
+@@ -6037,10 +7178,10 @@ func_mode_link ()
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
@@ -14647,7 +14214,7 @@ index 7ed280b..6f650ae 100755
esac
done
eval $var=\"$tmp_libs\"
-@@ -6056,7 +7183,7 @@ func_mode_link ()
+@@ -6056,7 +7197,7 @@ func_mode_link ()
;;
esac
if test -n "$i" ; then
@@ -14656,7 +14223,7 @@ index 7ed280b..6f650ae 100755
fi
done
dependency_libs=$tmp_libs
-@@ -6097,7 +7224,7 @@ func_mode_link ()
+@@ -6097,7 +7238,7 @@ func_mode_link ()
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
@@ -14665,7 +14232,7 @@ index 7ed280b..6f650ae 100755
;;
lib)
-@@ -6130,10 +7257,10 @@ func_mode_link ()
+@@ -6130,10 +7271,10 @@ func_mode_link ()
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
@@ -14678,7 +14245,14 @@ index 7ed280b..6f650ae 100755
fi
fi
-@@ -6198,7 +7325,7 @@ func_mode_link ()
+@@ -6192,13 +7333,14 @@ func_mode_link ()
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
++ # correct linux to gnu/linux during the next big refactor
+ darwin|linux|osf|windows|none)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
age="$number_minor"
revision="$number_revision"
;;
@@ -14687,7 +14261,16 @@ index 7ed280b..6f650ae 100755
current="$number_major"
revision="$number_minor"
age="0"
-@@ -6334,7 +7461,7 @@ func_mode_link ()
+@@ -6311,7 +7453,7 @@ func_mode_link ()
+ versuffix="$major.$revision"
+ ;;
+
+- linux)
++ linux) # correct to gnu/linux during the next big refactor
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix="$major.$age.$revision"
+@@ -6334,7 +7476,7 @@ func_mode_link ()
done
# Make executables depend on our current version.
@@ -14696,7 +14279,7 @@ index 7ed280b..6f650ae 100755
;;
qnx)
-@@ -6402,10 +7529,10 @@ func_mode_link ()
+@@ -6402,10 +7544,10 @@ func_mode_link ()
fi
func_generate_dlsyms "$libname" "$libname" "yes"
@@ -14709,7 +14292,7 @@ index 7ed280b..6f650ae 100755
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
-@@ -6421,7 +7548,7 @@ func_mode_link ()
+@@ -6421,7 +7563,7 @@ func_mode_link ()
continue
fi
fi
@@ -14718,7 +14301,7 @@ index 7ed280b..6f650ae 100755
;;
*) ;;
esac
-@@ -6432,27 +7559,28 @@ func_mode_link ()
+@@ -6432,27 +7574,28 @@ func_mode_link ()
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
@@ -14754,7 +14337,7 @@ index 7ed280b..6f650ae 100755
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-@@ -6466,7 +7594,7 @@ func_mode_link ()
+@@ -6466,7 +7609,7 @@ func_mode_link ()
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
@@ -14763,7 +14346,7 @@ index 7ed280b..6f650ae 100755
esac
done
-@@ -6476,19 +7604,19 @@ func_mode_link ()
+@@ -6476,19 +7619,19 @@ func_mode_link ()
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
@@ -14786,7 +14369,7 @@ index 7ed280b..6f650ae 100755
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
-@@ -6505,7 +7633,7 @@ func_mode_link ()
+@@ -6505,7 +7648,7 @@ func_mode_link ()
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
@@ -14795,7 +14378,7 @@ index 7ed280b..6f650ae 100755
fi
;;
esac
-@@ -6554,7 +7682,7 @@ EOF
+@@ -6554,7 +7697,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -14804,7 +14387,7 @@ index 7ed280b..6f650ae 100755
i=""
;;
esac
-@@ -6565,21 +7693,21 @@ EOF
+@@ -6565,21 +7708,21 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -14834,7 +14417,7 @@ index 7ed280b..6f650ae 100755
;;
esac
done
-@@ -6597,7 +7725,7 @@ EOF
+@@ -6597,7 +7740,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -14843,7 +14426,7 @@ index 7ed280b..6f650ae 100755
i=""
;;
esac
-@@ -6608,29 +7736,29 @@ EOF
+@@ -6608,29 +7751,29 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -14885,7 +14468,7 @@ index 7ed280b..6f650ae 100755
;;
esac
done
-@@ -6647,15 +7775,27 @@ EOF
+@@ -6647,15 +7790,27 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -14915,7 +14498,7 @@ index 7ed280b..6f650ae 100755
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
-@@ -6672,13 +7812,13 @@ EOF
+@@ -6672,13 +7827,13 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
@@ -14931,7 +14514,7 @@ index 7ed280b..6f650ae 100755
a_deplib=""
break 2
fi
-@@ -6687,12 +7827,12 @@ EOF
+@@ -6687,12 +7842,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -14949,7 +14532,7 @@ index 7ed280b..6f650ae 100755
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
-@@ -6703,7 +7843,7 @@ EOF
+@@ -6703,7 +7858,7 @@ EOF
;;
*)
# Add a -L argument.
@@ -14958,7 +14541,7 @@ index 7ed280b..6f650ae 100755
;;
esac
done # Gone through all deplibs.
-@@ -6719,7 +7859,7 @@ EOF
+@@ -6719,7 +7874,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -14967,7 +14550,7 @@ index 7ed280b..6f650ae 100755
a_deplib=""
;;
esac
-@@ -6730,9 +7870,9 @@ EOF
+@@ -6730,9 +7885,9 @@ EOF
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
@@ -14979,7 +14562,7 @@ index 7ed280b..6f650ae 100755
a_deplib=""
break 2
fi
-@@ -6741,12 +7881,12 @@ EOF
+@@ -6741,12 +7896,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -14997,7 +14580,7 @@ index 7ed280b..6f650ae 100755
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
-@@ -6757,32 +7897,32 @@ EOF
+@@ -6757,32 +7912,32 @@ EOF
;;
*)
# Add a -L argument.
@@ -15041,7 +14624,7 @@ index 7ed280b..6f650ae 100755
;;
esac
versuffix=$versuffix_save
-@@ -6794,23 +7934,23 @@ EOF
+@@ -6794,23 +7949,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
@@ -15075,7 +14658,7 @@ index 7ed280b..6f650ae 100755
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
-@@ -6820,16 +7960,16 @@ EOF
+@@ -6820,16 +7975,16 @@ EOF
build_libtool_libs=no
fi
else
@@ -15100,7 +14683,7 @@ index 7ed280b..6f650ae 100755
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
-@@ -6846,9 +7986,9 @@ EOF
+@@ -6846,9 +8001,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
@@ -15113,7 +14696,7 @@ index 7ed280b..6f650ae 100755
;;
esac
-@@ -6861,7 +8001,7 @@ EOF
+@@ -6861,7 +8016,7 @@ EOF
*)
case " $deplibs " in
*" -L$path/$objdir "*)
@@ -15122,7 +14705,7 @@ index 7ed280b..6f650ae 100755
esac
;;
esac
-@@ -6871,10 +8011,10 @@ EOF
+@@ -6871,10 +8026,10 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
@@ -15135,7 +14718,17 @@ index 7ed280b..6f650ae 100755
esac
done
deplibs="$new_libs"
-@@ -6891,10 +8031,12 @@ EOF
+@@ -6886,15 +8041,22 @@ EOF
+
+ # Test again, we may have decided not to build it any more
+ if test "$build_libtool_libs" = yes; then
++ # Remove ${wl} instances when linking with ld.
++ # FIXME: should test the right _cmds variable.
++ case $archive_cmds in
++ *\$LD\ *) wl= ;;
++ esac
+ if test "$hardcode_into_libs" = yes; then
+ # Hardcode the library paths
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -15149,7 +14742,7 @@ index 7ed280b..6f650ae 100755
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
-@@ -6903,18 +8045,18 @@ EOF
+@@ -6903,18 +8065,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -15167,11 +14760,22 @@ index 7ed280b..6f650ae 100755
case "$perm_rpath " in
*" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
-+ *) func_apped perm_rpath " $libdir" ;;
++ *) func_append perm_rpath " $libdir" ;;
esac
fi
done
-@@ -6932,7 +8074,7 @@ EOF
+@@ -6922,17 +8084,13 @@ EOF
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+- if test -n "$hardcode_libdir_flag_spec_ld"; then
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+- else
+- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+- fi
++ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+ fi
+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
@@ -15180,7 +14784,7 @@ index 7ed280b..6f650ae 100755
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
-@@ -6940,7 +8082,7 @@ EOF
+@@ -6940,7 +8098,7 @@ EOF
fi
shlibpath="$finalize_shlibpath"
@@ -15189,7 +14793,7 @@ index 7ed280b..6f650ae 100755
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
-@@ -6966,18 +8108,18 @@ EOF
+@@ -6966,18 +8124,18 @@ EOF
linknames=
for link
do
@@ -15211,7 +14815,7 @@ index 7ed280b..6f650ae 100755
fi
orig_export_symbols=
-@@ -7008,13 +8150,45 @@ EOF
+@@ -7008,13 +8166,45 @@ EOF
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
@@ -15262,7 +14866,7 @@ index 7ed280b..6f650ae 100755
skipped_export=false
else
# The command line is too long to execute in one step.
-@@ -7036,7 +8210,7 @@ EOF
+@@ -7036,7 +8226,7 @@ EOF
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"
@@ -15271,7 +14875,7 @@ index 7ed280b..6f650ae 100755
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7048,7 +8222,7 @@ EOF
+@@ -7048,7 +8238,7 @@ EOF
# 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
@@ -15280,7 +14884,7 @@ index 7ed280b..6f650ae 100755
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
-@@ -7058,7 +8232,7 @@ EOF
+@@ -7058,7 +8248,7 @@ EOF
case " $convenience " in
*" $test_deplib "*) ;;
*)
@@ -15289,7 +14893,7 @@ index 7ed280b..6f650ae 100755
;;
esac
done
-@@ -7078,21 +8252,21 @@ EOF
+@@ -7078,21 +8268,21 @@ EOF
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
@@ -15315,7 +14919,7 @@ index 7ed280b..6f650ae 100755
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
-@@ -7137,7 +8311,8 @@ EOF
+@@ -7137,7 +8327,8 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
@@ -15325,7 +14929,7 @@ index 7ed280b..6f650ae 100755
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -7150,13 +8325,16 @@ EOF
+@@ -7150,13 +8341,16 @@ EOF
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"
@@ -15346,7 +14950,7 @@ index 7ed280b..6f650ae 100755
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 +8348,12 @@ EOF
+@@ -7170,10 +8364,12 @@ EOF
fi
for obj
do
@@ -15362,7 +14966,7 @@ index 7ed280b..6f650ae 100755
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
-@@ -7197,17 +8377,19 @@ EOF
+@@ -7197,17 +8393,19 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
@@ -15385,7 +14989,7 @@ index 7ed280b..6f650ae 100755
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
-@@ -7217,11 +8399,12 @@ EOF
+@@ -7217,11 +8415,12 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
@@ -15400,7 +15004,7 @@ index 7ed280b..6f650ae 100755
else
output=
-@@ -7255,7 +8438,7 @@ EOF
+@@ -7255,7 +8454,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
@@ -15409,7 +15013,7 @@ index 7ed280b..6f650ae 100755
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
-@@ -7276,7 +8459,7 @@ EOF
+@@ -7276,7 +8475,7 @@ EOF
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"
@@ -15418,7 +15022,7 @@ index 7ed280b..6f650ae 100755
fi
if test -n "$orig_export_symbols"; then
-@@ -7288,7 +8471,7 @@ EOF
+@@ -7288,7 +8487,7 @@ EOF
# 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
@@ -15427,7 +15031,7 @@ index 7ed280b..6f650ae 100755
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
-@@ -7329,10 +8512,10 @@ EOF
+@@ -7329,10 +8528,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
@@ -15440,7 +15044,7 @@ index 7ed280b..6f650ae 100755
test "X$libobjs" = "X " && libobjs=
fi
-@@ -7348,7 +8531,7 @@ EOF
+@@ -7348,7 +8547,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
@@ -15449,7 +15053,7 @@ index 7ed280b..6f650ae 100755
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
-@@ -7360,7 +8543,7 @@ EOF
+@@ -7360,7 +8559,7 @@ EOF
IFS="$save_ifs"
# Restore the uninstalled library and exit
@@ -15458,7 +15062,7 @@ index 7ed280b..6f650ae 100755
$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 +8624,21 @@ EOF
+@@ -7441,18 +8640,21 @@ EOF
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
@@ -15483,7 +15087,7 @@ index 7ed280b..6f650ae 100755
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -7512,8 +8698,8 @@ EOF
+@@ -7512,8 +8714,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -15494,7 +15098,7 @@ index 7ed280b..6f650ae 100755
;;
esac
-@@ -7524,14 +8710,14 @@ EOF
+@@ -7524,14 +8726,14 @@ EOF
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
@@ -15513,7 +15117,7 @@ index 7ed280b..6f650ae 100755
;;
esac
-@@ -7545,7 +8731,7 @@ EOF
+@@ -7545,7 +8747,7 @@ EOF
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
@@ -15522,7 +15126,7 @@ index 7ed280b..6f650ae 100755
esac
;;
esac
-@@ -7555,17 +8741,17 @@ EOF
+@@ -7555,17 +8757,17 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
@@ -15544,7 +15148,7 @@ index 7ed280b..6f650ae 100755
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -7573,7 +8759,7 @@ EOF
+@@ -7573,7 +8775,7 @@ EOF
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -15553,7 +15157,7 @@ index 7ed280b..6f650ae 100755
esac
done
fi
-@@ -7592,18 +8778,18 @@ EOF
+@@ -7592,18 +8794,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -15575,7 +15179,7 @@ index 7ed280b..6f650ae 100755
esac
fi
case $host in
-@@ -7612,12 +8798,12 @@ EOF
+@@ -7612,12 +8814,12 @@ EOF
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -15590,7 +15194,7 @@ index 7ed280b..6f650ae 100755
esac
;;
esac
-@@ -7643,18 +8829,18 @@ EOF
+@@ -7643,18 +8845,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -15612,7 +15216,7 @@ index 7ed280b..6f650ae 100755
esac
fi
done
-@@ -7668,8 +8854,8 @@ EOF
+@@ -7668,8 +8870,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
@@ -15623,7 +15227,7 @@ index 7ed280b..6f650ae 100755
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -7681,15 +8867,15 @@ EOF
+@@ -7681,15 +8883,15 @@ EOF
wrappers_required=yes
case $host in
@@ -15643,7 +15247,7 @@ index 7ed280b..6f650ae 100755
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
-@@ -7698,13 +8884,19 @@ EOF
+@@ -7698,13 +8900,19 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
@@ -15664,7 +15268,7 @@ index 7ed280b..6f650ae 100755
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-@@ -7727,7 +8919,7 @@ EOF
+@@ -7727,7 +8935,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
@@ -15673,7 +15277,7 @@ index 7ed280b..6f650ae 100755
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
-@@ -7735,7 +8927,7 @@ EOF
+@@ -7735,7 +8943,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
@@ -15682,7 +15286,7 @@ index 7ed280b..6f650ae 100755
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
-@@ -7745,11 +8937,18 @@ EOF
+@@ -7745,11 +8953,18 @@ EOF
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
@@ -15702,7 +15306,7 @@ index 7ed280b..6f650ae 100755
exit $EXIT_SUCCESS
fi
-@@ -7764,7 +8963,7 @@ EOF
+@@ -7764,7 +8979,7 @@ EOF
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -15711,7 +15315,7 @@ index 7ed280b..6f650ae 100755
else
# fast_install is set to needless
relink_command=
-@@ -7776,13 +8975,19 @@ EOF
+@@ -7776,13 +8991,19 @@ EOF
fi
# Replace the output file specification.
@@ -15732,7 +15336,7 @@ index 7ed280b..6f650ae 100755
# Now create the wrapper script.
func_verbose "creating $output"
-@@ -7800,18 +9005,7 @@ EOF
+@@ -7800,18 +9021,7 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -15752,7 +15356,7 @@ index 7ed280b..6f650ae 100755
fi
# Only actually do things if not in dry run mode.
-@@ -7891,7 +9085,7 @@ EOF
+@@ -7891,7 +9101,7 @@ EOF
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
@@ -15761,7 +15365,7 @@ index 7ed280b..6f650ae 100755
fi
fi
addlibs="$old_convenience"
-@@ -7899,10 +9093,10 @@ EOF
+@@ -7899,10 +9109,10 @@ EOF
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -15774,7 +15378,7 @@ index 7ed280b..6f650ae 100755
fi
# Do each command in the archive commands.
-@@ -7913,10 +9107,10 @@ EOF
+@@ -7913,10 +9123,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
@@ -15787,7 +15391,7 @@ index 7ed280b..6f650ae 100755
fi
# POSIX demands no paths to be encoded in archives. We have
-@@ -7932,9 +9126,9 @@ EOF
+@@ -7932,9 +9142,9 @@ EOF
done | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -15799,7 +15403,7 @@ index 7ed280b..6f650ae 100755
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
-@@ -7958,9 +9152,9 @@ EOF
+@@ -7958,18 +9168,30 @@ EOF
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
@@ -15811,7 +15415,11 @@ index 7ed280b..6f650ae 100755
esac
done
fi
-@@ -7970,6 +9164,16 @@ EOF
++ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
++ tool_oldlib=$func_to_tool_file_result
+ eval cmds=\"$old_archive_cmds\"
+
+ func_len " $cmds"
len=$func_len_result
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
@@ -15828,7 +15436,7 @@ index 7ed280b..6f650ae 100755
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
-@@ -8043,7 +9247,7 @@ EOF
+@@ -8043,7 +9265,7 @@ EOF
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -15837,8 +15445,13 @@ index 7ed280b..6f650ae 100755
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -8066,9 +9270,19 @@ EOF
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+@@ -8063,12 +9285,23 @@ EOF
+ *.la)
+ func_basename "$deplib"
+ name="$func_basename_result"
+- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++ func_resolve_sysroot "$deplib"
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- newdependency_libs="$newdependency_libs $libdir/$name"
@@ -15859,7 +15472,7 @@ index 7ed280b..6f650ae 100755
esac
done
dependency_libs="$newdependency_libs"
-@@ -8082,9 +9296,9 @@ EOF
+@@ -8082,9 +9315,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
@@ -15871,7 +15484,7 @@ index 7ed280b..6f650ae 100755
esac
done
dlfiles="$newdlfiles"
-@@ -8101,7 +9315,7 @@ EOF
+@@ -8101,7 +9334,7 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
@@ -15880,7 +15493,7 @@ index 7ed280b..6f650ae 100755
;;
esac
done
-@@ -8113,7 +9327,7 @@ EOF
+@@ -8113,7 +9346,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
@@ -15889,7 +15502,7 @@ index 7ed280b..6f650ae 100755
done
dlfiles="$newdlfiles"
newdlprefiles=
-@@ -8122,15 +9336,33 @@ EOF
+@@ -8122,15 +9355,33 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
@@ -15925,7 +15538,7 @@ index 7ed280b..6f650ae 100755
esac
$ECHO > $output "\
# $outputname - a libtool library file
-@@ -8189,7 +9421,7 @@ relink_command=\"$relink_command\""
+@@ -8189,7 +9440,7 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
@@ -15934,7 +15547,7 @@ index 7ed280b..6f650ae 100755
func_mode_link ${1+"$@"}
-@@ -8209,9 +9441,9 @@ func_mode_uninstall ()
+@@ -8209,9 +9460,9 @@ func_mode_uninstall ()
for arg
do
case $arg in
@@ -15947,7 +15560,7 @@ index 7ed280b..6f650ae 100755
esac
done
-@@ -8220,24 +9452,23 @@ func_mode_uninstall ()
+@@ -8220,24 +9471,23 @@ func_mode_uninstall ()
rmdirs=
@@ -15979,7 +15592,7 @@ index 7ed280b..6f650ae 100755
esac
fi
-@@ -8263,18 +9494,17 @@ func_mode_uninstall ()
+@@ -8263,18 +9513,17 @@ func_mode_uninstall ()
# Delete the libtool libraries and symlinks.
for n in $library_names; do
@@ -16004,7 +15617,7 @@ index 7ed280b..6f650ae 100755
;;
uninstall)
if test -n "$library_names"; then
-@@ -8302,19 +9532,19 @@ func_mode_uninstall ()
+@@ -8302,19 +9551,19 @@ func_mode_uninstall ()
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
@@ -16027,7 +15640,7 @@ index 7ed280b..6f650ae 100755
noexename=$name
case $file in
*.exe)
-@@ -8324,7 +9554,7 @@ func_mode_uninstall ()
+@@ -8324,7 +9573,7 @@ func_mode_uninstall ()
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
@@ -16036,7 +15649,7 @@ index 7ed280b..6f650ae 100755
;;
esac
# Do a test to see if this is a libtool program.
-@@ -8333,7 +9563,7 @@ func_mode_uninstall ()
+@@ -8333,7 +9582,7 @@ func_mode_uninstall ()
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
@@ -16045,7 +15658,7 @@ index 7ed280b..6f650ae 100755
else
relink_command=
func_source $dir/$noexename
-@@ -8341,12 +9571,12 @@ func_mode_uninstall ()
+@@ -8341,12 +9590,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
@@ -16061,7 +15674,7 @@ index 7ed280b..6f650ae 100755
fi
fi
fi
-@@ -8354,7 +9584,6 @@ func_mode_uninstall ()
+@@ -8354,7 +9603,6 @@ func_mode_uninstall ()
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
@@ -16069,7 +15682,7 @@ index 7ed280b..6f650ae 100755
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
-@@ -8366,16 +9595,16 @@ func_mode_uninstall ()
+@@ -8366,16 +9614,16 @@ func_mode_uninstall ()
exit $exit_status
}
@@ -16090,7 +15703,7 @@ index 7ed280b..6f650ae 100755
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index a3fee53..8ff3c76 100644
+index a3fee53..828104c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,7 +1,8 @@
@@ -16098,8 +15711,8 @@ index a3fee53..8ff3c76 100644
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-+# Inc.
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -16108,8 +15721,8 @@ index a3fee53..8ff3c76 100644
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-+# Inc.
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -16148,17 +15761,19 @@ index a3fee53..8ff3c76 100644
])
-@@ -138,6 +143,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
+@@ -138,6 +143,11 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
++_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
++dnl
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
-@@ -160,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+@@ -160,10 +170,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
@@ -16172,7 +15787,7 @@ index a3fee53..8ff3c76 100644
_LT_CONFIG_LIBTOOL_INIT([
# See if we are running on zsh, and set the options which allow our
-@@ -179,7 +190,6 @@ fi
+@@ -179,7 +192,6 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
@@ -16180,7 +15795,7 @@ index a3fee53..8ff3c76 100644
case $host_os in
aix3*)
-@@ -193,23 +203,6 @@ aix3*)
+@@ -193,23 +205,6 @@ aix3*)
;;
esac
@@ -16204,7 +15819,7 @@ index a3fee53..8ff3c76 100644
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -250,6 +243,28 @@ _LT_CONFIG_COMMANDS
+@@ -250,6 +245,28 @@ _LT_CONFIG_COMMANDS
])# _LT_SETUP
@@ -16233,7 +15848,7 @@ index a3fee53..8ff3c76 100644
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
-@@ -408,7 +423,7 @@ m4_define([_lt_decl_all_varnames],
+@@ -408,7 +425,7 @@ m4_define([_lt_decl_all_varnames],
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
@@ -16242,7 +15857,7 @@ index a3fee53..8ff3c76 100644
# _LT_CONFIG_STATUS_DECLARATIONS
-@@ -418,7 +433,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
+@@ -418,7 +435,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
@@ -16251,7 +15866,7 @@ index a3fee53..8ff3c76 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 +532,20 @@ LTCC='$LTCC'
+@@ -517,12 +534,20 @@ LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
@@ -16274,7 +15889,7 @@ index a3fee53..8ff3c76 100644
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -533,9 +556,9 @@ done
+@@ -533,9 +558,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
@@ -16286,7 +15901,7 @@ index a3fee53..8ff3c76 100644
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -543,16 +566,38 @@ for var in lt_decl_all_varnames([[ \
+@@ -543,16 +568,38 @@ for var in lt_decl_all_varnames([[ \
esac
done
@@ -16332,7 +15947,7 @@ index a3fee53..8ff3c76 100644
# LT_OUTPUT
# ---------
-@@ -562,20 +607,11 @@ _LT_OUTPUT_LIBTOOL_INIT
+@@ -562,20 +609,11 @@ _LT_OUTPUT_LIBTOOL_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
@@ -16356,16 +15971,16 @@ index a3fee53..8ff3c76 100644
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
-@@ -601,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+@@ -601,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2008 Free Software Foundation, Inc.
-+Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-@@ -646,15 +682,13 @@ chmod +x "$CONFIG_LT"
+@@ -646,15 +684,13 @@ chmod +x "$CONFIG_LT"
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
@@ -16388,27 +16003,78 @@ index a3fee53..8ff3c76 100644
])# LT_OUTPUT
-@@ -717,15 +751,12 @@ _LT_EOF
+@@ -717,15 +753,12 @@ _LT_EOF
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
+-
+- _LT_PROG_XSI_SHELLFNS
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
-- _LT_PROG_XSI_SHELLFNS
-+ _LT_PROG_REPLACE_SHELLFNS
-
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
--
++ _LT_PROG_REPLACE_SHELLFNS
+
- mv -f "$cfgfile" "$ofile" ||
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
],
-@@ -831,11 +862,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+@@ -770,6 +803,7 @@ AC_DEFUN([LT_LANG],
+ m4_case([$1],
+ [C], [_LT_LANG(C)],
+ [C++], [_LT_LANG(CXX)],
++ [Go], [_LT_LANG(GO)],
+ [Java], [_LT_LANG(GCJ)],
+ [Fortran 77], [_LT_LANG(F77)],
+ [Fortran], [_LT_LANG(FC)],
+@@ -791,6 +825,31 @@ m4_defun([_LT_LANG],
+ ])# _LT_LANG
+
+
++m4_ifndef([AC_PROG_GO], [
++############################################################
++# NOTE: This macro has been submitted for inclusion into #
++# GNU Autoconf as AC_PROG_GO. When it is available in #
++# a released version of Autoconf we should remove this #
++# macro and use it instead. #
++############################################################
++m4_defun([AC_PROG_GO],
++[AC_LANG_PUSH(Go)dnl
++AC_ARG_VAR([GOC], [Go compiler command])dnl
++AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
++_AC_ARG_VAR_LDFLAGS()dnl
++AC_CHECK_TOOL(GOC, gccgo)
++if test -z "$GOC"; then
++ if test -n "$ac_tool_prefix"; then
++ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
++ fi
++fi
++if test -z "$GOC"; then
++ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
++fi
++])#m4_defun
++])#m4_ifndef
++
++
+ # _LT_LANG_DEFAULT_CONFIG
+ # -----------------------
+ m4_defun([_LT_LANG_DEFAULT_CONFIG],
+@@ -821,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+ m4_ifdef([LT_PROG_GCJ],
+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
++AC_PROVIDE_IFELSE([AC_PROG_GO],
++ [LT_LANG(GO)],
++ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
++
+ AC_PROVIDE_IFELSE([LT_PROG_RC],
+ [LT_LANG(RC)],
+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+@@ -831,11 +894,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
@@ -16422,10 +16088,34 @@ index a3fee53..8ff3c76 100644
# _LT_TAG_COMPILER
-@@ -940,6 +973,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+@@ -921,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++ # If there is a non-empty error log, and "single_module"
++ # appears in it, assume the flag caused a linker warning
++ if test -s conftest.err && $GREP single_module conftest.err; then
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ # Otherwise, if the output was created with a 0 exit code from
++ # the compiler, it worked.
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ 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],[
+ rm -rf libconftest.dylib*
+ rm -f conftest.*
+ fi])
++
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+@@ -940,6 +1012,34 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
++
+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+ [lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
@@ -16443,7 +16133,9 @@ index a3fee53..8ff3c76 100644
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
-+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
++ if test -s conftest.err && $GREP force_load conftest.err; then
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -16454,7 +16146,7 @@ index a3fee53..8ff3c76 100644
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -967,7 +1025,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+@@ -967,7 +1067,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -16463,20 +16155,33 @@ index a3fee53..8ff3c76 100644
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -987,7 +1045,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -977,8 +1077,8 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+ ])
+
+
+-# _LT_DARWIN_LINKER_FEATURES
+-# --------------------------
++# _LT_DARWIN_LINKER_FEATURES([TAG])
++# ---------------------------------
+ # Checks for linker and compiler features on darwin
+ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+ [
+@@ -987,7 +1087,13 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
++ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -995,7 +1057,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -995,7 +1101,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -16485,7 +16190,7 @@ index a3fee53..8ff3c76 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 +1073,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -1011,203 +1117,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
fi
])
@@ -16796,7 +16501,7 @@ index a3fee53..8ff3c76 100644
# _LT_ENABLE_LOCK
# ---------------
m4_defun([_LT_ENABLE_LOCK],
-@@ -1236,7 +1237,7 @@ ia64-*-hpux*)
+@@ -1236,7 +1281,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -16805,7 +16510,37 @@ index a3fee53..8ff3c76 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
-@@ -1354,14 +1355,47 @@ need_locks="$enable_libtool_lock"
+@@ -1329,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+-sparc*-*solaris*)
++*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+- yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ yes*)
++ case $host in
++ i?86-*-solaris*)
++ LD="${LD-ld} -m elf_x86_64"
++ ;;
++ sparc*-*-solaris*)
++ LD="${LD-ld} -m elf64_sparc"
++ ;;
++ esac
++ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
++ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
++ LD="${LD-ld}_sol2"
++ fi
++ ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+@@ -1354,14 +1412,47 @@ need_locks="$enable_libtool_lock"
])# _LT_ENABLE_LOCK
@@ -16858,9 +16593,20 @@ index a3fee53..8ff3c76 100644
AC_CHECK_TOOL(STRIP, strip, :)
test -z "$STRIP" && STRIP=:
-@@ -1388,10 +1422,19 @@ if test -n "$RANLIB"; then
+@@ -1380,18 +1471,27 @@ old_postuninstall_cmds=
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
+
+case $host_os in
@@ -16878,7 +16624,7 @@ index a3fee53..8ff3c76 100644
])# _LT_CMD_OLD_ARCHIVE
-@@ -1416,15 +1459,15 @@ AC_CACHE_CHECK([$1], [$2],
+@@ -1416,15 +1516,15 @@ AC_CACHE_CHECK([$1], [$2],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -16897,7 +16643,7 @@ index a3fee53..8ff3c76 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 +1507,7 @@ AC_CACHE_CHECK([$1], [$2],
+@@ -1464,7 +1564,7 @@ AC_CACHE_CHECK([$1], [$2],
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
@@ -16906,7 +16652,7 @@ index a3fee53..8ff3c76 100644
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -1527,6 +1570,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1527,6 +1627,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
@@ -16918,18 +16664,30 @@ index a3fee53..8ff3c76 100644
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -1591,8 +1639,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1552,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
++ os2*)
++ # The test takes a long time on OS/2.
++ lt_cv_sys_max_cmd_len=8192
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+@@ -1591,8 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -1643,7 +1691,7 @@ else
+@@ -1643,7 +1753,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -16938,7 +16696,7 @@ index a3fee53..8ff3c76 100644
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -1684,7 +1732,13 @@ else
+@@ -1684,7 +1794,13 @@ else
# endif
#endif
@@ -16953,7 +16711,7 @@ index a3fee53..8ff3c76 100644
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -1693,7 +1747,11 @@ int main ()
+@@ -1693,7 +1809,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -16966,7 +16724,7 @@ index a3fee53..8ff3c76 100644
/* dlclose (self); */
}
else
-@@ -1869,16 +1927,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+@@ -1869,16 +1989,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -16986,7 +16744,7 @@ index a3fee53..8ff3c76 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 +2095,7 @@ m4_require([_LT_DECL_EGREP])dnl
+@@ -2037,6 +2157,7 @@ m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -16994,7 +16752,7 @@ index a3fee53..8ff3c76 100644
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-@@ -2045,16 +2104,23 @@ if test "$GCC" = yes; then
+@@ -2045,16 +2166,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -17024,7 +16782,7 @@ index a3fee53..8ff3c76 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 +2133,7 @@ if test "$GCC" = yes; then
+@@ -2067,7 +2195,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -17033,7 +16791,7 @@ index a3fee53..8ff3c76 100644
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -2087,7 +2153,13 @@ BEGIN {RS=" "; FS="/|\n";} {
+@@ -2087,7 +2215,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
@@ -17048,7 +16806,25 @@ index a3fee53..8ff3c76 100644
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
-@@ -2175,7 +2247,7 @@ amigaos*)
+@@ -2113,7 +2247,7 @@ need_version=unknown
+
+ case $host_os in
+ aix3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+@@ -2122,7 +2256,7 @@ aix3*)
+ ;;
+
+ aix[[4-9]]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+@@ -2175,7 +2309,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -17057,7 +16833,16 @@ index a3fee53..8ff3c76 100644
;;
esac
;;
-@@ -2206,8 +2278,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -2187,7 +2321,7 @@ beos*)
+ ;;
+
+ bsdi[[45]]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -2206,8 +2340,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
@@ -17069,7 +16854,7 @@ index a3fee53..8ff3c76 100644
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -2228,36 +2301,83 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -2228,36 +2363,83 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -17167,7 +16952,52 @@ index a3fee53..8ff3c76 100644
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -2341,6 +2461,20 @@ gnu*)
+@@ -2278,7 +2460,7 @@ m4_if([$1], [],[
+ ;;
+
+ dgux*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -2286,10 +2468,6 @@ dgux*)
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
+- dynamic_linker=no
+- ;;
+-
+ freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -2297,7 +2475,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[[123]]*) objformat=aout ;;
++ freebsd[[23]].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -2315,7 +2493,7 @@ freebsd* | dragonfly*)
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+@@ -2335,12 +2513,26 @@ freebsd* | dragonfly*)
+ ;;
+
+ gnu*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -17176,7 +17006,7 @@ index a3fee53..8ff3c76 100644
+ ;;
+
+haiku*)
-+ version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
@@ -17188,7 +17018,7 @@ index a3fee53..8ff3c76 100644
hardcode_into_libs=yes
;;
-@@ -2386,8 +2520,10 @@ hpux9* | hpux10* | hpux11*)
+@@ -2386,12 +2578,14 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -17200,7 +17030,33 @@ index a3fee53..8ff3c76 100644
;;
interix[[3-9]]*)
-@@ -2454,16 +2590,21 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -2407,7 +2601,7 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+ fi ;;
+@@ -2444,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2454,16 +2648,21 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -17231,7 +17087,7 @@ index a3fee53..8ff3c76 100644
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
-@@ -2472,7 +2613,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -2472,7 +2671,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -17240,7 +17096,61 @@ index a3fee53..8ff3c76 100644
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -2717,6 +2858,8 @@ _LT_DECL([], [library_names_spec], [1],
+@@ -2516,7 +2715,7 @@ netbsd*)
+ ;;
+
+ newsos6)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+@@ -2585,7 +2784,7 @@ rdos*)
+ ;;
+
+ solaris*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2610,7 +2809,7 @@ sunos4*)
+ ;;
+
+ sysv4 | sysv4.3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2634,7 +2833,7 @@ sysv4 | sysv4.3*)
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2665,7 +2864,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+
+ tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2675,7 +2874,7 @@ tpf*)
+ ;;
+
+ uts4*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2717,6 +2916,8 @@ _LT_DECL([], [library_names_spec], [1],
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
@@ -17249,7 +17159,7 @@ index a3fee53..8ff3c76 100644
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
-@@ -2829,6 +2972,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+@@ -2829,6 +3030,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
@@ -17257,7 +17167,7 @@ index a3fee53..8ff3c76 100644
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
-@@ -2950,6 +3094,11 @@ case $reload_flag in
+@@ -2950,6 +3152,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
@@ -17269,7 +17179,7 @@ index a3fee53..8ff3c76 100644
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -2958,8 +3107,8 @@ case $host_os in
+@@ -2958,8 +3165,8 @@ case $host_os in
fi
;;
esac
@@ -17280,7 +17190,7 @@ index a3fee53..8ff3c76 100644
])# _LT_CMD_RELOAD
-@@ -3011,16 +3160,18 @@ mingw* | pw32*)
+@@ -3011,16 +3218,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -17302,7 +17212,7 @@ index a3fee53..8ff3c76 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 +3201,10 @@ gnu*)
+@@ -3050,6 +3259,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -17313,7 +17223,7 @@ index a3fee53..8ff3c76 100644
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -3058,11 +3213,11 @@ hpux10.20* | hpux11*)
+@@ -3058,11 +3271,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -17327,7 +17237,16 @@ index a3fee53..8ff3c76 100644
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -3162,6 +3317,21 @@ tpf*)
+@@ -3083,7 +3296,7 @@ irix5* | irix6* | nonstopux*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -3162,6 +3375,21 @@ tpf*)
;;
esac
])
@@ -17349,7 +17268,7 @@ index a3fee53..8ff3c76 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 +3339,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -3169,7 +3397,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
_LT_DECL([], [deplibs_check_method], [1],
[Method to check whether dependent libraries are shared objects])
_LT_DECL([], [file_magic_cmd], [1],
@@ -17362,11 +17281,12 @@ index a3fee53..8ff3c76 100644
])# _LT_CHECK_MAGIC_METHOD
-@@ -3226,7 +3400,19 @@ if test "$lt_cv_path_NM" != "no"; then
+@@ -3226,8 +3458,20 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+- AC_SUBST([DUMPBIN])
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
@@ -17380,10 +17300,11 @@ index a3fee53..8ff3c76 100644
+ ;;
+ esac
+ fi
- AC_SUBST([DUMPBIN])
++ AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -3239,13 +3425,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+ fi
+@@ -3239,13 +3483,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
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
@@ -17400,7 +17321,7 @@ index a3fee53..8ff3c76 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 +3446,67 @@ dnl aclocal-1.4 backwards compatibility:
+@@ -3260,6 +3504,67 @@ dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AM_PROG_NM], [])
dnl AC_DEFUN([AC_PROG_NM], [])
@@ -17468,7 +17389,7 @@ index a3fee53..8ff3c76 100644
# LT_LIB_M
# --------
-@@ -3268,7 +3515,7 @@ AC_DEFUN([LT_LIB_M],
+@@ -3268,7 +3573,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
@@ -17477,7 +17398,7 @@ index a3fee53..8ff3c76 100644
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
-@@ -3296,7 +3543,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
+@@ -3296,7 +3601,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
@@ -17491,7 +17412,7 @@ index a3fee53..8ff3c76 100644
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
-@@ -3313,6 +3565,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+@@ -3313,6 +3623,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
@@ -17499,7 +17420,7 @@ index a3fee53..8ff3c76 100644
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -3380,8 +3633,8 @@ esac
+@@ -3380,8 +3691,8 @@ esac
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
@@ -17510,7 +17431,15 @@ index a3fee53..8ff3c76 100644
# Handle CRLF in mingw tool chain
opt_cr=
-@@ -3417,6 +3670,7 @@ for ac_symprfx in "" "_"; do
+@@ -3405,6 +3716,7 @@ for ac_symprfx in "" "_"; do
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
+ " {last_section=section; section=\$ 3};"\
++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /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
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
@@ -17518,7 +17447,7 @@ index a3fee53..8ff3c76 100644
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -3438,7 +3692,7 @@ _LT_EOF
+@@ -3438,7 +3751,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -17527,7 +17456,7 @@ index a3fee53..8ff3c76 100644
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -3450,6 +3704,18 @@ _LT_EOF
+@@ -3450,6 +3763,18 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
@@ -17546,7 +17475,7 @@ index a3fee53..8ff3c76 100644
#ifdef __cplusplus
extern "C" {
#endif
-@@ -3461,7 +3727,7 @@ _LT_EOF
+@@ -3461,7 +3786,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
@@ -17555,7 +17484,7 @@ index a3fee53..8ff3c76 100644
const char *name;
void *address;
}
-@@ -3487,15 +3753,15 @@ static const void *lt_preloaded_setup() {
+@@ -3487,15 +3812,15 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
@@ -17575,7 +17504,7 @@ index a3fee53..8ff3c76 100644
else
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
fi
-@@ -3528,6 +3794,13 @@ else
+@@ -3528,6 +3853,13 @@ else
AC_MSG_RESULT(ok)
fi
@@ -17589,7 +17518,7 @@ index a3fee53..8ff3c76 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 +3811,8 @@ _LT_DECL([global_symbol_to_c_name_address],
+@@ -3538,6 +3870,8 @@ _LT_DECL([global_symbol_to_c_name_address],
_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])
@@ -17598,7 +17527,7 @@ index a3fee53..8ff3c76 100644
]) # _LT_CMD_GLOBAL_SYMBOLS
-@@ -3549,7 +3824,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
+@@ -3549,7 +3883,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)=
@@ -17606,7 +17535,7 @@ index a3fee53..8ff3c76 100644
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -3600,6 +3874,11 @@ m4_if([$1], [CXX], [
+@@ -3600,6 +3933,11 @@ m4_if([$1], [CXX], [
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -17618,7 +17547,7 @@ index a3fee53..8ff3c76 100644
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -3649,6 +3928,12 @@ m4_if([$1], [CXX], [
+@@ -3649,6 +3987,12 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -17631,7 +17560,7 @@ index a3fee53..8ff3c76 100644
dgux*)
case $cc_basename in
ec++*)
-@@ -3738,8 +4023,8 @@ m4_if([$1], [CXX], [
+@@ -3738,8 +4082,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -17642,7 +17571,7 @@ index a3fee53..8ff3c76 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 +4086,7 @@ m4_if([$1], [CXX], [
+@@ -3801,7 +4145,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
@@ -17651,7 +17580,7 @@ index a3fee53..8ff3c76 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 +4190,12 @@ m4_if([$1], [CXX], [
+@@ -3905,6 +4249,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -17664,7 +17593,7 @@ index a3fee53..8ff3c76 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 +4238,13 @@ m4_if([$1], [CXX], [
+@@ -3947,6 +4297,15 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
@@ -17672,13 +17601,15 @@ index a3fee53..8ff3c76 100644
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
++ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
++ fi
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -4010,7 +4308,13 @@ m4_if([$1], [CXX], [
+@@ -4010,7 +4369,13 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
@@ -17693,7 +17624,7 @@ index a3fee53..8ff3c76 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 +4326,25 @@ m4_if([$1], [CXX], [
+@@ -4022,25 +4387,40 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -17707,27 +17638,40 @@ index a3fee53..8ff3c76 100644
;;
*)
case `$CC -V 2>&1 | sed 5q` in
-- *Sun\ C*)
-- # Sun C 5.9
-+ *Sun\ F* | *Sun*Fortran*)
++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ *Sun\ F* | *Sun*Fortran*)
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
+ *Sun\ C*)
+ # Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ *Sun\ C*)
-+ # Sun C 5.9
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ *Intel*\ [[CF]]*Compiler*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++ ;;
++ *Portland\ Group*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
esac
;;
-@@ -4072,7 +4376,7 @@ m4_if([$1], [CXX], [
+@@ -4072,7 +4452,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
@@ -17736,7 +17680,7 @@ index a3fee53..8ff3c76 100644
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4129,9 +4433,11 @@ case $host_os in
+@@ -4129,9 +4509,11 @@ case $host_os in
_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
@@ -17751,7 +17695,7 @@ index a3fee53..8ff3c76 100644
#
# Check to make sure the PIC flag actually works.
-@@ -4150,6 +4456,8 @@ fi
+@@ -4150,6 +4532,8 @@ fi
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
[Additional compiler flags for building library objects])
@@ -17760,7 +17704,7 @@ index a3fee53..8ff3c76 100644
#
# Check to make sure the static flag actually works.
#
-@@ -4170,6 +4478,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+@@ -4170,6 +4554,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
m4_defun([_LT_LINKER_SHLIBS],
[AC_REQUIRE([LT_PATH_LD])dnl
AC_REQUIRE([LT_PATH_NM])dnl
@@ -17768,7 +17712,7 @@ index a3fee53..8ff3c76 100644
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -4178,30 +4487,38 @@ m4_require([_LT_TAG_COMPILER])dnl
+@@ -4178,30 +4563,40 @@ m4_require([_LT_TAG_COMPILER])dnl
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'
@@ -17795,7 +17739,9 @@ index a3fee53..8ff3c76 100644
- ;;
- linux* | k*bsd*-gnu)
+ case $cc_basename in
-+ cl*) ;;
++ cl*)
++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
++ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -17815,7 +17761,15 @@ index a3fee53..8ff3c76 100644
], [
runpath_var=
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -4261,13 +4578,39 @@ dnl Note also adjust exclude_expsyms for C++ above.
+@@ -4216,7 +4611,6 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+@@ -4261,13 +4655,39 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd*)
with_gnu_ld=no
;;
@@ -17856,7 +17810,7 @@ index a3fee53..8ff3c76 100644
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -4301,11 +4644,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
+@@ -4301,11 +4721,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -17872,7 +17826,7 @@ index a3fee53..8ff3c76 100644
_LT_EOF
fi
-@@ -4341,10 +4685,12 @@ _LT_EOF
+@@ -4341,10 +4762,12 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -17886,7 +17840,7 @@ index a3fee53..8ff3c76 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 +4708,11 @@ _LT_EOF
+@@ -4362,6 +4785,11 @@ _LT_EOF
fi
;;
@@ -17898,7 +17852,7 @@ index a3fee53..8ff3c76 100644
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4387,15 +4738,16 @@ _LT_EOF
+@@ -4387,15 +4815,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
@@ -17919,7 +17873,7 @@ index a3fee53..8ff3c76 100644
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -4406,13 +4758,17 @@ _LT_EOF
+@@ -4406,13 +4835,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
@@ -17939,7 +17893,7 @@ index a3fee53..8ff3c76 100644
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -4428,17 +4784,17 @@ _LT_EOF
+@@ -4428,17 +4861,16 @@ _LT_EOF
fi
case $cc_basename in
@@ -17947,9 +17901,10 @@ index a3fee53..8ff3c76 100644
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -17960,7 +17915,7 @@ index a3fee53..8ff3c76 100644
fi
;;
esac
-@@ -4452,8 +4808,8 @@ _LT_EOF
+@@ -4452,8 +4884,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -17971,7 +17926,7 @@ index a3fee53..8ff3c76 100644
fi
;;
-@@ -4471,8 +4827,8 @@ _LT_EOF
+@@ -4471,8 +4903,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17982,7 +17937,7 @@ index a3fee53..8ff3c76 100644
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4518,8 +4874,8 @@ _LT_EOF
+@@ -4518,8 +4950,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17993,7 +17948,7 @@ index a3fee53..8ff3c76 100644
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4559,8 +4915,10 @@ _LT_EOF
+@@ -4559,8 +4991,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -18005,7 +17960,7 @@ index a3fee53..8ff3c76 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 +5006,9 @@ _LT_EOF
+@@ -4648,9 +5082,9 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -18017,7 +17972,7 @@ index a3fee53..8ff3c76 100644
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -4659,14 +5017,19 @@ _LT_EOF
+@@ -4659,14 +5093,19 @@ _LT_EOF
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -18040,7 +17995,7 @@ index a3fee53..8ff3c76 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 +5061,63 @@ _LT_EOF
+@@ -4698,20 +5137,64 @@ _LT_EOF
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
@@ -18081,6 +18036,7 @@ index a3fee53..8ff3c76 100644
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -18118,7 +18074,27 @@ index a3fee53..8ff3c76 100644
;;
darwin* | rhapsody*)
-@@ -4749,7 +5155,7 @@ _LT_EOF
+@@ -4724,10 +5207,6 @@ _LT_EOF
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- freebsd1*)
+- _LT_TAGVAR(ld_shlibs, $1)=no
+- ;;
+-
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+@@ -4740,7 +5219,7 @@ _LT_EOF
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+@@ -4749,7 +5228,7 @@ _LT_EOF
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
@@ -18127,7 +18103,7 @@ index a3fee53..8ff3c76 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 +5163,7 @@ _LT_EOF
+@@ -4757,7 +5236,7 @@ _LT_EOF
hpux9*)
if test "$GCC" = yes; then
@@ -18136,7 +18112,7 @@ index a3fee53..8ff3c76 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,8 +5178,8 @@ _LT_EOF
+@@ -4772,14 +5251,13 @@ _LT_EOF
;;
hpux10*)
@@ -18147,7 +18123,13 @@ index a3fee53..8ff3c76 100644
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -4791,16 +5197,16 @@ _LT_EOF
+ if test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ _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
;;
hpux11*)
@@ -18167,7 +18149,7 @@ index a3fee53..8ff3c76 100644
;;
esac
else
-@@ -4812,7 +5218,14 @@ _LT_EOF
+@@ -4812,7 +5290,14 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -18183,7 +18165,7 @@ index a3fee53..8ff3c76 100644
;;
esac
fi
-@@ -4840,19 +5253,34 @@ _LT_EOF
+@@ -4840,19 +5325,34 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -18227,7 +18209,7 @@ index a3fee53..8ff3c76 100644
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4914,17 +5342,17 @@ _LT_EOF
+@@ -4914,17 +5414,17 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -18248,7 +18230,7 @@ index a3fee53..8ff3c76 100644
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4934,13 +5362,13 @@ _LT_EOF
+@@ -4934,13 +5434,13 @@ _LT_EOF
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -18265,7 +18247,7 @@ index a3fee53..8ff3c76 100644
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4953,9 +5381,9 @@ _LT_EOF
+@@ -4953,9 +5453,9 @@ _LT_EOF
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
@@ -18277,7 +18259,7 @@ index a3fee53..8ff3c76 100644
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -5131,36 +5559,38 @@ x|xyes)
+@@ -5131,36 +5631,38 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -18346,7 +18328,17 @@ index a3fee53..8ff3c76 100644
;;
esac
fi
-@@ -5225,8 +5655,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
+@@ -5197,9 +5699,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
+ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+ [Flag to hardcode $libdir into a binary during linking.
+ This must work even if $libdir does not exist])
+-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+- [[If ld is used when linking, flag to hardcode $libdir into a binary
+- during linking. This must work even if $libdir does not exist]])
+ _LT_TAGDECL([], [hardcode_libdir_separator], [1],
+ [Whether we need a single "-rpath" flag with a separated argument])
+ _LT_TAGDECL([], [hardcode_direct], [0],
+@@ -5225,8 +5724,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
to runtime path list])
_LT_TAGDECL([], [link_all_deplibs], [0],
[Whether libtool must link a program against all its dependency libraries])
@@ -18355,7 +18347,7 @@ index a3fee53..8ff3c76 100644
_LT_TAGDECL([], [always_export_symbols], [0],
[Set to "yes" if exported symbols are required])
_LT_TAGDECL([], [export_symbols_cmds], [2],
-@@ -5237,6 +5665,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
+@@ -5237,6 +5734,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
[Symbols that must always be exported])
_LT_TAGDECL([], [prelink_cmds], [2],
[Commands necessary for linking programs (against libraries) with templates])
@@ -18364,7 +18356,7 @@ index a3fee53..8ff3c76 100644
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
dnl FIXME: Not yet implemented
-@@ -5330,37 +5760,22 @@ CC="$lt_save_CC"
+@@ -5330,37 +5829,22 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
@@ -18411,7 +18403,15 @@ index a3fee53..8ff3c76 100644
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -5382,6 +5797,8 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -5372,7 +5856,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+@@ -5382,6 +5865,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -18420,7 +18420,7 @@ index a3fee53..8ff3c76 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 +5830,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5413,6 +5898,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
@@ -18428,7 +18428,7 @@ index a3fee53..8ff3c76 100644
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
-@@ -5430,6 +5848,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5430,6 +5916,7 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
@@ -18436,7 +18436,7 @@ index a3fee53..8ff3c76 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -5451,8 +5870,8 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5451,8 +5938,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 +18447,7 @@ index a3fee53..8ff3c76 100644
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5484,7 +5903,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5484,7 +5971,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 +18456,7 @@ index a3fee53..8ff3c76 100644
else
GXX=no
-@@ -5593,10 +6012,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5593,10 +6080,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -18469,7 +18469,7 @@ index a3fee53..8ff3c76 100644
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -5605,14 +6024,19 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5605,14 +6092,19 @@ if test "$_lt_caught_CXX_error" != yes; then
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -18492,7 +18492,7 @@ index a3fee53..8ff3c76 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -5642,28 +6066,75 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5642,28 +6134,75 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
cygwin* | mingw* | pw32* | cegcc*)
@@ -18590,7 +18590,16 @@ index a3fee53..8ff3c76 100644
darwin* | rhapsody*)
_LT_DARWIN_LINKER_FEATURES($1)
;;
-@@ -5705,6 +6176,11 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5686,7 +6225,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+ esac
+ ;;
+
+- freebsd[[12]]*)
++ freebsd2.*)
+ # 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
gnu*)
;;
@@ -18602,7 +18611,7 @@ index a3fee53..8ff3c76 100644
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -5729,11 +6205,11 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5729,11 +6273,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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.
@@ -18616,7 +18625,7 @@ index a3fee53..8ff3c76 100644
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5794,7 +6270,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5794,7 +6338,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 +18634,7 @@ index a3fee53..8ff3c76 100644
;;
*)
if test "$GXX" = yes; then
-@@ -5804,10 +6280,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5804,10 +6348,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
@@ -18638,7 +18647,7 @@ index a3fee53..8ff3c76 100644
;;
esac
fi
-@@ -5837,7 +6313,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5837,7 +6381,7 @@ if test "$_lt_caught_CXX_error" != yes; then
case $cc_basename in
CC*)
# SGI C++
@@ -18647,7 +18656,7 @@ index a3fee53..8ff3c76 100644
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -5848,9 +6324,9 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5848,9 +6392,9 @@ if test "$_lt_caught_CXX_error" != yes; then
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -18659,7 +18668,7 @@ index a3fee53..8ff3c76 100644
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -5879,7 +6355,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5879,7 +6423,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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.
@@ -18668,7 +18677,7 @@ index a3fee53..8ff3c76 100644
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5916,26 +6392,26 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5916,26 +6460,26 @@ if test "$_lt_caught_CXX_error" != yes; then
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -18701,7 +18710,7 @@ index a3fee53..8ff3c76 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 +6419,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5943,7 +6487,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -18710,7 +18719,7 @@ index a3fee53..8ff3c76 100644
;;
cxx*)
# Compaq C++
-@@ -5962,9 +6438,9 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5962,9 +6506,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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.
@@ -18722,7 +18731,7 @@ index a3fee53..8ff3c76 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 +6460,13 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5984,13 +6528,13 @@ if test "$_lt_caught_CXX_error" != yes; then
_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'
@@ -18738,7 +18747,7 @@ index a3fee53..8ff3c76 100644
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6059,7 +6535,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6059,7 +6603,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_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
@@ -18747,7 +18756,7 @@ index a3fee53..8ff3c76 100644
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -6094,15 +6570,15 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6094,15 +6638,15 @@ if test "$_lt_caught_CXX_error" != yes; then
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -18766,7 +18775,7 @@ index a3fee53..8ff3c76 100644
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
-@@ -6118,17 +6594,17 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6118,17 +6662,17 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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.
@@ -18787,7 +18796,7 @@ index a3fee53..8ff3c76 100644
;;
esac
-@@ -6138,7 +6614,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6138,7 +6682,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -18796,7 +18805,7 @@ index a3fee53..8ff3c76 100644
else
# FIXME: insert proper C++ library support
-@@ -6174,7 +6650,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6174,7 +6718,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris*)
case $cc_basename in
@@ -18805,7 +18814,7 @@ index a3fee53..8ff3c76 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 +6671,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6195,7 +6739,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -18814,7 +18823,7 @@ index a3fee53..8ff3c76 100644
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6215,14 +6691,14 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6215,14 +6759,14 @@ if test "$_lt_caught_CXX_error" != yes; then
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
@@ -18832,7 +18841,7 @@ index a3fee53..8ff3c76 100644
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -6233,7 +6709,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6233,7 +6777,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -18841,7 +18850,7 @@ index a3fee53..8ff3c76 100644
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-@@ -6287,6 +6763,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6287,6 +6831,10 @@ if test "$_lt_caught_CXX_error" != yes; then
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'
@@ -18852,7 +18861,7 @@ index a3fee53..8ff3c76 100644
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -6342,6 +6822,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6342,6 +6890,7 @@ if test "$_lt_caught_CXX_error" != yes; then
fi # test -n "$compiler"
CC=$lt_save_CC
@@ -18860,7 +18869,7 @@ index a3fee53..8ff3c76 100644
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
-@@ -6356,6 +6837,29 @@ AC_LANG_POP
+@@ -6356,6 +6905,29 @@ AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -18890,7 +18899,7 @@ index a3fee53..8ff3c76 100644
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
-@@ -6364,6 +6868,7 @@ AC_LANG_POP
+@@ -6364,6 +6936,7 @@ AC_LANG_POP
# objects, libraries and library flags.
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -18898,21 +18907,28 @@ index a3fee53..8ff3c76 100644
# Dependencies to place before and after the object being linked:
_LT_TAGVAR(predep_objects, $1)=
_LT_TAGVAR(postdep_objects, $1)=
-@@ -6414,6 +6919,13 @@ public class foo {
+@@ -6413,7 +6986,20 @@ public class foo {
+ }
};
_LT_EOF
++], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
++package foo
++func foo() {
++}
++_LT_EOF
])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
++*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
dnl Parse the compiler output and extract the necessary
dnl objects, libraries and library flags.
if AC_TRY_EVAL(ac_compile); then
-@@ -6425,7 +6937,7 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6425,7 +7011,7 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
@@ -18921,7 +18937,7 @@ index a3fee53..8ff3c76 100644
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
-@@ -6434,13 +6946,22 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6434,13 +7020,22 @@ if AC_TRY_EVAL(ac_compile); then
test $p = "-R"; then
prev=$p
continue
@@ -18948,7 +18964,7 @@ index a3fee53..8ff3c76 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 +6981,10 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6460,8 +7055,10 @@ if AC_TRY_EVAL(ac_compile); then
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
fi
fi
@@ -18959,7 +18975,7 @@ index a3fee53..8ff3c76 100644
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
-@@ -6497,6 +7020,7 @@ else
+@@ -6497,6 +7094,7 @@ else
fi
$RM -f confest.$objext
@@ -18967,7 +18983,7 @@ index a3fee53..8ff3c76 100644
# PORTME: override above test on systems where it is broken
m4_if([$1], [CXX],
-@@ -6533,7 +7057,7 @@ linux*)
+@@ -6533,7 +7131,7 @@ linux*)
solaris*)
case $cc_basename in
@@ -18976,7 +18992,7 @@ index a3fee53..8ff3c76 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 +7101,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
+@@ -6577,32 +7175,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
])# _LT_SYS_HIDDEN_LIBDEPS
@@ -19013,7 +19029,15 @@ index a3fee53..8ff3c76 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6621,6 +7129,8 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -6612,7 +7194,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=no
+@@ -6621,6 +7202,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -19022,7 +19046,7 @@ index a3fee53..8ff3c76 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 +7170,9 @@ if test "$_lt_disable_F77" != yes; then
+@@ -6660,7 +7243,9 @@ if test "$_lt_disable_F77" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
@@ -19032,7 +19056,7 @@ index a3fee53..8ff3c76 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -6714,38 +7226,24 @@ if test "$_lt_disable_F77" != yes; then
+@@ -6714,38 +7299,24 @@ if test "$_lt_disable_F77" != yes; then
GCC=$lt_save_GCC
CC="$lt_save_CC"
@@ -19077,7 +19101,15 @@ index a3fee53..8ff3c76 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6764,6 +7262,8 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -6755,7 +7326,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=no
+@@ -6764,6 +7334,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -19086,7 +19118,7 @@ index a3fee53..8ff3c76 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 +7303,9 @@ if test "$_lt_disable_FC" != yes; then
+@@ -6803,7 +7375,9 @@ if test "$_lt_disable_FC" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
@@ -19096,7 +19128,7 @@ index a3fee53..8ff3c76 100644
compiler=$CC
GCC=$ac_cv_fc_compiler_gnu
-@@ -6859,7 +7361,8 @@ if test "$_lt_disable_FC" != yes; then
+@@ -6859,7 +7433,8 @@ if test "$_lt_disable_FC" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
@@ -19106,7 +19138,7 @@ index a3fee53..8ff3c76 100644
fi # test "$_lt_disable_FC" != yes
AC_LANG_POP
-@@ -6896,10 +7399,12 @@ _LT_COMPILER_BOILERPLATE
+@@ -6896,10 +7471,12 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
@@ -19120,7 +19152,7 @@ index a3fee53..8ff3c76 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
-@@ -6909,6 +7414,8 @@ _LT_CC_BASENAME([$compiler])
+@@ -6909,6 +7486,8 @@ _LT_CC_BASENAME([$compiler])
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -19129,7 +19161,7 @@ index a3fee53..8ff3c76 100644
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -6928,7 +7435,8 @@ fi
+@@ -6928,10 +7507,82 @@ fi
AC_LANG_RESTORE
GCC=$lt_save_GCC
@@ -19139,7 +19171,81 @@ index a3fee53..8ff3c76 100644
])# _LT_LANG_GCJ_CONFIG
-@@ -6963,9 +7471,11 @@ _LT_LINKER_BOILERPLATE
++# _LT_LANG_GO_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for the GNU Go compiler
++# are suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_GO_CONFIG],
++[AC_REQUIRE([LT_PROG_GO])dnl
++AC_LANG_SAVE
++
++# Source file extension for Go test sources.
++ac_ext=go
++
++# Object file extension for compiled Go test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="package main; func main() { }"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='package main; func main() { }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_CFLAGS=$CFLAGS
++lt_save_GCC=$GCC
++GCC=yes
++CC=${GOC-"gccgo"}
++CFLAGS=$GOFLAGS
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_TAGVAR(LD, $1)="$LD"
++_LT_CC_BASENAME([$compiler])
++
++# Go did not exist at the time GCC didn't implicitly link libc in.
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++if test -n "$compiler"; then
++ _LT_COMPILER_NO_RTTI($1)
++ _LT_COMPILER_PIC($1)
++ _LT_COMPILER_C_O($1)
++ _LT_COMPILER_FILE_LOCKS($1)
++ _LT_LINKER_SHLIBS($1)
++ _LT_LINKER_HARDCODE_LIBPATH($1)
++
++ _LT_CONFIG($1)
++fi
++
++AC_LANG_RESTORE
++
++GCC=$lt_save_GCC
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
++])# _LT_LANG_GO_CONFIG
++
++
+ # _LT_LANG_RC_CONFIG([TAG])
+ # -------------------------
+ # Ensure that the configuration variables for the Windows resource compiler
+@@ -6963,9 +7614,11 @@ _LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
@@ -19151,7 +19257,7 @@ index a3fee53..8ff3c76 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -6978,7 +7488,8 @@ fi
+@@ -6978,7 +7631,8 @@ fi
GCC=$lt_save_GCC
AC_LANG_RESTORE
@@ -19161,12 +19267,26 @@ index a3fee53..8ff3c76 100644
])# _LT_LANG_RC_CONFIG
-@@ -7037,6 +7548,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
- AC_SUBST([OBJDUMP])
- ])
+@@ -6998,6 +7652,13 @@ dnl aclocal-1.4 backwards compatibility:
+ dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-+# _LT_DECL_DLLTOOL
-+# ----------------
+
++# LT_PROG_GO
++# ----------
++AC_DEFUN([LT_PROG_GO],
++[AC_CHECK_TOOL(GOC, gccgo,)
++])
++
++
+ # LT_PROG_RC
+ # ----------
+ AC_DEFUN([LT_PROG_RC],
+@@ -7037,6 +7698,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+ AC_SUBST([OBJDUMP])
+ ])
+
++# _LT_DECL_DLLTOOL
++# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -19177,7 +19297,7 @@ index a3fee53..8ff3c76 100644
# _LT_DECL_SED
# ------------
-@@ -7130,8 +7650,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
+@@ -7130,8 +7800,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
@@ -19188,7 +19308,7 @@ index a3fee53..8ff3c76 100644
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-@@ -7170,208 +7690,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+@@ -7170,208 +7840,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
@@ -19273,19 +19393,6 @@ index a3fee53..8ff3c76 100644
-{
- func_xform_result=${1%.*}.lo
-}
--
--# func_arith arithmetic-term...
--func_arith ()
--{
-- func_arith_result=$(( $[*] ))
--}
--
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
-- func_len_result=${#1}
--}
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
@@ -19302,23 +19409,17 @@ index a3fee53..8ff3c76 100644
+test 0 -eq $? || _lt_function_replace_fail=:
+])
--_LT_EOF
-- ;;
-- *) # Bourne compatible functions.
-- cat << \_LT_EOF >> "$cfgfile"
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=$(( $[*] ))
+-}
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE. If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
-{
-- # Extract subdirectory from the argument.
-- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-- if test "X$func_dirname_result" = "X${1}"; then
-- func_dirname_result="${3}"
-- else
-- func_dirname_result="$func_dirname_result${2}"
-- fi
+- func_len_result=${#1}
-}
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
@@ -19342,11 +19443,10 @@ index a3fee53..8ff3c76 100644
+ esac
+ func_basename_result="${1##*/}"])
--# func_basename file
--func_basename ()
--{
-- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
--}
+-_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.
@@ -19354,13 +19454,41 @@ index a3fee53..8ff3c76 100644
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}])
--dnl func_dirname_and_basename
--dnl A portable version of this function is already defined in general.m4sh
--dnl so there is no need for it here.
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+- # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+- if test "X$func_dirname_result" = "X${1}"; then
+- func_dirname_result="${3}"
+- else
+- func_dirname_result="$func_dirname_result${2}"
+- fi
+-}
+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+ func_split_long_opt_name=${1%%=*}
+ func_split_long_opt_arg=${1#*=}])
+-# 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"}])
+
+-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])
+
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
@@ -19376,18 +19504,12 @@ index a3fee53..8ff3c76 100644
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- 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"}])
++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-+ _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_arith], [ func_arith_result=$(( $[*] ))])
-# func_opt_split
-func_opt_split ()
@@ -19395,15 +19517,13 @@ index a3fee53..8ff3c76 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_xform], [ func_xform_result=${1%.*}.lo])
-
+-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
+-
-# func_xform libobj-or-source
-func_xform ()
-{
@@ -19540,7 +19660,7 @@ index a3fee53..8ff3c76 100644
+ [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
-index 34151a3..17cfd51 100644
+index 34151a3..5d9acd8 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,13 +1,14 @@
@@ -19586,8 +19706,35 @@ index 34151a3..17cfd51 100644
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+@@ -325,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+ # MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+ m4_define([_LT_WITH_PIC],
+ [AC_ARG_WITH([pic],
+- [AS_HELP_STRING([--with-pic],
++ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+- [pic_mode="$withval"],
++ [lt_p=${PACKAGE-default}
++ case $withval in
++ yes|no) pic_mode=$withval ;;
++ *)
++ pic_mode=default
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for lt_pkg in $withval; do
++ IFS="$lt_save_ifs"
++ if test "X$lt_pkg" = "X$lt_p"; then
++ pic_mode=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
+ [pic_mode=default])
+
+ test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
-index f3c5309..9c7b5d4 100644
+index f3c5309..07a8602 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -7,17 +7,17 @@
@@ -19598,19 +19745,19 @@ index f3c5309..9c7b5d4 100644
+# @configure_input@
-# serial 3017 ltversion.m4
-+# serial 3293 ltversion.m4
++# serial 3337 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
-+m4_define([LT_PACKAGE_VERSION], [2.4])
-+m4_define([LT_PACKAGE_REVISION], [1.3293])
++m4_define([LT_PACKAGE_VERSION], [2.4.2])
++m4_define([LT_PACKAGE_REVISION], [1.3337])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
-+[macro_version='2.4'
-+macro_revision='1.3293'
++[macro_version='2.4.2'
++macro_revision='1.3337'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
@@ -19654,10 +19801,10 @@ index 637bb20..c573da9 100644
+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 b8d7ffa..d1e12ca 100644
+index 8758ac8..678bebb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19665,15 +19812,15 @@ index b8d7ffa..d1e12ca 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19681,7 +19828,7 @@ index b8d7ffa..d1e12ca 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19690,10 +19837,10 @@ index b8d7ffa..d1e12ca 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
-index 4963e18..842b4af 100644
+index 701c05d..206350f 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19701,15 +19848,15 @@ index 4963e18..842b4af 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19717,7 +19864,7 @@ index 4963e18..842b4af 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19726,10 +19873,10 @@ index 4963e18..842b4af 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules/grid/Makefile.in b/src/modules/grid/Makefile.in
-index aa96dde..60d09d3 100644
+index 165f3da..441f980 100644
--- a/src/modules/grid/Makefile.in
+++ b/src/modules/grid/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19737,15 +19884,15 @@ index aa96dde..60d09d3 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19753,7 +19900,7 @@ index aa96dde..60d09d3 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19762,10 +19909,10 @@ index aa96dde..60d09d3 100644
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 5e05bf1..ef6cfca 100644
+index b2cb540..69b810b 100644
--- a/src/modules/grid/grid_analysis/Makefile.in
+++ b/src/modules/grid/grid_analysis/Makefile.in
-@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -133,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19773,15 +19920,15 @@ index 5e05bf1..ef6cfca 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -159,6 +160,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
+@@ -197,6 +199,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19789,7 +19936,7 @@ index 5e05bf1..ef6cfca 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@
+@@ -230,7 +233,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19798,10 +19945,10 @@ index 5e05bf1..ef6cfca 100644
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 d5a2d54..2e5e72e 100644
+index 120fe40..b3034b8 100644
--- a/src/modules/grid/grid_calculus/Makefile.in
+++ b/src/modules/grid/grid_calculus/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19809,15 +19956,15 @@ index d5a2d54..2e5e72e 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19825,7 +19972,7 @@ index d5a2d54..2e5e72e 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@
+@@ -228,7 +231,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19834,10 +19981,10 @@ index d5a2d54..2e5e72e 100644
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 712500f..8f98ab7 100644
+index 3945ad5..e3ba009 100644
--- a/src/modules/grid/grid_calculus_bsl/Makefile.in
+++ b/src/modules/grid/grid_calculus_bsl/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19845,15 +19992,15 @@ index 712500f..8f98ab7 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19861,7 +20008,7 @@ index 712500f..8f98ab7 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@
+@@ -228,7 +231,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19870,10 +20017,10 @@ index 712500f..8f98ab7 100644
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 043c7bb..60d45fa 100644
+index 34636b9..cce5e07 100644
--- a/src/modules/grid/grid_filter/Makefile.in
+++ b/src/modules/grid/grid_filter/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19881,15 +20028,15 @@ index 043c7bb..60d45fa 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19897,7 +20044,7 @@ index 043c7bb..60d45fa 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19906,19 +20053,19 @@ index 043c7bb..60d45fa 100644
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 678516b..2a7bc03 100644
+index ab3ea25..4fbdf7c 100644
--- a/src/modules/grid/grid_gridding/Makefile.in
+++ b/src/modules/grid/grid_gridding/Makefile.in
-@@ -80,7 +80,7 @@ am_libgrid_gridding_la_OBJECTS = Interpolation.lo \
+@@ -81,7 +81,7 @@ am_libgrid_gridding_la_OBJECTS = Interpolation.lo \
Interpolation_NearestNeighbour.lo Interpolation_Shepard.lo \
Interpolation_Triangulation.lo kernel_density.lo \
MLB_Interface.lo Shapes2Grid.lo Shepard.lo delaunay.lo hash.lo \
- istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo triangle.lo
+ istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo
libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS)
- DEFAULT_INCLUDES = -I. at am__isrc@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19926,15 +20073,15 @@ index 678516b..2a7bc03 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19942,7 +20089,7 @@ index 678516b..2a7bc03 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@
+@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19950,7 +20097,7 @@ index 678516b..2a7bc03 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -256,7 +258,7 @@ top_srcdir = @top_srcdir@
+@@ -259,7 +261,7 @@ top_srcdir = @top_srcdir@
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)
@@ -19959,7 +20106,7 @@ index 678516b..2a7bc03 100644
pkglib_LTLIBRARIES = libgrid_gridding.la
libgrid_gridding_la_SOURCES = \
Interpolation.cpp\
-@@ -276,7 +278,6 @@ Shepard.cpp\
+@@ -279,7 +281,6 @@ Shepard.cpp\
./nn/nnai.c\
./nn/nncommon.c\
./nn/nnpi.c\
@@ -19967,7 +20114,7 @@ index 678516b..2a7bc03 100644
Interpolation.h\
Interpolation_InverseDistance.h\
Interpolation_NaturalNeighbour.h\
-@@ -292,7 +293,6 @@ Shepard.h\
+@@ -295,7 +296,6 @@ Shepard.h\
./nn/istack.h\
./nn/nan.h\
./nn/nn.h\
@@ -19975,7 +20122,7 @@ index 678516b..2a7bc03 100644
./nn/version.h
libgrid_gridding_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
-@@ -387,7 +387,6 @@ distclean-compile:
+@@ -390,7 +390,6 @@ distclean-compile:
@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@
@@ -19983,7 +20130,7 @@ index 678516b..2a7bc03 100644
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -459,13 +458,6 @@ nnpi.lo: ./nn/nnpi.c
+@@ -462,13 +461,6 @@ nnpi.lo: ./nn/nnpi.c
@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
@@ -19998,10 +20145,10 @@ index 678516b..2a7bc03 100644
@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 da69567..6cc9a64 100644
+index 15ac42b..7e7156c 100644
--- a/src/modules/grid/grid_spline/Makefile.in
+++ b/src/modules/grid/grid_spline/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20009,15 +20156,15 @@ index da69567..6cc9a64 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20025,7 +20172,7 @@ index da69567..6cc9a64 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@
+@@ -227,7 +230,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20034,10 +20181,10 @@ index da69567..6cc9a64 100644
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 d1e00ef..248a375 100644
+index 020f381..75d0a57 100644
--- a/src/modules/grid/grid_tools/Makefile.in
+++ b/src/modules/grid/grid_tools/Makefile.in
-@@ -134,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -136,6 +136,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20045,15 +20192,15 @@ index d1e00ef..248a375 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -162,6 +163,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
+@@ -200,6 +202,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20061,7 +20208,7 @@ index d1e00ef..248a375 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@
+@@ -233,7 +236,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20070,10 +20217,10 @@ index d1e00ef..248a375 100644
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 2499776..5a9cee2 100644
+index af2b578..e1af16c 100644
--- a/src/modules/grid/grid_visualisation/Makefile.in
+++ b/src/modules/grid/grid_visualisation/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20081,15 +20228,15 @@ index 2499776..5a9cee2 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20097,7 +20244,7 @@ index 2499776..5a9cee2 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@
+@@ -228,7 +231,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20106,10 +20253,10 @@ index 2499776..5a9cee2 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules/pointcloud/Makefile.in b/src/modules/pointcloud/Makefile.in
-index 452ba3b..58bbfe6 100644
+index 7b9ab32..d99752f 100644
--- a/src/modules/pointcloud/Makefile.in
+++ b/src/modules/pointcloud/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20117,15 +20264,15 @@ index 452ba3b..58bbfe6 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20133,7 +20280,7 @@ index 452ba3b..58bbfe6 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20142,10 +20289,10 @@ index 452ba3b..58bbfe6 100644
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 44bae2d..3a88dec 100644
+index 6f31ca3..5ece3f0 100644
--- a/src/modules/pointcloud/pointcloud_tools/Makefile.in
+++ b/src/modules/pointcloud/pointcloud_tools/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20153,15 +20300,15 @@ index 44bae2d..3a88dec 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20169,7 +20316,7 @@ index 44bae2d..3a88dec 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@
+@@ -227,7 +230,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20178,10 +20325,10 @@ index 44bae2d..3a88dec 100644
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 d8ab51c..0e8edbc 100644
+index 5425739..322b4ae 100644
--- a/src/modules/pointcloud/pointcloud_viewer/Makefile.in
+++ b/src/modules/pointcloud/pointcloud_viewer/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20189,15 +20336,15 @@ index d8ab51c..0e8edbc 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20205,7 +20352,7 @@ index d8ab51c..0e8edbc 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@
+@@ -227,7 +230,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20214,10 +20361,10 @@ index d8ab51c..0e8edbc 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules/shapes/Makefile.in b/src/modules/shapes/Makefile.in
-index a36d98b..119f330 100644
+index bd4a260..01c1ff3 100644
--- a/src/modules/shapes/Makefile.in
+++ b/src/modules/shapes/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20225,15 +20372,15 @@ index a36d98b..119f330 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20241,7 +20388,7 @@ index a36d98b..119f330 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20250,10 +20397,10 @@ index a36d98b..119f330 100644
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 29397b8..713a629 100644
+index bcfc2ed..f273722 100644
--- a/src/modules/shapes/shapes_grid/Makefile.in
+++ b/src/modules/shapes/shapes_grid/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20261,15 +20408,15 @@ index 29397b8..713a629 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20277,7 +20424,7 @@ index 29397b8..713a629 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@
+@@ -228,7 +231,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20286,10 +20433,10 @@ index 29397b8..713a629 100644
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 f346419..260f305 100644
+index faefd7d..0dd40fc 100644
--- a/src/modules/shapes/shapes_lines/Makefile.in
+++ b/src/modules/shapes/shapes_lines/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20297,15 +20444,15 @@ index f346419..260f305 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20313,7 +20460,7 @@ index f346419..260f305 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20322,10 +20469,10 @@ index f346419..260f305 100644
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 62b5a63..857bb36 100644
+index cc358de..d9513ab 100644
--- a/src/modules/shapes/shapes_points/Makefile.in
+++ b/src/modules/shapes/shapes_points/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20333,15 +20480,15 @@ index 62b5a63..857bb36 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20349,7 +20496,7 @@ index 62b5a63..857bb36 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@
+@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20358,10 +20505,10 @@ index 62b5a63..857bb36 100644
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 51025d4..12bdfd0 100644
+index cace281..c514dfc 100644
--- a/src/modules/shapes/shapes_polygons/Makefile.in
+++ b/src/modules/shapes/shapes_polygons/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20369,15 +20516,15 @@ index 51025d4..12bdfd0 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20385,7 +20532,7 @@ index 51025d4..12bdfd0 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@
+@@ -228,7 +231,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20394,10 +20541,10 @@ index 51025d4..12bdfd0 100644
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 a99dabf..5c1def8 100644
+index 9743244..dff52dd 100644
--- a/src/modules/shapes/shapes_tools/Makefile.in
+++ b/src/modules/shapes/shapes_tools/Makefile.in
-@@ -133,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -134,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20405,15 +20552,15 @@ index a99dabf..5c1def8 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -160,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -198,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20421,7 +20568,7 @@ index a99dabf..5c1def8 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@
+@@ -231,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20430,10 +20577,10 @@ index a99dabf..5c1def8 100644
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 2ad957a..ab24d76 100644
+index 945084e..dbbd6cf 100644
--- a/src/modules/shapes/shapes_transect/Makefile.in
+++ b/src/modules/shapes/shapes_transect/Makefile.in
-@@ -125,6 +125,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20441,15 +20588,15 @@ index 2ad957a..ab24d76 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -149,6 +150,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -187,6 +189,7 @@ abs_builddir = @abs_builddir@
+@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20457,7 +20604,7 @@ index 2ad957a..ab24d76 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -220,7 +223,6 @@ libdir = @libdir@
+@@ -223,7 +226,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20466,10 +20613,10 @@ index 2ad957a..ab24d76 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules/table/Makefile.in b/src/modules/table/Makefile.in
-index 6129dee..dafc758 100644
+index 42558e0..dba3499 100644
--- a/src/modules/table/Makefile.in
+++ b/src/modules/table/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20477,15 +20624,15 @@ index 6129dee..dafc758 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20493,7 +20640,7 @@ index 6129dee..dafc758 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20502,10 +20649,10 @@ index 6129dee..dafc758 100644
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 297c3ed..0ba59a4 100644
+index a404f86..3658df8 100644
--- a/src/modules/table/table_calculus/Makefile.in
+++ b/src/modules/table/table_calculus/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20513,15 +20660,15 @@ index 297c3ed..0ba59a4 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20529,7 +20676,7 @@ index 297c3ed..0ba59a4 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20538,10 +20685,10 @@ index 297c3ed..0ba59a4 100644
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 0670fd5..ca5dc2f 100644
+index 529ee4a..a98b65c 100644
--- a/src/modules/table/table_tools/Makefile.in
+++ b/src/modules/table/table_tools/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20549,15 +20696,15 @@ index 0670fd5..ca5dc2f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -150,6 +151,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -188,6 +190,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20565,7 +20712,7 @@ index 0670fd5..ca5dc2f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -221,7 +224,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20574,10 +20721,10 @@ index 0670fd5..ca5dc2f 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules/tin/Makefile.in b/src/modules/tin/Makefile.in
-index 0c76d5c..060ebbd 100644
+index 4f4e4c5..1eae4f7 100644
--- a/src/modules/tin/Makefile.in
+++ b/src/modules/tin/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20585,15 +20732,15 @@ index 0c76d5c..060ebbd 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20601,7 +20748,7 @@ index 0c76d5c..060ebbd 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20610,10 +20757,10 @@ index 0c76d5c..060ebbd 100644
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 5fb0751..7b68989 100644
+index a0e403e..f23cefb 100644
--- a/src/modules/tin/tin_tools/Makefile.in
+++ b/src/modules/tin/tin_tools/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20621,15 +20768,15 @@ index 5fb0751..7b68989 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20637,7 +20784,7 @@ index 5fb0751..7b68989 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20646,10 +20793,10 @@ index 5fb0751..7b68989 100644
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 eed1957..0b46856 100644
+index d1f89c6..521b5f9 100644
--- a/src/modules/tin/tin_viewer/Makefile.in
+++ b/src/modules/tin/tin_viewer/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20657,15 +20804,15 @@ index eed1957..0b46856 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20673,7 +20820,7 @@ index eed1957..0b46856 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20682,10 +20829,10 @@ index eed1957..0b46856 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_contrib/Makefile.in b/src/modules_contrib/Makefile.in
-index 09162a3..0f208b0 100644
+index 040184d..6d0f635 100644
--- a/src/modules_contrib/Makefile.in
+++ b/src/modules_contrib/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20693,15 +20840,15 @@ index 09162a3..0f208b0 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20709,7 +20856,7 @@ index 09162a3..0f208b0 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20718,10 +20865,10 @@ index 09162a3..0f208b0 100644
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 bd98ea4..f7e83ac 100644
+index 4ec3db3..0862ab5 100644
--- a/src/modules_contrib/contrib_a_perego/Makefile.in
+++ b/src/modules_contrib/contrib_a_perego/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20729,15 +20876,15 @@ index bd98ea4..f7e83ac 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20745,7 +20892,7 @@ index bd98ea4..f7e83ac 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20754,10 +20901,10 @@ index bd98ea4..f7e83ac 100644
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 6d91fef..d310edd 100644
+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
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20765,15 +20912,15 @@ index 6d91fef..d310edd 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20781,7 +20928,7 @@ index 6d91fef..d310edd 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20790,10 +20937,10 @@ index 6d91fef..d310edd 100644
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 ef4982a..af06e37 100644
+index 17893b4..3eadf90 100644
--- a/src/modules_contrib/contrib_s_liersch/Makefile.in
+++ b/src/modules_contrib/contrib_s_liersch/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20801,15 +20948,15 @@ index ef4982a..af06e37 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20817,7 +20964,7 @@ index ef4982a..af06e37 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20826,10 +20973,10 @@ index ef4982a..af06e37 100644
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 61d149c..1d3f58d 100644
+index 41fb921..4462fc7 100644
--- a/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
+++ b/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20837,15 +20984,15 @@ index 61d149c..1d3f58d 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20853,7 +21000,7 @@ index 61d149c..1d3f58d 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20862,10 +21009,10 @@ index 61d149c..1d3f58d 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_contrib/garden/Makefile.in b/src/modules_contrib/garden/Makefile.in
-index 1270345..097b87f 100644
+index 4e820cc..340f138 100644
--- a/src/modules_contrib/garden/Makefile.in
+++ b/src/modules_contrib/garden/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20873,15 +21020,15 @@ index 1270345..097b87f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20889,7 +21036,7 @@ index 1270345..097b87f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20898,9 +21045,45 @@ index 1270345..097b87f 100644
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 4993b2a..10d282e 100644
+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@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLELIBHARU = @DISABLELIBHARU@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -226,7 +229,6 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ 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@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -20909,15 +21092,15 @@ index 4993b2a..10d282e 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20925,7 +21108,7 @@ index 4993b2a..10d282e 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@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20934,10 +21117,10 @@ index 4993b2a..10d282e 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_geostatistics/Makefile.in b/src/modules_geostatistics/Makefile.in
-index c0fa9c7..0b65b3f 100644
+index b8cb4ff..e053653 100644
--- a/src/modules_geostatistics/Makefile.in
+++ b/src/modules_geostatistics/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20945,15 +21128,15 @@ index c0fa9c7..0b65b3f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20961,7 +21144,7 @@ index c0fa9c7..0b65b3f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20970,10 +21153,10 @@ index c0fa9c7..0b65b3f 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_geostatistics/geostatistics/Makefile.in b/src/modules_geostatistics/geostatistics/Makefile.in
-index a9ef902..c11c8b4 100644
+index eeff88a..a13ae91 100644
--- a/src/modules_geostatistics/geostatistics/Makefile.in
+++ b/src/modules_geostatistics/geostatistics/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -115,6 +115,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20981,15 +21164,15 @@ index a9ef902..c11c8b4 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -141,6 +142,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -179,6 +181,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20997,7 +21180,7 @@ index a9ef902..c11c8b4 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -212,7 +215,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21006,10 +21189,10 @@ index a9ef902..c11c8b4 100644
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 f396cf3..a559952 100644
+index a4c8283..6aa80cd 100644
--- a/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
+++ b/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
-@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21017,15 +21200,15 @@ index f396cf3..a559952 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21033,7 +21216,7 @@ index f396cf3..a559952 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@
+@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21042,10 +21225,10 @@ index f396cf3..a559952 100644
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 1303b99..cb8102a 100644
+index 347e1f6..636d2a3 100644
--- a/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
+++ b/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
-@@ -133,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -134,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21053,15 +21236,15 @@ index 1303b99..cb8102a 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -160,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -198,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21069,7 +21252,7 @@ index 1303b99..cb8102a 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@
+@@ -231,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21078,10 +21261,10 @@ index 1303b99..cb8102a 100644
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 b54fa6f..649f53d 100644
+index 37b0bf4..71e44c9 100644
--- a/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
+++ b/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21089,15 +21272,15 @@ index b54fa6f..649f53d 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21105,7 +21288,7 @@ index b54fa6f..649f53d 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@
+@@ -227,7 +230,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21114,10 +21297,10 @@ index b54fa6f..649f53d 100644
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 0d3dfcc..c1aee53 100644
+index 5b1aaaa..fbe3ee4 100644
--- a/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
+++ b/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21125,15 +21308,15 @@ index 0d3dfcc..c1aee53 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21141,7 +21324,7 @@ index 0d3dfcc..c1aee53 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@
+@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21150,10 +21333,10 @@ index 0d3dfcc..c1aee53 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_images/Makefile.in b/src/modules_images/Makefile.in
-index f0ebecf..8cc2958 100644
+index cf72430..84c6563 100644
--- a/src/modules_images/Makefile.in
+++ b/src/modules_images/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21161,15 +21344,15 @@ index f0ebecf..8cc2958 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21177,7 +21360,7 @@ index f0ebecf..8cc2958 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21186,10 +21369,10 @@ index f0ebecf..8cc2958 100644
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 784e27e..aa2410d 100644
+index a0afe21..ad90c79 100644
--- a/src/modules_images/modules_imagery/Makefile.in
+++ b/src/modules_images/modules_imagery/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21197,15 +21380,15 @@ index 784e27e..aa2410d 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21213,7 +21396,7 @@ index 784e27e..aa2410d 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21222,10 +21405,10 @@ index 784e27e..aa2410d 100644
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 eac3e8f..6b5f7fd 100644
+index 359a850..a4ce68f 100644
--- a/src/modules_images/modules_imagery/imagery_classification/Makefile.in
+++ b/src/modules_images/modules_imagery/imagery_classification/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21233,15 +21416,15 @@ index eac3e8f..6b5f7fd 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21249,7 +21432,7 @@ index eac3e8f..6b5f7fd 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21258,10 +21441,10 @@ index eac3e8f..6b5f7fd 100644
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 4a817b7..eb0866e 100644
+index 98847fd..379be5f 100644
--- a/src/modules_images/modules_imagery/imagery_rga/Makefile.in
+++ b/src/modules_images/modules_imagery/imagery_rga/Makefile.in
-@@ -125,6 +125,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21269,15 +21452,15 @@ index 4a817b7..eb0866e 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -149,6 +150,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -187,6 +189,7 @@ abs_builddir = @abs_builddir@
+@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21285,7 +21468,7 @@ index 4a817b7..eb0866e 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -220,7 +223,6 @@ libdir = @libdir@
+@@ -223,7 +226,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21294,10 +21477,10 @@ index 4a817b7..eb0866e 100644
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 154a9ac..eab154c 100644
+index 6228f95..d6888a6 100644
--- a/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
+++ b/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21305,15 +21488,15 @@ index 154a9ac..eab154c 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21321,7 +21504,7 @@ index 154a9ac..eab154c 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21330,10 +21513,10 @@ index 154a9ac..eab154c 100644
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 5252e0f..a2d02fd 100644
+index 5af3e96..f82018d 100644
--- a/src/modules_images/modules_imagery/imagery_tools/Makefile.in
+++ b/src/modules_images/modules_imagery/imagery_tools/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21341,15 +21524,15 @@ index 5252e0f..a2d02fd 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -150,6 +151,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -153,6 +154,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -188,6 +190,7 @@ abs_builddir = @abs_builddir@
+@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21357,7 +21540,7 @@ index 5252e0f..a2d02fd 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -221,7 +224,6 @@ libdir = @libdir@
+@@ -224,7 +227,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21366,10 +21549,10 @@ index 5252e0f..a2d02fd 100644
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 6bd57e9..bda32ca 100644
+index 9f3e6b6..594441d 100644
--- a/src/modules_images/modules_opencv/Makefile.in
+++ b/src/modules_images/modules_opencv/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21377,15 +21560,15 @@ index 6bd57e9..bda32ca 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21393,7 +21576,7 @@ index 6bd57e9..bda32ca 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21402,10 +21585,10 @@ index 6bd57e9..bda32ca 100644
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 28ddb87..3a82512 100644
+index 633786a..fb50778 100644
--- a/src/modules_images/modules_opencv/opencv/Makefile.in
+++ b/src/modules_images/modules_opencv/opencv/Makefile.in
-@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21413,15 +21596,15 @@ index 28ddb87..3a82512 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21429,7 +21612,7 @@ index 28ddb87..3a82512 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@
+@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21438,10 +21621,10 @@ index 28ddb87..3a82512 100644
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 0cad0d6..b59a6d0 100644
+index df8a402..6f175ac 100644
--- a/src/modules_images/modules_vigra/Makefile.in
+++ b/src/modules_images/modules_vigra/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21449,15 +21632,15 @@ index 0cad0d6..b59a6d0 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21465,7 +21648,7 @@ index 0cad0d6..b59a6d0 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21474,10 +21657,10 @@ index 0cad0d6..b59a6d0 100644
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 f00ecb6..7774aa2 100644
+index 811d21b..ecf10ce 100644
--- a/src/modules_images/modules_vigra/vigra/Makefile.in
+++ b/src/modules_images/modules_vigra/vigra/Makefile.in
-@@ -133,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -134,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21485,15 +21668,15 @@ index f00ecb6..7774aa2 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -160,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -198,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21501,7 +21684,7 @@ index f00ecb6..7774aa2 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@
+@@ -231,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21510,10 +21693,10 @@ index f00ecb6..7774aa2 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_io/Makefile.in b/src/modules_io/Makefile.in
-index daa9d2f..cd34f7b 100644
+index 3ecaf52..e8c3174 100644
--- a/src/modules_io/Makefile.in
+++ b/src/modules_io/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21521,15 +21704,15 @@ index daa9d2f..cd34f7b 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21537,7 +21720,7 @@ index daa9d2f..cd34f7b 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21546,10 +21729,10 @@ index daa9d2f..cd34f7b 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_io/db/Makefile.in b/src/modules_io/db/Makefile.in
-index d38825c..1f46a19 100644
+index be2b6fb..f87046b 100644
--- a/src/modules_io/db/Makefile.in
+++ b/src/modules_io/db/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21557,15 +21740,15 @@ index d38825c..1f46a19 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21573,7 +21756,7 @@ index d38825c..1f46a19 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21582,10 +21765,10 @@ index d38825c..1f46a19 100644
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 c519363..679bf54 100644
+index 43f2033..dc34dfc 100644
--- a/src/modules_io/db/io_odbc/Makefile.in
+++ b/src/modules_io/db/io_odbc/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21593,15 +21776,15 @@ index c519363..679bf54 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21609,7 +21792,7 @@ index c519363..679bf54 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21618,10 +21801,10 @@ index c519363..679bf54 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_io/docs/Makefile.in b/src/modules_io/docs/Makefile.in
-index 58962af..6fafd2d 100644
+index 4ec365f..f1f112f 100644
--- a/src/modules_io/docs/Makefile.in
+++ b/src/modules_io/docs/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21629,15 +21812,15 @@ index 58962af..6fafd2d 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21645,7 +21828,7 @@ index 58962af..6fafd2d 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21654,10 +21837,10 @@ index 58962af..6fafd2d 100644
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 e1641af..5d810ba 100644
+index 3119327..e7d3e73 100644
--- a/src/modules_io/docs/docs_html/Makefile.in
+++ b/src/modules_io/docs/docs_html/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21665,15 +21848,15 @@ index e1641af..5d810ba 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -150,6 +151,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -153,6 +154,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -188,6 +190,7 @@ abs_builddir = @abs_builddir@
+@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21681,7 +21864,7 @@ index e1641af..5d810ba 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -221,7 +224,6 @@ libdir = @libdir@
+@@ -224,7 +227,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21690,10 +21873,10 @@ index e1641af..5d810ba 100644
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 17cd7b2..bc76346 100644
+index 21e460f..ad355a8 100644
--- a/src/modules_io/docs/docs_pdf/Makefile.in
+++ b/src/modules_io/docs/docs_pdf/Makefile.in
-@@ -133,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21701,15 +21884,15 @@ index 17cd7b2..bc76346 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21717,7 +21900,7 @@ index 17cd7b2..bc76346 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@
+@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21726,10 +21909,10 @@ index 17cd7b2..bc76346 100644
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 5783c2d..57b12b5 100644
+index 4427de6..a4d9abe 100644
--- a/src/modules_io/esri_e00/Makefile.in
+++ b/src/modules_io/esri_e00/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21737,15 +21920,15 @@ index 5783c2d..57b12b5 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21753,7 +21936,7 @@ index 5783c2d..57b12b5 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21762,10 +21945,10 @@ index 5783c2d..57b12b5 100644
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 57a3426..3281beb 100644
+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
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21773,15 +21956,15 @@ index 57a3426..3281beb 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21789,7 +21972,7 @@ index 57a3426..3281beb 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21798,10 +21981,10 @@ index 57a3426..3281beb 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_io/gdal/Makefile.in b/src/modules_io/gdal/Makefile.in
-index 0f7530c..599a5d5 100644
+index f0b2207..8b363cc 100644
--- a/src/modules_io/gdal/Makefile.in
+++ b/src/modules_io/gdal/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21809,15 +21992,15 @@ index 0f7530c..599a5d5 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21825,7 +22008,7 @@ index 0f7530c..599a5d5 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21834,10 +22017,10 @@ index 0f7530c..599a5d5 100644
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 fd61ac7..b4dc508 100644
+index 8208f1f..21b11c2 100644
--- a/src/modules_io/gdal/io_gdal/Makefile.in
+++ b/src/modules_io/gdal/io_gdal/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21845,15 +22028,15 @@ index fd61ac7..b4dc508 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21861,7 +22044,7 @@ index fd61ac7..b4dc508 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21870,10 +22053,10 @@ index fd61ac7..b4dc508 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_io/gps/Makefile.in b/src/modules_io/gps/Makefile.in
-index dbefc2f..1a63975 100644
+index a47d4c6..cb7a51e 100644
--- a/src/modules_io/gps/Makefile.in
+++ b/src/modules_io/gps/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21881,15 +22064,15 @@ index dbefc2f..1a63975 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21897,7 +22080,7 @@ index dbefc2f..1a63975 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21906,10 +22089,10 @@ index dbefc2f..1a63975 100644
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 3468481..c6e628f 100644
+index 08067ac..94b9f2d 100644
--- a/src/modules_io/gps/io_gps/Makefile.in
+++ b/src/modules_io/gps/io_gps/Makefile.in
-@@ -125,6 +125,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21917,15 +22100,15 @@ index 3468481..c6e628f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -149,6 +150,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -187,6 +189,7 @@ abs_builddir = @abs_builddir@
+@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21933,7 +22116,7 @@ index 3468481..c6e628f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -220,7 +223,6 @@ libdir = @libdir@
+@@ -223,7 +226,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21942,10 +22125,10 @@ index 3468481..c6e628f 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_io/grid/Makefile.in b/src/modules_io/grid/Makefile.in
-index 54e400a..2bf15c6 100644
+index 83a11d7..c4c4499 100644
--- a/src/modules_io/grid/Makefile.in
+++ b/src/modules_io/grid/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21953,15 +22136,15 @@ index 54e400a..2bf15c6 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21969,7 +22152,7 @@ index 54e400a..2bf15c6 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21978,10 +22161,10 @@ index 54e400a..2bf15c6 100644
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 2413b7c..9854d1f 100644
+index ba4d0db..2205c72 100644
--- a/src/modules_io/grid/io_grid/Makefile.in
+++ b/src/modules_io/grid/io_grid/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21989,15 +22172,15 @@ index 2413b7c..9854d1f 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22005,7 +22188,7 @@ index 2413b7c..9854d1f 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22014,10 +22197,10 @@ index 2413b7c..9854d1f 100644
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 4946ed6..6cf3701 100644
+index b661d76..a49f8a5 100644
--- a/src/modules_io/grid/io_grid_grib2/Makefile.in
+++ b/src/modules_io/grid/io_grid_grib2/Makefile.in
-@@ -74,31 +74,12 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+@@ -75,31 +75,12 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
libio_grid_grib2_la_DEPENDENCIES = \
$(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
@@ -22034,7 +22217,7 @@ index 4946ed6..6cf3701 100644
- grib2_import.lo MLB_Interface.lo
+am_libio_grid_grib2_la_OBJECTS = grib2_import.lo MLB_Interface.lo
libio_grid_grib2_la_OBJECTS = $(am_libio_grid_grib2_la_OBJECTS)
- DEFAULT_INCLUDES = -I. at am__isrc@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
@@ -22050,7 +22233,7 @@ index 4946ed6..6cf3701 100644
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -108,6 +89,15 @@ CXXLD = $(CXX)
+@@ -109,6 +90,15 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -22066,7 +22249,7 @@ index 4946ed6..6cf3701 100644
SOURCES = $(libio_grid_grib2_la_SOURCES)
DIST_SOURCES = $(libio_grid_grib2_la_SOURCES)
ETAGS = etags
-@@ -135,6 +125,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -136,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22074,15 +22257,15 @@ index 4946ed6..6cf3701 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -159,6 +150,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -162,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -197,6 +189,7 @@ abs_builddir = @abs_builddir@
+@@ -200,6 +192,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22090,7 +22273,7 @@ index 4946ed6..6cf3701 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -230,7 +223,6 @@ libdir = @libdir@
+@@ -233,7 +226,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22098,12 +22281,8 @@ index 4946ed6..6cf3701 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -260,57 +252,9 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PN
- CXX_INCS = -I$(top_srcdir)/src/saga_core
- AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
- #AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper
--AM_LDFLAGS = -fPIC -shared -avoid-version -ljasper
-+AM_LDFLAGS = -fPIC -shared -avoid-version -lgrib2c -ljasper
+@@ -266,54 +258,6 @@ AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
+ AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
pkglib_LTLIBRARIES = libio_grid_grib2.la
libio_grid_grib2_la_SOURCES = \
-./g2clib-1.0.4/cmplxpack.c\
@@ -22157,7 +22336,7 @@ index 4946ed6..6cf3701 100644
grib2_import.cpp\
MLB_Interface.cpp\
grib2_import.h\
-@@ -320,7 +264,7 @@ libio_grid_grib2_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
+@@ -323,7 +267,7 @@ libio_grid_grib2_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
all: all-am
.SUFFIXES:
@@ -22166,7 +22345,7 @@ index 4946ed6..6cf3701 100644
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -392,380 +336,7 @@ distclean-compile:
+@@ -395,380 +339,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MLB_Interface.Plo at am__quote@
@@ -22548,10 +22727,10 @@ index 4946ed6..6cf3701 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 485e88d..7d07ede 100644
+index ccf4c5c..6d81d63 100644
--- a/src/modules_io/grid/io_grid_image/Makefile.in
+++ b/src/modules_io/grid/io_grid_image/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22559,15 +22738,15 @@ index 485e88d..7d07ede 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -150,6 +151,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -153,6 +154,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -188,6 +190,7 @@ abs_builddir = @abs_builddir@
+@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22575,7 +22754,7 @@ index 485e88d..7d07ede 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -221,7 +224,6 @@ libdir = @libdir@
+@@ -224,7 +227,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22584,10 +22763,10 @@ index 485e88d..7d07ede 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_io/shapes/Makefile.in b/src/modules_io/shapes/Makefile.in
-index 4516627..c48e617 100644
+index f59764f..8977b96 100644
--- a/src/modules_io/shapes/Makefile.in
+++ b/src/modules_io/shapes/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22595,15 +22774,15 @@ index 4516627..c48e617 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22611,7 +22790,7 @@ index 4516627..c48e617 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22620,10 +22799,10 @@ index 4516627..c48e617 100644
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 b55ba0e..89bf4e9 100644
+index 34f368e..441153c 100644
--- a/src/modules_io/shapes/io_shapes/Makefile.in
+++ b/src/modules_io/shapes/io_shapes/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22631,15 +22810,15 @@ index b55ba0e..89bf4e9 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22647,7 +22826,7 @@ index b55ba0e..89bf4e9 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22656,10 +22835,10 @@ index b55ba0e..89bf4e9 100644
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 0babb6a..16a5d66 100644
+index d117efd..5803ec0 100644
--- a/src/modules_io/shapes/io_shapes_dxf/Makefile.in
+++ b/src/modules_io/shapes/io_shapes_dxf/Makefile.in
-@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22667,15 +22846,15 @@ index 0babb6a..16a5d66 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -150,6 +151,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -153,6 +154,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -188,6 +190,7 @@ abs_builddir = @abs_builddir@
+@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22683,7 +22862,7 @@ index 0babb6a..16a5d66 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -221,7 +224,6 @@ libdir = @libdir@
+@@ -224,7 +227,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22692,10 +22871,10 @@ index 0babb6a..16a5d66 100644
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 cb6507a..7a4a680 100644
+index 07a4001..a769b3a 100644
--- a/src/modules_io/shapes/io_shapes_las/Makefile.in
+++ b/src/modules_io/shapes/io_shapes_las/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22703,15 +22882,15 @@ index cb6507a..7a4a680 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22719,7 +22898,7 @@ index cb6507a..7a4a680 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@
+@@ -227,7 +230,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22728,10 +22907,10 @@ index cb6507a..7a4a680 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_io/table/Makefile.in b/src/modules_io/table/Makefile.in
-index 9aeade1..e3ab968 100644
+index 28899dd..73a70a1 100644
--- a/src/modules_io/table/Makefile.in
+++ b/src/modules_io/table/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22739,15 +22918,15 @@ index 9aeade1..e3ab968 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22755,7 +22934,7 @@ index 9aeade1..e3ab968 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22764,10 +22943,10 @@ index 9aeade1..e3ab968 100644
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 d884e7d..1f65e05 100644
+index 82a7764..ac25e0e 100644
--- a/src/modules_io/table/io_table/Makefile.in
+++ b/src/modules_io/table/io_table/Makefile.in
-@@ -125,6 +125,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22775,15 +22954,15 @@ index d884e7d..1f65e05 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -149,6 +150,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -187,6 +189,7 @@ abs_builddir = @abs_builddir@
+@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22791,7 +22970,7 @@ index d884e7d..1f65e05 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -220,7 +223,6 @@ libdir = @libdir@
+@@ -223,7 +226,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22800,10 +22979,10 @@ index d884e7d..1f65e05 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_lectures/Makefile.in b/src/modules_lectures/Makefile.in
-index c3b00d0..db04389 100644
+index 1290679..4b54dc4 100644
--- a/src/modules_lectures/Makefile.in
+++ b/src/modules_lectures/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22811,15 +22990,15 @@ index c3b00d0..db04389 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22827,7 +23006,7 @@ index c3b00d0..db04389 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22836,10 +23015,10 @@ index c3b00d0..db04389 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_lectures/lectures/Makefile.in b/src/modules_lectures/lectures/Makefile.in
-index 34f14ee..34c64e0 100644
+index 54cbd37..070d0d6 100644
--- a/src/modules_lectures/lectures/Makefile.in
+++ b/src/modules_lectures/lectures/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22847,15 +23026,15 @@ index 34f14ee..34c64e0 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22863,7 +23042,7 @@ index 34f14ee..34c64e0 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22872,10 +23051,10 @@ index 34f14ee..34c64e0 100644
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 0f2267b..fbcca2b 100644
+index 97ce82e..a24bb90 100644
--- a/src/modules_lectures/lectures/lectures_introduction/Makefile.in
+++ b/src/modules_lectures/lectures/lectures_introduction/Makefile.in
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22883,15 +23062,15 @@ index 0f2267b..fbcca2b 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -157,6 +158,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -195,6 +197,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22899,7 +23078,7 @@ index 0f2267b..fbcca2b 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@
+@@ -228,7 +231,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22908,10 +23087,10 @@ index 0f2267b..fbcca2b 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_projection/Makefile.in b/src/modules_projection/Makefile.in
-index c814f6f..7f42529 100644
+index ed2ec63..4624844 100644
--- a/src/modules_projection/Makefile.in
+++ b/src/modules_projection/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22919,15 +23098,15 @@ index c814f6f..7f42529 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22935,7 +23114,7 @@ index c814f6f..7f42529 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22944,10 +23123,10 @@ index c814f6f..7f42529 100644
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 0c631b1..6a458ea 100644
+index 1419917..a5344d8 100644
--- a/src/modules_projection/pj_georeference/Makefile.in
+++ b/src/modules_projection/pj_georeference/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22955,15 +23134,15 @@ index 0c631b1..6a458ea 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22971,7 +23150,7 @@ index 0c631b1..6a458ea 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22980,10 +23159,10 @@ index 0c631b1..6a458ea 100644
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 8f4a10e..b6fd4ee 100644
+index 521a7e3..865bcbc 100644
--- a/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
+++ b/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22991,15 +23170,15 @@ index 8f4a10e..b6fd4ee 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23007,7 +23186,7 @@ index 8f4a10e..b6fd4ee 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23016,10 +23195,10 @@ index 8f4a10e..b6fd4ee 100644
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 59f41fe..8ce1164 100644
+index 388a221..6ce2f28 100644
--- a/src/modules_projection/pj_proj4/Makefile.in
+++ b/src/modules_projection/pj_proj4/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23027,15 +23206,15 @@ index 59f41fe..8ce1164 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23043,7 +23222,7 @@ index 59f41fe..8ce1164 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23052,10 +23231,10 @@ index 59f41fe..8ce1164 100644
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 c56407f..05a415b 100644
+index 31d447c..141e57e 100644
--- a/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
+++ b/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23063,15 +23242,15 @@ index c56407f..05a415b 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23079,7 +23258,7 @@ index c56407f..05a415b 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23088,10 +23267,10 @@ index c56407f..05a415b 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_recreations/Makefile.in b/src/modules_recreations/Makefile.in
-index 6e754ba..34de0db 100644
+index 25cb450..6fecd77 100644
--- a/src/modules_recreations/Makefile.in
+++ b/src/modules_recreations/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23099,15 +23278,15 @@ index 6e754ba..34de0db 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23115,7 +23294,7 @@ index 6e754ba..34de0db 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23124,10 +23303,10 @@ index 6e754ba..34de0db 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_recreations/recreations/Makefile.in b/src/modules_recreations/recreations/Makefile.in
-index 56efab0..a7e395d 100644
+index 176aa98..0f1c370 100644
--- a/src/modules_recreations/recreations/Makefile.in
+++ b/src/modules_recreations/recreations/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23135,15 +23314,15 @@ index 56efab0..a7e395d 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23151,7 +23330,7 @@ index 56efab0..a7e395d 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23160,10 +23339,10 @@ index 56efab0..a7e395d 100644
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 e3f40e8..ede8a7a 100644
+index cfd6d6e..f7ce3c6 100644
--- a/src/modules_recreations/recreations/recreations_fractals/Makefile.in
+++ b/src/modules_recreations/recreations/recreations_fractals/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23171,15 +23350,15 @@ index e3f40e8..ede8a7a 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23187,7 +23366,7 @@ index e3f40e8..ede8a7a 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23196,10 +23375,10 @@ index e3f40e8..ede8a7a 100644
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 709f011..59b5948 100644
+index 4f5c84c..7c2ab19 100644
--- a/src/modules_recreations/recreations/recreations_games/Makefile.in
+++ b/src/modules_recreations/recreations/recreations_games/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23207,15 +23386,15 @@ index 709f011..59b5948 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23223,7 +23402,7 @@ index 709f011..59b5948 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23232,10 +23411,10 @@ index 709f011..59b5948 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_simulation/Makefile.in b/src/modules_simulation/Makefile.in
-index 662d910..97eb1d5 100644
+index 7f211a9..4019dfc 100644
--- a/src/modules_simulation/Makefile.in
+++ b/src/modules_simulation/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23243,15 +23422,15 @@ index 662d910..97eb1d5 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23259,7 +23438,7 @@ index 662d910..97eb1d5 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23267,7 +23446,7 @@ index 662d910..97eb1d5 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -228,7 +230,7 @@ target_alias = @target_alias@
+@@ -231,7 +233,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -23277,10 +23456,10 @@ index 662d910..97eb1d5 100644
.SUFFIXES:
diff --git a/src/modules_simulation/cellular_automata/Makefile.in b/src/modules_simulation/cellular_automata/Makefile.in
-index 39bbf81..1adba25 100644
+index fa3cce8..22350c7 100644
--- a/src/modules_simulation/cellular_automata/Makefile.in
+++ b/src/modules_simulation/cellular_automata/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23288,15 +23467,15 @@ index 39bbf81..1adba25 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23304,7 +23483,7 @@ index 39bbf81..1adba25 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23313,10 +23492,10 @@ index 39bbf81..1adba25 100644
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 67e1234..75571de 100644
+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
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23324,15 +23503,15 @@ index 67e1234..75571de 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23340,7 +23519,7 @@ index 67e1234..75571de 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23349,10 +23528,10 @@ index 67e1234..75571de 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_simulation/ecosystems/Makefile.in b/src/modules_simulation/ecosystems/Makefile.in
-index 8e72312..b53e9aa 100644
+index fed2a81..d9b2777 100644
--- a/src/modules_simulation/ecosystems/Makefile.in
+++ b/src/modules_simulation/ecosystems/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23360,15 +23539,15 @@ index 8e72312..b53e9aa 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23376,7 +23555,7 @@ index 8e72312..b53e9aa 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23385,10 +23564,10 @@ index 8e72312..b53e9aa 100644
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 ddcd4e8..ab30ac5 100644
+index 1f8c1f1..0dc6ea0 100644
--- a/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
+++ b/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23396,15 +23575,15 @@ index ddcd4e8..ab30ac5 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23412,7 +23591,7 @@ index ddcd4e8..ab30ac5 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23421,10 +23600,10 @@ index ddcd4e8..ab30ac5 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_simulation/hydrology/Makefile.in b/src/modules_simulation/hydrology/Makefile.in
-index 9dc53e9..0d158bd 100644
+index 5899588..5cf6376 100644
--- a/src/modules_simulation/hydrology/Makefile.in
+++ b/src/modules_simulation/hydrology/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23432,15 +23611,15 @@ index 9dc53e9..0d158bd 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23448,7 +23627,7 @@ index 9dc53e9..0d158bd 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23457,10 +23636,10 @@ index 9dc53e9..0d158bd 100644
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 6f0fbd7..2aae01c 100644
+index f83a80e..a64b96b 100644
--- a/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
+++ b/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23468,15 +23647,15 @@ index 6f0fbd7..2aae01c 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23484,7 +23663,7 @@ index 6f0fbd7..2aae01c 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23493,10 +23672,10 @@ index 6f0fbd7..2aae01c 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/modules_terrain_analysis/Makefile.in b/src/modules_terrain_analysis/Makefile.in
-index fe347b4..6a8430a 100644
+index 7bdd704..bc9ccdd 100644
--- a/src/modules_terrain_analysis/Makefile.in
+++ b/src/modules_terrain_analysis/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23504,15 +23683,15 @@ index fe347b4..6a8430a 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23520,7 +23699,7 @@ index fe347b4..6a8430a 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23529,10 +23708,10 @@ index fe347b4..6a8430a 100644
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 174f669..3381ea8 100644
+index 47c2824..1459546 100644
--- a/src/modules_terrain_analysis/terrain_analysis/Makefile.in
+++ b/src/modules_terrain_analysis/terrain_analysis/Makefile.in
-@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23540,15 +23719,15 @@ index 174f669..3381ea8 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23556,7 +23735,7 @@ index 174f669..3381ea8 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23565,10 +23744,46 @@ index 174f669..3381ea8 100644
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 40aef1e..d707f8b 100644
+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
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLELIBHARU = @DISABLELIBHARU@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -226,7 +229,6 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ 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@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23576,8 +23791,8 @@ index 40aef1e..d707f8b 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -152,6 +153,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -23601,10 +23816,10 @@ index 40aef1e..d707f8b 100644
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 29e3281..656de20 100644
+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
-@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -133,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23612,15 +23827,15 @@ index 29e3281..656de20 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -159,6 +160,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
+@@ -197,6 +199,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23628,7 +23843,7 @@ index 29e3281..656de20 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@
+@@ -230,7 +233,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23637,10 +23852,10 @@ index 29e3281..656de20 100644
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 a84631a..8d64486 100644
+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
-@@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23648,15 +23863,15 @@ index a84631a..8d64486 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -154,6 +155,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -189,6 +191,7 @@ abs_builddir = @abs_builddir@
+@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23664,7 +23879,7 @@ index a84631a..8d64486 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -222,7 +225,6 @@ libdir = @libdir@
+@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23673,10 +23888,10 @@ index a84631a..8d64486 100644
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 2020df6..342f0fe 100644
+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
-@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23684,15 +23899,15 @@ index 2020df6..342f0fe 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -158,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
+@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23700,7 +23915,7 @@ index 2020df6..342f0fe 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@
+@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23709,10 +23924,10 @@ index 2020df6..342f0fe 100644
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 6e8e835..6a51e51 100644
+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
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23720,15 +23935,15 @@ index 6e8e835..6a51e51 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23736,7 +23951,7 @@ index 6e8e835..6a51e51 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23745,10 +23960,10 @@ index 6e8e835..6a51e51 100644
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 ec90eb2..dbd6a39 100644
+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
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23756,15 +23971,15 @@ index ec90eb2..dbd6a39 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23772,7 +23987,7 @@ index ec90eb2..dbd6a39 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23781,7 +23996,7 @@ index ec90eb2..dbd6a39 100644
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/saga_core/Makefile.in b/src/saga_core/Makefile.in
-index b3f3e3b..37f23d2 100644
+index 092bbe1..14d309e 100644
--- a/src/saga_core/Makefile.in
+++ b/src/saga_core/Makefile.in
@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
@@ -23792,15 +24007,15 @@ index b3f3e3b..37f23d2 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -139,6 +140,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -175,6 +177,7 @@ abs_builddir = @abs_builddir@
+@@ -177,6 +179,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23808,7 +24023,7 @@ index b3f3e3b..37f23d2 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -208,7 +211,6 @@ libdir = @libdir@
+@@ -210,7 +213,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23817,10 +24032,10 @@ index b3f3e3b..37f23d2 100644
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 7554f3e..8a5d747 100644
+index 4088b2c..6dcf5c1 100644
--- a/src/saga_core/saga_api/Makefile.in
+++ b/src/saga_core/saga_api/Makefile.in
-@@ -158,6 +158,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -155,6 +155,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23828,15 +24043,15 @@ index 7554f3e..8a5d747 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -182,6 +183,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -181,6 +182,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -220,6 +222,7 @@ abs_builddir = @abs_builddir@
+@@ -219,6 +221,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23844,7 +24059,7 @@ index 7554f3e..8a5d747 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -253,7 +256,6 @@ libdir = @libdir@
+@@ -252,7 +255,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23853,10 +24068,10 @@ index 7554f3e..8a5d747 100644
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 1fad3aa..1ad8bd1 100644
+index 7e8b37d..a40cd3d 100644
--- a/src/saga_core/saga_cmd/Makefile.in
+++ b/src/saga_core/saga_cmd/Makefile.in
-@@ -143,6 +143,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -144,6 +144,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23864,15 +24079,15 @@ index 1fad3aa..1ad8bd1 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -167,6 +168,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -170,6 +171,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -205,6 +207,7 @@ abs_builddir = @abs_builddir@
+@@ -208,6 +210,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23880,7 +24095,7 @@ index 1fad3aa..1ad8bd1 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -238,7 +241,6 @@ libdir = @libdir@
+@@ -241,7 +244,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23889,10 +24104,10 @@ index 1fad3aa..1ad8bd1 100644
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 5c8d44f..78a9a54 100644
+index fc3415f..46fd8d8 100644
--- a/src/saga_core/saga_cmd/man/Makefile.in
+++ b/src/saga_core/saga_cmd/man/Makefile.in
-@@ -99,6 +99,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -100,6 +100,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23900,15 +24115,15 @@ index 5c8d44f..78a9a54 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -123,6 +124,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -126,6 +127,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -161,6 +163,7 @@ abs_builddir = @abs_builddir@
+@@ -164,6 +166,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23916,7 +24131,7 @@ index 5c8d44f..78a9a54 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -194,7 +197,6 @@ libdir = @libdir@
+@@ -197,7 +200,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23925,10 +24140,10 @@ index 5c8d44f..78a9a54 100644
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 8f35b53..77e02a3 100644
+index 8686452..5c84df9 100644
--- a/src/saga_core/saga_gdi/Makefile.in
+++ b/src/saga_core/saga_gdi/Makefile.in
-@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23936,15 +24151,15 @@ index 8f35b53..77e02a3 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -156,6 +157,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@ abs_builddir = @abs_builddir@
+@@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23952,7 +24167,7 @@ index 8f35b53..77e02a3 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@
+@@ -227,7 +230,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23961,10 +24176,10 @@ index 8f35b53..77e02a3 100644
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 2b9c078..1ecb54c 100644
+index d97e798..bfc2f6c 100644
--- a/src/saga_core/saga_gui/Makefile.in
+++ b/src/saga_core/saga_gui/Makefile.in
-@@ -189,6 +189,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -191,6 +191,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23972,15 +24187,15 @@ index 2b9c078..1ecb54c 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -213,6 +214,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -217,6 +218,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -251,6 +253,7 @@ abs_builddir = @abs_builddir@
+@@ -255,6 +257,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23988,7 +24203,7 @@ index 2b9c078..1ecb54c 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -284,7 +287,6 @@ libdir = @libdir@
+@@ -288,7 +291,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23997,10 +24212,10 @@ index 2b9c078..1ecb54c 100644
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 0140477..2c27f02 100644
+index d879530..f1a277b 100644
--- a/src/saga_core/saga_gui/man/Makefile.in
+++ b/src/saga_core/saga_gui/man/Makefile.in
-@@ -99,6 +99,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -100,6 +100,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24008,15 +24223,15 @@ index 0140477..2c27f02 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -123,6 +124,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -126,6 +127,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -161,6 +163,7 @@ abs_builddir = @abs_builddir@
+@@ -164,6 +166,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24024,7 +24239,7 @@ index 0140477..2c27f02 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -194,7 +197,6 @@ libdir = @libdir@
+@@ -197,7 +200,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24033,10 +24248,10 @@ index 0140477..2c27f02 100644
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 41be94a..dd2d421 100644
+index a2f0fe1..9507937 100644
--- a/src/saga_core/saga_odbc/Makefile.in
+++ b/src/saga_core/saga_odbc/Makefile.in
-@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
+@@ -129,6 +129,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24044,15 +24259,15 @@ index 41be94a..dd2d421 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
+@@ -155,6 +156,7 @@ LOCAL_INCS = @LOCAL_INCS@
+ LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@ abs_builddir = @abs_builddir@
+@@ -193,6 +195,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24060,7 +24275,7 @@ index 41be94a..dd2d421 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@
+@@ -226,7 +229,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
diff --git a/debian/patches/series b/debian/patches/series
index afb96ba..e78a66b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
0001-Adjust-grid_gridding-to-use-qhull.patch
0002-Remove-references-to-libfire.patch
0003-Use-debian-version-of-grib2.patch
-0004-Run-autoreconf-fi.patch
-0005-Fix-GCC-build-issue.patch
-0006-Use-debian-version-of-grib2.patch
-0007-Fix-for-gcc-4.6.patch
+0004-Use-debian-version-of-grib2.patch
+0005-autoreconf-fi.patch
--
Saga GIS
More information about the Pkg-grass-devel
mailing list