[SCM] saga branch, master, updated. b663fd3f494d67d027614b81eb60d34b2f3df837
Johan Van de Wauw
johan.vandewauw at gmail.com
Thu Feb 23 21:29:28 UTC 2012
The following commit has been merged in the master branch:
commit b663fd3f494d67d027614b81eb60d34b2f3df837
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date: Thu Feb 23 20:56:34 2012 -0500
Run autoreconf after last grib2 fix + more logical patches
diff --git a/debian/patches/0001-Adjust-grid_gridding-to-use-qhull.patch b/debian/patches/0001-Adjust-grid_gridding-to-use-qhull.patch
index 1f21978..f167830 100644
--- a/debian/patches/0001-Adjust-grid_gridding-to-use-qhull.patch
+++ b/debian/patches/0001-Adjust-grid_gridding-to-use-qhull.patch
@@ -49,4 +49,3 @@ index dc98875..e2952fa 100644
#include <stdlib.h>
#include <stdio.h>
---
diff --git a/debian/patches/0002-Remove-references-to-libfire.patch b/debian/patches/0002-Remove-references-to-libfire.patch
index 212e5c2..3dde816 100644
--- a/debian/patches/0002-Remove-references-to-libfire.patch
+++ b/debian/patches/0002-Remove-references-to-libfire.patch
@@ -27,4 +27,3 @@ index 71a438b..39e85c9 100644
@@ -1 +1 @@
-SUBDIRS = hydrology fire ecosystems cellular_automata
+SUBDIRS = hydrology ecosystems cellular_automata
---
diff --git a/debian/patches/0003-Use-debian-version-of-grib2.patch b/debian/patches/0003-Use-debian-version-of-grib2.patch
index 73a5c5e..73bf5bf 100644
--- a/debian/patches/0003-Use-debian-version-of-grib2.patch
+++ b/debian/patches/0003-Use-debian-version-of-grib2.patch
@@ -2,16 +2,24 @@ From: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date: Wed, 15 Jun 2011 14:31:19 -0400
Subject: Use debian version of grib2
+Update GRIB2
+
+Use debian version of grib2
---
- src/modules_io/grid/io_grid_grib2/Makefile.am | 48 -------------------------
- 1 files changed, 0 insertions(+), 48 deletions(-)
+ src/modules_io/grid/io_grid_grib2/Makefile.am | 50 +---------------------
+ src/modules_io/grid/io_grid_grib2/grib2_import.h | 2 +-
+ 2 files changed, 2 insertions(+), 50 deletions(-)
-Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.am
-===================================================================
---- saga.orig/src/modules_io/grid/io_grid_grib2/Makefile.am 2012-02-07 23:02:06.000000000 +0100
-+++ saga/src/modules_io/grid/io_grid_grib2/Makefile.am 2012-02-07 23:02:16.000000000 +0100
-@@ -14,54 +14,6 @@
- AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
+diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.am b/src/modules_io/grid/io_grid_grib2/Makefile.am
+index 7a2c840..a022282 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 $(LOCAL_INCS)
+ AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
+ #AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper
+-AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
++AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper -lgrib2c
pkglib_LTLIBRARIES = libio_grid_grib2.la
libio_grid_grib2_la_SOURCES =\
-./g2clib-1.0.4/cmplxpack.c\
@@ -65,10 +73,10 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.am
grib2_import.cpp\
MLB_Interface.cpp\
grib2_import.h\
-Index: saga/src/modules_io/grid/io_grid_grib2/grib2_import.h
-===================================================================
---- saga.orig/src/modules_io/grid/io_grid_grib2/grib2_import.h 2012-02-07 19:40:21.000000000 +0100
-+++ saga/src/modules_io/grid/io_grid_grib2/grib2_import.h 2012-02-07 23:03:05.000000000 +0100
+diff --git a/src/modules_io/grid/io_grid_grib2/grib2_import.h b/src/modules_io/grid/io_grid_grib2/grib2_import.h
+index ed9584e..fdcaecc 100644
+--- a/src/modules_io/grid/io_grid_grib2/grib2_import.h
++++ b/src/modules_io/grid/io_grid_grib2/grib2_import.h
@@ -11,7 +11,7 @@
#include "MLB_Interface.h"
diff --git a/debian/patches/0005-autoreconf-fi.patch b/debian/patches/0004-autoreconf-fi.patch
similarity index 71%
rename from debian/patches/0005-autoreconf-fi.patch
rename to debian/patches/0004-autoreconf-fi.patch
index 14d6828..883d808 100644
--- a/debian/patches/0005-autoreconf-fi.patch
+++ b/debian/patches/0004-autoreconf-fi.patch
@@ -2,132 +2,170 @@ From: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date: Tue, 11 Dec 2012 20:46:23 -0500
Subject: autoreconf -fi
+Refresh automake
---
- Makefile.in | 4 +-
- aclocal.m4 | 4 +-
- configure | 4786 +++++++++++---------
+ Makefile.in | 68 +-
+ aclocal.m4 | 102 +-
+ configure | 4820 +++++++++++---------
ltmain.sh | 4016 +++++++++++------
m4/libtool.m4 | 2236 ++++++----
m4/ltoptions.m4 | 32 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 12 +-
- src/Makefile.in | 4 +-
- src/modules/Makefile.in | 4 +-
- src/modules/grid/Makefile.in | 4 +-
- src/modules/grid/grid_analysis/Makefile.in | 4 +-
- src/modules/grid/grid_calculus/Makefile.in | 4 +-
- src/modules/grid/grid_calculus_bsl/Makefile.in | 4 +-
- src/modules/grid/grid_filter/Makefile.in | 4 +-
- src/modules/grid/grid_gridding/Makefile.in | 18 +-
- src/modules/grid/grid_spline/Makefile.in | 4 +-
- src/modules/grid/grid_tools/Makefile.in | 4 +-
- src/modules/grid/grid_visualisation/Makefile.in | 4 +-
- src/modules/pointcloud/Makefile.in | 4 +-
- .../pointcloud/pointcloud_tools/Makefile.in | 4 +-
- .../pointcloud/pointcloud_viewer/Makefile.in | 4 +-
- src/modules/shapes/Makefile.in | 4 +-
- src/modules/shapes/shapes_grid/Makefile.in | 4 +-
- src/modules/shapes/shapes_lines/Makefile.in | 4 +-
- src/modules/shapes/shapes_points/Makefile.in | 4 +-
- src/modules/shapes/shapes_polygons/Makefile.in | 4 +-
- src/modules/shapes/shapes_tools/Makefile.in | 4 +-
- src/modules/shapes/shapes_transect/Makefile.in | 4 +-
- src/modules/table/Makefile.in | 4 +-
- src/modules/table/table_calculus/Makefile.in | 4 +-
- src/modules/table/table_tools/Makefile.in | 4 +-
- src/modules/tin/Makefile.in | 4 +-
- src/modules/tin/tin_tools/Makefile.in | 4 +-
- src/modules/tin/tin_viewer/Makefile.in | 4 +-
- src/modules_contrib/Makefile.in | 4 +-
- src/modules_contrib/contrib_a_perego/Makefile.in | 4 +-
- .../contrib_a_perego/contrib_a_perego/Makefile.in | 4 +-
- src/modules_contrib/contrib_s_liersch/Makefile.in | 4 +-
- .../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 +-
- .../geostatistics_kriging/Makefile.in | 4 +-
- .../geostatistics/geostatistics_points/Makefile.in | 4 +-
- .../geostatistics_regression/Makefile.in | 4 +-
- src/modules_images/Makefile.in | 4 +-
- src/modules_images/modules_imagery/Makefile.in | 4 +-
- .../imagery_classification/Makefile.in | 4 +-
- .../modules_imagery/imagery_rga/Makefile.in | 4 +-
- .../imagery_segmentation/Makefile.in | 4 +-
- .../modules_imagery/imagery_tools/Makefile.in | 4 +-
- src/modules_images/modules_opencv/Makefile.in | 4 +-
- .../modules_opencv/opencv/Makefile.in | 4 +-
- src/modules_images/modules_vigra/Makefile.in | 4 +-
- src/modules_images/modules_vigra/vigra/Makefile.in | 4 +-
- src/modules_io/Makefile.in | 4 +-
- src/modules_io/db/Makefile.in | 4 +-
- src/modules_io/db/io_odbc/Makefile.in | 4 +-
- src/modules_io/docs/Makefile.in | 4 +-
- src/modules_io/docs/docs_html/Makefile.in | 4 +-
- src/modules_io/docs/docs_pdf/Makefile.in | 4 +-
- src/modules_io/esri_e00/Makefile.in | 4 +-
- src/modules_io/esri_e00/io_esri_e00/Makefile.in | 4 +-
- src/modules_io/gdal/Makefile.in | 4 +-
- src/modules_io/gdal/io_gdal/Makefile.in | 4 +-
- src/modules_io/gps/Makefile.in | 4 +-
- 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 | 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 +-
- src/modules_io/shapes/io_shapes_dxf/Makefile.in | 4 +-
- src/modules_io/shapes/io_shapes_las/Makefile.in | 4 +-
- src/modules_io/table/Makefile.in | 4 +-
- src/modules_io/table/io_table/Makefile.in | 4 +-
- src/modules_lectures/Makefile.in | 4 +-
- src/modules_lectures/lectures/Makefile.in | 4 +-
- .../lectures/lectures_introduction/Makefile.in | 4 +-
- src/modules_projection/Makefile.in | 4 +-
- src/modules_projection/pj_georeference/Makefile.in | 4 +-
- .../pj_georeference/pj_georeference/Makefile.in | 4 +-
- src/modules_projection/pj_proj4/Makefile.in | 4 +-
- .../pj_proj4/pj_proj4/Makefile.in | 4 +-
- src/modules_recreations/Makefile.in | 4 +-
- src/modules_recreations/recreations/Makefile.in | 4 +-
- .../recreations/recreations_fractals/Makefile.in | 4 +-
- .../recreations/recreations_games/Makefile.in | 4 +-
- src/modules_simulation/Makefile.in | 6 +-
- .../cellular_automata/Makefile.in | 4 +-
- .../sim_cellular_automata/Makefile.in | 4 +-
- src/modules_simulation/ecosystems/Makefile.in | 4 +-
- .../ecosystems/sim_ecosystems_hugget/Makefile.in | 4 +-
- src/modules_simulation/hydrology/Makefile.in | 4 +-
- .../hydrology/sim_hydrology/Makefile.in | 4 +-
- 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 +-
- .../terrain_analysis/ta_preprocessor/Makefile.in | 4 +-
- .../terrain_analysis/ta_profiles/Makefile.in | 4 +-
- src/saga_core/Makefile.in | 4 +-
- src/saga_core/saga_api/Makefile.in | 4 +-
- src/saga_core/saga_cmd/Makefile.in | 4 +-
- src/saga_core/saga_cmd/man/Makefile.in | 4 +-
- src/saga_core/saga_gdi/Makefile.in | 4 +-
- 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, 7196 insertions(+), 4811 deletions(-)
+ src/Makefile.in | 23 +-
+ src/modules/Makefile.in | 23 +-
+ src/modules/grid/Makefile.in | 23 +-
+ src/modules/grid/grid_analysis/Makefile.in | 31 +-
+ src/modules/grid/grid_calculus/Makefile.in | 31 +-
+ src/modules/grid/grid_calculus_bsl/Makefile.in | 31 +-
+ src/modules/grid/grid_filter/Makefile.in | 31 +-
+ src/modules/grid/grid_gridding/Makefile.in | 45 +-
+ src/modules/grid/grid_spline/Makefile.in | 31 +-
+ src/modules/grid/grid_tools/Makefile.in | 31 +-
+ src/modules/grid/grid_visualisation/Makefile.in | 31 +-
+ src/modules/pointcloud/Makefile.in | 23 +-
+ .../pointcloud/pointcloud_tools/Makefile.in | 31 +-
+ .../pointcloud/pointcloud_viewer/Makefile.in | 31 +-
+ src/modules/shapes/Makefile.in | 23 +-
+ src/modules/shapes/shapes_grid/Makefile.in | 31 +-
+ src/modules/shapes/shapes_lines/Makefile.in | 31 +-
+ src/modules/shapes/shapes_points/Makefile.in | 31 +-
+ src/modules/shapes/shapes_polygons/Makefile.in | 31 +-
+ src/modules/shapes/shapes_tools/Makefile.in | 31 +-
+ src/modules/shapes/shapes_transect/Makefile.in | 31 +-
+ src/modules/table/Makefile.in | 23 +-
+ src/modules/table/table_calculus/Makefile.in | 31 +-
+ src/modules/table/table_tools/Makefile.in | 31 +-
+ src/modules/tin/Makefile.in | 23 +-
+ src/modules/tin/tin_tools/Makefile.in | 31 +-
+ src/modules/tin/tin_viewer/Makefile.in | 31 +-
+ src/modules_contrib/Makefile.in | 23 +-
+ src/modules_contrib/contrib_a_perego/Makefile.in | 23 +-
+ .../contrib_a_perego/contrib_a_perego/Makefile.in | 31 +-
+ src/modules_contrib/contrib_s_liersch/Makefile.in | 23 +-
+ .../contrib_s_liersch/ihacres/Makefile.in | 31 +-
+ src/modules_contrib/garden/Makefile.in | 23 +-
+ .../garden/garden_3d_viewer/Makefile.in | 31 +-
+ .../garden/garden_webservices/Makefile.in | 31 +-
+ src/modules_geostatistics/Makefile.in | 23 +-
+ .../geostatistics/Makefile.in | 23 +-
+ .../geostatistics/geostatistics_grid/Makefile.in | 31 +-
+ .../geostatistics_kriging/Makefile.in | 31 +-
+ .../geostatistics/geostatistics_points/Makefile.in | 31 +-
+ .../geostatistics_regression/Makefile.in | 31 +-
+ src/modules_images/Makefile.in | 23 +-
+ src/modules_images/modules_imagery/Makefile.in | 23 +-
+ .../imagery_classification/Makefile.in | 31 +-
+ .../modules_imagery/imagery_rga/Makefile.in | 31 +-
+ .../imagery_segmentation/Makefile.in | 31 +-
+ .../modules_imagery/imagery_tools/Makefile.in | 31 +-
+ src/modules_images/modules_opencv/Makefile.in | 23 +-
+ .../modules_opencv/opencv/Makefile.in | 31 +-
+ src/modules_images/modules_vigra/Makefile.in | 23 +-
+ src/modules_images/modules_vigra/vigra/Makefile.in | 31 +-
+ src/modules_io/Makefile.in | 23 +-
+ src/modules_io/db/Makefile.in | 23 +-
+ src/modules_io/db/io_odbc/Makefile.in | 31 +-
+ src/modules_io/docs/Makefile.in | 23 +-
+ src/modules_io/docs/docs_html/Makefile.in | 31 +-
+ src/modules_io/docs/docs_pdf/Makefile.in | 31 +-
+ src/modules_io/esri_e00/Makefile.in | 23 +-
+ src/modules_io/esri_e00/io_esri_e00/Makefile.in | 31 +-
+ src/modules_io/gdal/Makefile.in | 23 +-
+ src/modules_io/gdal/io_gdal/Makefile.in | 31 +-
+ src/modules_io/gps/Makefile.in | 23 +-
+ src/modules_io/gps/io_gps/Makefile.in | 31 +-
+ src/modules_io/grid/Makefile.in | 23 +-
+ src/modules_io/grid/io_grid/Makefile.in | 31 +-
+ src/modules_io/grid/io_grid_grib2/Makefile.in | 486 +--
+ src/modules_io/grid/io_grid_image/Makefile.in | 31 +-
+ src/modules_io/shapes/Makefile.in | 23 +-
+ src/modules_io/shapes/io_shapes/Makefile.in | 31 +-
+ src/modules_io/shapes/io_shapes_dxf/Makefile.in | 31 +-
+ src/modules_io/shapes/io_shapes_las/Makefile.in | 31 +-
+ src/modules_io/table/Makefile.in | 23 +-
+ src/modules_io/table/io_table/Makefile.in | 31 +-
+ src/modules_lectures/Makefile.in | 23 +-
+ src/modules_lectures/lectures/Makefile.in | 23 +-
+ .../lectures/lectures_introduction/Makefile.in | 31 +-
+ src/modules_projection/Makefile.in | 23 +-
+ src/modules_projection/pj_georeference/Makefile.in | 23 +-
+ .../pj_georeference/pj_georeference/Makefile.in | 31 +-
+ src/modules_projection/pj_proj4/Makefile.in | 23 +-
+ .../pj_proj4/pj_proj4/Makefile.in | 31 +-
+ src/modules_recreations/Makefile.in | 23 +-
+ src/modules_recreations/recreations/Makefile.in | 23 +-
+ .../recreations/recreations_fractals/Makefile.in | 31 +-
+ .../recreations/recreations_games/Makefile.in | 31 +-
+ src/modules_simulation/Makefile.in | 25 +-
+ .../cellular_automata/Makefile.in | 23 +-
+ .../sim_cellular_automata/Makefile.in | 31 +-
+ src/modules_simulation/ecosystems/Makefile.in | 23 +-
+ .../ecosystems/sim_ecosystems_hugget/Makefile.in | 31 +-
+ src/modules_simulation/hydrology/Makefile.in | 23 +-
+ .../hydrology/sim_hydrology/Makefile.in | 31 +-
+ src/modules_terrain_analysis/Makefile.in | 23 +-
+ .../terrain_analysis/Makefile.in | 23 +-
+ .../terrain_analysis/ta_channels/Makefile.in | 31 +-
+ .../terrain_analysis/ta_compound/Makefile.in | 31 +-
+ .../terrain_analysis/ta_hydrology/Makefile.in | 31 +-
+ .../terrain_analysis/ta_lighting/Makefile.in | 31 +-
+ .../terrain_analysis/ta_morphometry/Makefile.in | 31 +-
+ .../terrain_analysis/ta_preprocessor/Makefile.in | 31 +-
+ .../terrain_analysis/ta_profiles/Makefile.in | 31 +-
+ src/saga_core/Makefile.in | 23 +-
+ src/saga_core/saga_api/Makefile.in | 53 +-
+ src/saga_core/saga_cmd/Makefile.in | 25 +-
+ src/saga_core/saga_cmd/man/Makefile.in | 33 +-
+ src/saga_core/saga_gdi/Makefile.in | 31 +-
+ src/saga_core/saga_gui/Makefile.in | 25 +-
+ src/saga_core/saga_gui/man/Makefile.in | 33 +-
+ src/saga_core/saga_odbc/Makefile.in | 31 +-
+ 117 files changed, 9108 insertions(+), 5734 deletions(-)
mode change 100755 => 100644 ltmain.sh
-Index: saga/Makefile.in
-===================================================================
---- saga.orig/Makefile.in 2012-01-09 14:09:39.000000000 +0100
-+++ saga/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -130,6 +130,7 @@
+diff --git a/Makefile.in b/Makefile.in
+index 8200f70..2f8f074 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -76,9 +76,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+ am__remove_distdir = \
+- { test ! -d "$(distdir)" \
+- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+- && rm -fr "$(distdir)"; }; }
++ if test -d "$(distdir)"; then \
++ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -rf "$(distdir)" \
++ || { sleep 5 && rm -rf "$(distdir)"; }; \
++ else :; fi
+ am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+@@ -107,6 +109,8 @@ am__relativize = \
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
++am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
++ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+@@ -130,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -135,7 +173,7 @@ Index: saga/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@
+@@ -156,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -143,7 +181,7 @@ Index: saga/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@
+@@ -194,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -151,7 +189,7 @@ Index: saga/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@
+@@ -227,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -159,11 +197,133 @@ Index: saga/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/aclocal.m4
-===================================================================
---- saga.orig/aclocal.m4 2012-01-09 14:09:39.000000000 +0100
-+++ saga/aclocal.m4 2012-01-09 14:10:07.000000000 +0100
-@@ -13,8 +13,8 @@
+@@ -255,7 +261,7 @@ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+ .SUFFIXES:
+-am--refresh:
++am--refresh: Makefile
+ @:
+ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+@@ -291,10 +297,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+
+ config.h: stamp-h1
+- @if test ! -f $@; then \
+- rm -f stamp-h1; \
+- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+- else :; fi
++ @if test ! -f $@; then rm -f stamp-h1; else :; fi
++ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+@@ -523,7 +527,11 @@ dist-gzip: distdir
+ $(am__remove_distdir)
+
+ dist-bzip2: distdir
+- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
++ $(am__remove_distdir)
++
++dist-lzip: distdir
++ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+ $(am__remove_distdir)
+
+ dist-lzma: distdir
+@@ -531,7 +539,7 @@ dist-lzma: distdir
+ $(am__remove_distdir)
+
+ dist-xz: distdir
+- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
++ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
+ dist-tarZ: distdir
+@@ -562,6 +570,8 @@ distcheck: dist
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
++ *.tar.lz*) \
++ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+@@ -581,6 +591,7 @@ distcheck: dist
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+@@ -609,8 +620,16 @@ distcheck: dist
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+- @$(am__cd) '$(distuninstallcheck_dir)' \
+- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
++ @test -n '$(distuninstallcheck_dir)' || { \
++ echo 'ERROR: trying to run $@ with an empty' \
++ '$$(distuninstallcheck_dir)' >&2; \
++ exit 1; \
++ }; \
++ $(am__cd) '$(distuninstallcheck_dir)' || { \
++ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
++ exit 1; \
++ }; \
++ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+@@ -641,10 +660,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+@@ -732,8 +756,8 @@ uninstall-am:
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+- dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+- distcheck distclean distclean-generic distclean-hdr \
++ dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
++ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+diff --git a/aclocal.m4 b/aclocal.m4
+index c36d800..49e58ad 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1,7 +1,8 @@
+-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++# Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,18 +14,21 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
@@ -174,10 +334,325 @@ Index: saga/aclocal.m4
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'.])])
-Index: saga/configure
-===================================================================
---- saga.orig/configure 2012-01-09 14:09:39.000000000 +0100
-+++ saga/configure 2012-01-09 14:10:07.000000000 +0100
+
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11.1], [],
++m4_if([$1], [1.11.3], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11.1])dnl
++[AM_AUTOMAKE_VERSION([1.11.3])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+ # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+@@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+-# Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
++# 2010, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 10
++# serial 12
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+@@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
++ am__nodep='_no'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+ AC_SUBST([AMDEPBACKSLASH])dnl
+ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++AC_SUBST([am__nodep])dnl
++_AM_SUBST_NOTMAKE([am__nodep])dnl
+ ])
+
+ # Generate code to set up dependency tracking. -*- Autoconf -*-
+@@ -545,12 +555,15 @@ for _am_header in $config_headers :; do
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
++# Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_PROG_INSTALL_SH
+ # ------------------
+ # Define $install_sh.
+@@ -682,12 +695,15 @@ else
+ fi
+ ])
+
+-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
++# Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_PROG_MKDIR_P
+ # ---------------
+ # Check for `mkdir -p'.
+@@ -710,13 +726,14 @@ esac
+
+ # Helper functions for option handling. -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 4
++# serial 5
+
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -724,13 +741,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
+ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+ # _AM_SET_OPTION(NAME)
+-# ------------------------------
++# --------------------
+ # Set option NAME. Presently that only means defining a flag for this option.
+ AC_DEFUN([_AM_SET_OPTION],
+ [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+ # _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
++# ------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+ [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+@@ -741,13 +758,15 @@ AC_DEFUN([_AM_SET_OPTIONS],
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
+-# Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009,
++# 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 2
++
+ # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+ # ---------------------------------------------------------------------------
+ # Adds support for distributing Python modules and packages. To
+@@ -775,8 +794,10 @@ AC_DEFUN([AM_PATH_PYTHON],
+ dnl Find a Python interpreter. Python versions prior to 2.0 are not
+ dnl supported. (2.0 was released on October 16, 2000).
+ m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
+-python2.1 python2.0])
++[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
++ python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
++
++ AC_ARG_VAR([PYTHON], [the Python interpreter])
+
+ m4_if([$1],[],[
+ dnl No version check is needed.
+@@ -848,9 +869,7 @@ python2.1 python2.0])
+ dnl site-packages directory, not the python standard library
+ dnl directory like in previous automake betas. This behavior
+ dnl is more consistent with lispdir.m4 for example.
+- dnl Query distutils for this directory. distutils does not exist in
+- dnl Python 1.5, so we fall back to the hardcoded directory if it
+- dnl doesn't work.
++ dnl Query distutils for this directory.
+ AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+ [am_cv_python_pythondir],
+ [if test "x$prefix" = xNONE
+@@ -859,8 +878,7 @@ python2.1 python2.0])
+ else
+ am_py_prefix=$prefix
+ fi
+- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+@@ -886,9 +904,7 @@ python2.1 python2.0])
+
+ dnl pyexecdir -- directory for installing python extension modules
+ dnl (shared libraries)
+- dnl Query distutils for this directory. distutils does not exist in
+- dnl Python 1.5, so we fall back to the hardcoded directory if it
+- dnl doesn't work.
++ dnl Query distutils for this directory.
+ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+ [am_cv_python_pyexecdir],
+ [if test "x$exec_prefix" = xNONE
+@@ -897,8 +913,7 @@ python2.1 python2.0])
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+@@ -946,12 +961,14 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
+ sys.exit(sys.hexversion < minverhex)"
+ AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_RUN_LOG(COMMAND)
+ # -------------------
+ # Run COMMAND, save the exit status in ac_status, and log it.
+@@ -1028,12 +1045,14 @@ Check your system clock])
+ fi
+ AC_MSG_RESULT(yes)])
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_PROG_INSTALL_STRIP
+ # ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+@@ -1056,13 +1075,13 @@ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 2
++# serial 3
+
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+@@ -1071,13 +1090,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+ # AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
++# --------------------------
+ # Public sister of _AM_SUBST_NOTMAKE.
+ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+ # Check how to create a tarball. -*- Autoconf -*-
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -1099,10 +1118,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+ # a tarball read from stdin.
+ # $(am__untar) < result.tar
+ AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
++[# Always define AMTAR for backward compatibility. Yes, it's still used
++# in the wild :-( We should find a proper way to deprecate it ...
++AC_SUBST([AMTAR], ['$${TAR-tar}'])
+ m4_if([$1], [v7],
+- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+diff --git a/configure b/configure
+index 6f0f083..58d6bf3 100755
+--- a/configure
++++ b/configure
@@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -195,7 +670,7 @@ Index: saga/configure
#
#
# This configure script is free software; the Free Software Foundation
-@@ -91,6 +91,7 @@
+@@ -91,6 +91,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -203,7 +678,7 @@ Index: saga/configure
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -173,6 +174,14 @@
+@@ -173,6 +174,14 @@ test x\$exitcode = x0 || exit 1"
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
@@ -218,7 +693,7 @@ Index: saga/configure
test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
-@@ -216,11 +225,18 @@
+@@ -216,11 +225,18 @@ IFS=$as_save_IFS
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
@@ -238,7 +713,7 @@ Index: saga/configure
fi
if test x$as_have_required = xno; then :
-@@ -319,7 +335,7 @@
+@@ -319,7 +335,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -247,7 +722,7 @@ Index: saga/configure
} # as_fn_mkdir_p
-@@ -359,19 +375,19 @@
+@@ -359,19 +375,19 @@ else
fi # as_fn_arith
@@ -275,7 +750,7 @@ Index: saga/configure
as_fn_exit $as_status
} # as_fn_error
-@@ -528,161 +544,14 @@
+@@ -528,161 +544,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -438,7 +913,7 @@ Index: saga/configure
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-@@ -795,9 +664,11 @@
+@@ -795,9 +664,11 @@ OTOOL
LIPO
NMEDIT
DSYMUTIL
@@ -451,7 +926,15 @@ Index: saga/configure
OBJDUMP
LN_S
NM
-@@ -909,6 +780,7 @@
+@@ -826,6 +697,7 @@ CC
+ am__fastdepCXX_FALSE
+ am__fastdepCXX_TRUE
+ CXXDEPMODE
++am__nodep
+ AMDEPBACKSLASH
+ AMDEP_FALSE
+ AMDEP_TRUE
+@@ -909,6 +781,7 @@ enable_static
with_pic
enable_fast_install
with_gnu_ld
@@ -459,7 +942,15 @@ Index: saga/configure
enable_libtool_lock
with_local
enable_debug
-@@ -993,8 +865,9 @@
+@@ -930,6 +803,7 @@ CC
+ CFLAGS
+ CPP
+ CXXCPP
++PYTHON
+ PYTHON_VERSION'
+
+
+@@ -993,8 +867,9 @@ do
fi
case $ac_option in
@@ -471,7 +962,7 @@ Index: saga/configure
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1039,7 +912,7 @@
+@@ -1039,7 +914,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 &&
@@ -480,7 +971,7 @@ Index: saga/configure
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1065,7 +938,7 @@
+@@ -1065,7 +940,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 &&
@@ -489,7 +980,7 @@ Index: saga/configure
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1269,7 +1142,7 @@
+@@ -1269,7 +1144,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 &&
@@ -498,7 +989,7 @@ Index: saga/configure
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1285,7 +1158,7 @@
+@@ -1285,7 +1160,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 &&
@@ -507,7 +998,7 @@ Index: saga/configure
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1315,8 +1188,8 @@
+@@ -1315,8 +1190,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -518,7 +1009,7 @@ Index: saga/configure
;;
*=*)
-@@ -1324,7 +1197,7 @@
+@@ -1324,7 +1199,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]* )
@@ -527,7 +1018,7 @@ Index: saga/configure
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1334,7 +1207,7 @@
+@@ -1334,7 +1209,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
@@ -536,7 +1027,7 @@ Index: saga/configure
;;
esac
-@@ -1342,13 +1215,13 @@
+@@ -1342,13 +1217,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -552,7 +1043,7 @@ Index: saga/configure
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1371,7 +1244,7 @@
+@@ -1371,7 +1246,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -561,7 +1052,7 @@ Index: saga/configure
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1385,8 +1258,8 @@
+@@ -1385,8 +1260,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -572,7 +1063,7 @@ Index: saga/configure
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1401,9 +1274,9 @@
+@@ -1401,9 +1276,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 .` ||
@@ -584,7 +1075,7 @@ Index: saga/configure
# Find the source files, if location was not specified.
-@@ -1442,11 +1315,11 @@
+@@ -1442,11 +1317,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -598,7 +1089,7 @@ Index: saga/configure
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1486,7 +1359,7 @@
+@@ -1486,7 +1361,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
@@ -607,7 +1098,7 @@ Index: saga/configure
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
-@@ -1566,9 +1439,11 @@
+@@ -1566,9 +1441,11 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -620,7 +1111,15 @@ Index: saga/configure
--with-local=dir search /usr/local or other directory for includes and libs
Some influential environment variables:
-@@ -1655,9 +1530,9 @@
+@@ -1583,6 +1460,7 @@ Some influential environment variables:
+ CFLAGS C compiler flags
+ CPP C preprocessor
+ CXXCPP C++ preprocessor
++ PYTHON the Python interpreter
+ PYTHON_VERSION
+ The installed Python version to use, for example '2.3'. This
+ string will be appended to the Python interpreter canonical
+@@ -1655,9 +1533,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
saga configure 2.0.8
@@ -632,7 +1131,7 @@ Index: saga/configure
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
-@@ -1701,7 +1576,7 @@
+@@ -1701,7 +1579,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -641,7 +1140,7 @@ Index: saga/configure
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
-@@ -1739,7 +1614,7 @@
+@@ -1739,7 +1617,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -650,7 +1149,7 @@ Index: saga/configure
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
-@@ -1785,7 +1660,7 @@
+@@ -1785,7 +1663,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
@@ -659,7 +1158,7 @@ Index: saga/configure
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
-@@ -1799,7 +1674,7 @@
+@@ -1799,7 +1677,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; }
@@ -668,7 +1167,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1817,7 +1692,7 @@
+@@ -1817,7 +1695,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -677,7 +1176,7 @@ Index: saga/configure
} # ac_fn_c_check_header_compile
-@@ -1842,7 +1717,7 @@
+@@ -1842,7 +1720,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -686,7 +1185,7 @@ Index: saga/configure
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -1853,7 +1728,7 @@
+@@ -1853,7 +1731,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -695,7 +1194,7 @@ Index: saga/configure
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
-@@ -1895,7 +1770,7 @@
+@@ -1895,7 +1773,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
@@ -704,7 +1203,7 @@ Index: saga/configure
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
-@@ -1908,7 +1783,7 @@
+@@ -1908,7 +1786,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; }
@@ -713,7 +1212,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1963,7 +1838,7 @@
+@@ -1963,7 +1841,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -722,7 +1221,7 @@ Index: saga/configure
} # ac_fn_c_check_func
-@@ -1988,7 +1863,7 @@
+@@ -1988,7 +1866,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -731,7 +1230,7 @@ Index: saga/configure
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -1999,7 +1874,7 @@
+@@ -1999,7 +1877,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -740,7 +1239,7 @@ Index: saga/configure
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_cpp
-@@ -2045,7 +1920,7 @@
+@@ -2045,7 +1923,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
@@ -749,7 +1248,7 @@ Index: saga/configure
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
-@@ -2058,10 +1933,10 @@
+@@ -2058,10 +1936,10 @@ fi
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -762,7 +1261,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
-@@ -2097,7 +1972,7 @@
+@@ -2097,7 +1975,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ac_header_preproc=no
fi
@@ -771,7 +1270,7 @@ Index: saga/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
-@@ -2120,17 +1995,15 @@
+@@ -2120,17 +1998,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;}
@@ -792,7 +1291,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
-@@ -2139,7 +2012,7 @@
+@@ -2139,7 +2015,7 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
@@ -801,7 +1300,7 @@ Index: saga/configure
} # ac_fn_c_check_header_mongrel
-@@ -2152,7 +2025,7 @@
+@@ -2152,7 +2028,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; }
@@ -810,7 +1309,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
eval "$3=no"
-@@ -2193,7 +2066,7 @@
+@@ -2193,7 +2069,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -819,7 +1318,7 @@ Index: saga/configure
} # ac_fn_c_check_type
cat >config.log <<_ACEOF
-@@ -2201,7 +2074,7 @@
+@@ -2201,7 +2077,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.8, which was
@@ -828,7 +1327,7 @@ Index: saga/configure
$ $0 $@
-@@ -2311,11 +2184,9 @@
+@@ -2311,11 +2187,9 @@ trap 'exit_status=$?
{
echo
@@ -842,7 +1341,7 @@ Index: saga/configure
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -2349,11 +2220,9 @@
+@@ -2349,11 +2223,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
@@ -856,7 +1355,7 @@ Index: saga/configure
echo
for ac_var in $ac_subst_vars
do
-@@ -2366,11 +2235,9 @@
+@@ -2366,11 +2238,9 @@ _ASBOX
echo
if test -n "$ac_subst_files"; then
@@ -870,7 +1369,7 @@ Index: saga/configure
echo
for ac_var in $ac_subst_files
do
-@@ -2384,11 +2251,9 @@
+@@ -2384,11 +2254,9 @@ _ASBOX
fi
if test -s confdefs.h; then
@@ -884,7 +1383,7 @@ Index: saga/configure
echo
cat confdefs.h
echo
-@@ -2443,7 +2308,12 @@
+@@ -2443,7 +2311,12 @@ _ACEOF
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
@@ -898,7 +1397,7 @@ Index: saga/configure
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
-@@ -2458,7 +2328,11 @@
+@@ -2458,7 +2331,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
@@ -911,7 +1410,7 @@ Index: saga/configure
fi
done
-@@ -2534,7 +2408,7 @@
+@@ -2534,7 +2411,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;}
@@ -920,7 +1419,7 @@ Index: saga/configure
fi
## -------------------- ##
## Main body of script. ##
-@@ -2555,16 +2429,22 @@
+@@ -2555,16 +2432,22 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -951,7 +1450,7 @@ Index: saga/configure
fi
# These three variables are undocumented and unsupported,
-@@ -2593,7 +2473,7 @@
+@@ -2593,7 +2476,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
@@ -960,7 +1459,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2680,11 +2560,11 @@
+@@ -2680,11 +2563,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -974,7 +1473,7 @@ Index: saga/configure
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2706,7 +2586,7 @@
+@@ -2706,7 +2589,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".
@@ -983,7 +1482,7 @@ Index: saga/configure
alias in your environment" "$LINENO" 5
fi
-@@ -2716,7 +2596,7 @@
+@@ -2716,7 +2599,7 @@ then
# Ok.
:
else
@@ -992,7 +1491,7 @@ Index: saga/configure
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -2770,7 +2650,7 @@
+@@ -2770,7 +2653,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; }
@@ -1001,7 +1500,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2810,7 +2690,7 @@
+@@ -2810,7 +2693,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; }
@@ -1010,7 +1509,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2863,7 +2743,7 @@
+@@ -2863,7 +2746,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
@@ -1019,7 +1518,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2914,7 +2794,7 @@
+@@ -2914,7 +2797,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; }
@@ -1028,7 +1527,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2954,7 +2834,7 @@
+@@ -2954,7 +2837,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'`
@@ -1037,7 +1536,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2962,7 +2842,7 @@
+@@ -2962,7 +2845,7 @@ SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
@@ -1046,7 +1545,7 @@ Index: saga/configure
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -2996,7 +2876,7 @@
+@@ -2996,7 +2879,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
@@ -1055,7 +1554,20 @@ Index: saga/configure
fi
fi
-@@ -3120,7 +3000,7 @@
+@@ -3042,9 +2925,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+-# Always define AMTAR for backward compatibility.
+-
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
++# Always define AMTAR for backward compatibility. Yes, it's still used
++# in the wild :-( We should find a proper way to deprecate it ...
++AMTAR='$${TAR-tar}'
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+@@ -3120,7 +3003,7 @@ do
done
rm -rf conftest.dir
@@ -1064,7 +1576,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
am_cv_prog_tar_ustar=$_am_tool
-@@ -3151,7 +3031,7 @@
+@@ -3151,7 +3034,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; }
@@ -1073,7 +1585,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -3195,7 +3075,7 @@
+@@ -3195,7 +3078,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; }
@@ -1082,7 +1594,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -3358,9 +3238,8 @@
+@@ -3358,9 +3241,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;}
@@ -1094,7 +1606,7 @@ Index: saga/configure
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3402,8 +3281,8 @@
+@@ -3402,8 +3284,8 @@ done
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1105,7 +1617,7 @@ Index: saga/configure
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3460,9 +3339,9 @@
+@@ -3460,9 +3342,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;}
@@ -1117,7 +1629,7 @@ Index: saga/configure
fi
fi
fi
-@@ -3473,7 +3352,7 @@
+@@ -3473,7 +3355,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; }
@@ -1126,7 +1638,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3513,8 +3392,8 @@
+@@ -3513,8 +3395,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;}
@@ -1137,7 +1649,7 @@ Index: saga/configure
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -3524,7 +3403,7 @@
+@@ -3524,7 +3406,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; }
@@ -1146,7 +1658,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3561,7 +3440,7 @@
+@@ -3561,7 +3443,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; }
@@ -1155,7 +1667,15 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-@@ -3709,7 +3588,7 @@
+@@ -3694,6 +3576,7 @@ fi
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
++ am__nodep='_no'
+ fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+@@ -3709,7 +3592,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; }
@@ -1164,7 +1684,24 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3842,7 +3721,7 @@
+@@ -3718,6 +3601,7 @@ else
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -3777,7 +3661,7 @@ else
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+@@ -3842,7 +3726,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; }
@@ -1173,7 +1710,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3882,7 +3761,7 @@
+@@ -3882,7 +3766,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; }
@@ -1182,7 +1719,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3935,7 +3814,7 @@
+@@ -3935,7 +3819,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; }
@@ -1191,7 +1728,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3975,7 +3854,7 @@
+@@ -3975,7 +3859,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; }
@@ -1200,7 +1737,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4034,7 +3913,7 @@
+@@ -4034,7 +3918,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; }
@@ -1209,7 +1746,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4078,7 +3957,7 @@
+@@ -4078,7 +3962,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; }
@@ -1218,7 +1755,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4132,8 +4011,8 @@
+@@ -4132,8 +4016,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;}
@@ -1229,7 +1766,7 @@ Index: saga/configure
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4162,7 +4041,7 @@
+@@ -4162,7 +4046,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; }
@@ -1238,7 +1775,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4199,7 +4078,7 @@
+@@ -4199,7 +4083,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; }
@@ -1247,7 +1784,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -4277,7 +4156,7 @@
+@@ -4277,7 +4161,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; }
@@ -1256,7 +1793,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
-@@ -4376,7 +4255,7 @@
+@@ -4376,7 +4260,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; }
@@ -1265,7 +1802,24 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4508,8 +4387,8 @@
+@@ -4385,6 +4269,7 @@ else
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -4444,7 +4329,7 @@ else
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+@@ -4508,8 +4393,8 @@ esac
@@ -1276,7 +1830,7 @@ Index: saga/configure
-@@ -4527,27 +4406,27 @@
+@@ -4527,27 +4412,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 ||
@@ -1309,7 +1863,7 @@ Index: saga/configure
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -4565,14 +4444,14 @@
+@@ -4565,14 +4450,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; }
@@ -1326,7 +1880,7 @@ Index: saga/configure
fi
fi
-@@ -4580,7 +4459,7 @@
+@@ -4580,7 +4465,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
@@ -1335,7 +1889,7 @@ Index: saga/configure
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -4596,9 +4475,78 @@
+@@ -4596,9 +4481,78 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -1415,7 +1969,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4653,7 +4601,7 @@
+@@ -4653,7 +4607,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
@@ -1424,7 +1978,7 @@ Index: saga/configure
fi
else
ac_cv_path_SED=$SED
-@@ -4680,7 +4628,7 @@
+@@ -4680,7 +4634,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; }
@@ -1433,7 +1987,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4729,7 +4677,7 @@
+@@ -4729,7 +4683,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
@@ -1442,7 +1996,7 @@ Index: saga/configure
fi
else
ac_cv_path_GREP=$GREP
-@@ -4743,7 +4691,7 @@
+@@ -4743,7 +4697,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; }
@@ -1451,7 +2005,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4795,7 +4743,7 @@
+@@ -4795,7 +4749,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
@@ -1460,7 +2014,7 @@ Index: saga/configure
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4810,7 +4758,7 @@
+@@ -4810,7 +4764,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; }
@@ -1469,7 +2023,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4862,7 +4810,7 @@
+@@ -4862,7 +4816,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
@@ -1478,7 +2032,7 @@ Index: saga/configure
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4941,7 +4889,7 @@
+@@ -4941,7 +4895,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
@@ -1487,7 +2041,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4978,10 +4926,10 @@
+@@ -4978,10 +4932,10 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -1500,7 +2054,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -5008,7 +4956,7 @@
+@@ -5008,7 +4962,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; }
@@ -1509,7 +2063,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -5061,14 +5009,17 @@
+@@ -5061,14 +5015,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.
@@ -1530,7 +2084,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -5106,13 +5057,13 @@
+@@ -5106,13 +5063,13 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -1546,7 +2100,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -5161,6 +5112,15 @@
+@@ -5161,6 +5118,15 @@ esac
fi
fi
@@ -1562,7 +2116,7 @@ Index: saga/configure
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -5175,18 +5135,18 @@
+@@ -5175,18 +5141,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; }
@@ -1585,7 +2139,7 @@ Index: saga/configure
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5210,7 +5170,7 @@
+@@ -5210,7 +5176,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; }
@@ -1594,7 +2148,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
i=0
-@@ -5243,6 +5203,11 @@
+@@ -5243,6 +5209,11 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
@@ -1606,7 +2160,7 @@ Index: saga/configure
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -5268,6 +5233,11 @@
+@@ -5268,6 +5239,11 @@ else
lt_cv_sys_max_cmd_len=196608
;;
@@ -1618,7 +2172,7 @@ Index: saga/configure
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 @@
+@@ -5307,8 +5283,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.
@@ -1629,7 +2183,7 @@ Index: saga/configure
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -5350,8 +5320,8 @@
+@@ -5350,8 +5326,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"
@@ -1640,7 +2194,7 @@ Index: saga/configure
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-@@ -5400,9 +5370,83 @@
+@@ -5400,9 +5376,83 @@ esac
@@ -1725,7 +2279,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
-@@ -5416,6 +5460,11 @@
+@@ -5416,6 +5466,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
@@ -1737,7 +2291,7 @@ Index: saga/configure
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -5438,7 +5487,7 @@
+@@ -5438,7 +5493,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; }
@@ -1746,7 +2300,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5478,7 +5527,7 @@
+@@ -5478,7 +5533,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; }
@@ -1755,7 +2309,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5537,7 +5586,7 @@
+@@ -5537,7 +5592,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; }
@@ -1764,7 +2318,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5579,16 +5628,18 @@
+@@ -5579,16 +5634,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.
@@ -1786,7 +2340,7 @@ Index: saga/configure
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -5618,6 +5669,10 @@
+@@ -5618,6 +5675,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1797,7 +2351,7 @@ Index: saga/configure
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -5626,11 +5681,11 @@
+@@ -5626,11 +5687,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -1811,7 +2365,7 @@ Index: saga/configure
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -5651,7 +5706,7 @@
+@@ -5651,7 +5712,7 @@ irix5* | irix6* | nonstopux*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1820,7 +2374,7 @@ Index: saga/configure
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5733,6 +5788,21 @@
+@@ -5733,6 +5794,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; }
@@ -1842,7 +2396,7 @@ Index: saga/configure
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -5748,16 +5818,26 @@
+@@ -5748,16 +5824,26 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -1874,7 +2428,7 @@ Index: saga/configure
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5766,7 +5846,7 @@
+@@ -5766,7 +5852,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
@@ -1883,7 +2437,7 @@ Index: saga/configure
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5776,10 +5856,10 @@
+@@ -5776,10 +5862,10 @@ IFS=$as_save_IFS
fi
fi
@@ -1898,7 +2452,7 @@ Index: saga/configure
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -5787,17 +5867,17 @@
+@@ -5787,17 +5873,17 @@ fi
fi
@@ -1923,7 +2477,7 @@ Index: saga/configure
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5806,7 +5886,7 @@
+@@ -5806,7 +5892,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
@@ -1932,7 +2486,7 @@ Index: saga/configure
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5816,17 +5896,17 @@
+@@ -5816,17 +5902,17 @@ IFS=$as_save_IFS
fi
fi
@@ -1956,7 +2510,7 @@ Index: saga/configure
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -5834,19 +5914,56 @@
+@@ -5834,14 +5920,15 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -1973,12 +2527,11 @@ Index: saga/configure
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
-+
-+
-+
+@@ -5850,19 +5937,57 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
@@ -2014,12 +2567,12 @@ Index: saga/configure
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
++
++
++
-@@ -5854,15 +5971,17 @@
-
-
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -2040,7 +2593,7 @@ Index: saga/configure
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5871,7 +5990,7 @@
+@@ -5871,7 +5996,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
@@ -2049,7 +2602,7 @@ Index: saga/configure
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5881,28 +6000,197 @@
+@@ -5881,27 +6006,196 @@ IFS=$as_save_IFS
fi
fi
@@ -2087,7 +2640,6 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_STRIP"; then
-- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
@@ -2254,11 +2806,10 @@ Index: saga/configure
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_STRIP"; then
-+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -5957,7 +6245,7 @@
+@@ -5957,7 +6251,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; }
@@ -2267,7 +2818,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5997,7 +6285,7 @@
+@@ -5997,7 +6291,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; }
@@ -2276,7 +2827,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -6059,15 +6347,27 @@
+@@ -6059,15 +6353,27 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -2307,7 +2858,7 @@ Index: saga/configure
-@@ -6114,7 +6414,7 @@
+@@ -6114,7 +6420,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; }
@@ -2316,7 +2867,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
-@@ -6175,8 +6475,8 @@
+@@ -6175,8 +6481,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
@@ -2327,7 +2878,7 @@ Index: saga/configure
# Handle CRLF in mingw tool chain
opt_cr=
-@@ -6200,6 +6500,7 @@
+@@ -6200,6 +6506,7 @@ for ac_symprfx in "" "_"; do
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
@@ -2335,7 +2886,7 @@ Index: saga/configure
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-@@ -6212,6 +6513,7 @@
+@@ -6212,6 +6519,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
@@ -2343,7 +2894,7 @@ Index: saga/configure
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -6237,8 +6539,8 @@
+@@ -6237,8 +6545,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -2354,7 +2905,7 @@ Index: saga/configure
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -6253,6 +6555,18 @@
+@@ -6253,6 +6561,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
@@ -2373,7 +2924,7 @@ Index: saga/configure
#ifdef __cplusplus
extern "C" {
#endif
-@@ -6264,7 +6578,7 @@
+@@ -6264,7 +6584,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
@@ -2382,7 +2933,7 @@ Index: saga/configure
const char *name;
void *address;
}
-@@ -6290,8 +6604,8 @@
+@@ -6290,8 +6610,8 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
@@ -2393,7 +2944,7 @@ Index: saga/configure
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -6301,8 +6615,8 @@
+@@ -6301,8 +6621,8 @@ _LT_EOF
test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
@@ -2404,7 +2955,7 @@ Index: saga/configure
else
echo "cannot find nm_test_func in $nlist" >&5
fi
-@@ -6339,6 +6653,20 @@
+@@ -6339,6 +6659,19 @@ else
$as_echo "ok" >&6; }
fi
@@ -2421,11 +2972,10 @@ Index: saga/configure
+
+
+
-+
-@@ -6358,6 +6686,40 @@
+@@ -6359,6 +6692,41 @@ fi
@@ -2463,10 +3013,11 @@ Index: saga/configure
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
++
-
-@@ -6392,7 +6754,7 @@
+ # Check whether --enable-libtool-lock was given.
+@@ -6392,7 +6760,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -2475,7 +3026,7 @@ Index: saga/configure
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6486,7 +6848,7 @@
+@@ -6486,7 +6854,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; }
@@ -2484,7 +3035,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6527,7 +6889,7 @@
+@@ -6527,7 +6895,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -2493,7 +3044,7 @@ Index: saga/configure
# 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 @@
+@@ -6538,7 +6906,20 @@ sparc*-*solaris*)
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
@@ -2515,7 +3066,7 @@ Index: saga/configure
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
-@@ -6554,6 +6929,123 @@
+@@ -6554,6 +6935,123 @@ esac
need_locks="$enable_libtool_lock"
@@ -2639,7 +3190,7 @@ Index: saga/configure
case $host_os in
rhapsody* | darwin*)
-@@ -6562,7 +7054,7 @@
+@@ -6562,7 +7060,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; }
@@ -2648,7 +3199,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6602,7 +7094,7 @@
+@@ -6602,7 +7100,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; }
@@ -2657,7 +3208,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6654,7 +7146,7 @@
+@@ -6654,7 +7152,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; }
@@ -2666,7 +3217,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6694,7 +7186,7 @@
+@@ -6694,7 +7192,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; }
@@ -2675,7 +3226,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6746,7 +7238,7 @@
+@@ -6746,7 +7244,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; }
@@ -2684,7 +3235,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6786,7 +7278,7 @@
+@@ -6786,7 +7284,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; }
@@ -2693,7 +3244,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6838,7 +7330,7 @@
+@@ -6838,7 +7336,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; }
@@ -2702,7 +3253,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6878,7 +7370,7 @@
+@@ -6878,7 +7376,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; }
@@ -2711,7 +3262,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6930,7 +7422,7 @@
+@@ -6930,7 +7428,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; }
@@ -2720,7 +3271,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6970,7 +7462,7 @@
+@@ -6970,7 +7468,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; }
@@ -2729,7 +3280,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -7045,7 +7537,7 @@
+@@ -7045,7 +7543,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; }
@@ -2738,7 +3289,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -7061,7 +7553,13 @@
+@@ -7061,7 +7559,13 @@ else
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
@@ -2753,7 +3304,7 @@ Index: saga/configure
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
-@@ -7072,9 +7570,10 @@
+@@ -7072,9 +7576,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; }
@@ -2765,13 +3316,12 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
-@@ -7104,9 +7603,44 @@
+@@ -7104,8 +7609,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' ;;
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
@@ -2809,11 +3359,10 @@ Index: saga/configure
+$as_echo "$lt_cv_ld_force_load" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
darwin1.*)
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
-@@ -7131,7 +7665,7 @@
+@@ -7131,7 +7671,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -2822,7 +3371,7 @@ Index: saga/configure
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -7151,7 +7685,7 @@
+@@ -7151,7 +7691,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
@@ -2831,7 +3380,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -7181,7 +7715,7 @@
+@@ -7181,7 +7721,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -2840,7 +3389,7 @@ Index: saga/configure
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -7197,11 +7731,11 @@
+@@ -7197,11 +7737,11 @@ else
ac_preproc_ok=:
break
fi
@@ -2854,7 +3403,7 @@ Index: saga/configure
if $ac_preproc_ok; then :
break
fi
-@@ -7240,7 +7774,7 @@
+@@ -7240,7 +7780,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -2863,7 +3412,7 @@ Index: saga/configure
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -7256,18 +7790,18 @@
+@@ -7256,18 +7796,18 @@ else
ac_preproc_ok=:
break
fi
@@ -2886,7 +3435,7 @@ Index: saga/configure
fi
ac_ext=c
-@@ -7279,7 +7813,7 @@
+@@ -7279,7 +7819,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; }
@@ -2895,7 +3444,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -7396,8 +7930,7 @@
+@@ -7396,8 +7936,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
"
@@ -2905,7 +3454,7 @@ Index: saga/configure
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -7411,539 +7944,25 @@
+@@ -7411,539 +7950,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
"
@@ -2913,7 +3462,7 @@ Index: saga/configure
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
- _ACEOF
+-_ACEOF
-
-fi
-
@@ -3420,31 +3969,35 @@ Index: saga/configure
- # Passes both tests.
-ac_preproc_ok=:
-break
-+
- fi
+-fi
-rm -f conftest.err conftest.$ac_ext
-
- done
+-
+-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-_lt_caught_CXX_error=yes; }
--fi
++_ACEOF
++
+ fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++done
-else
- _lt_caught_CXX_error=yes
-fi
+
++
++
+func_stripname_cnf ()
+{
+ case ${2} in
@@ -3455,7 +4008,7 @@ Index: saga/configure
-@@ -8024,7 +8043,22 @@
+@@ -8024,7 +8049,22 @@ fi
# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then :
@@ -3479,7 +4032,7 @@ Index: saga/configure
else
pic_mode=default
fi
-@@ -8101,6 +8135,11 @@
+@@ -8101,6 +8141,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -3491,7 +4044,7 @@ Index: saga/configure
test -z "$LN_S" && LN_S="ln -s"
-@@ -8122,7 +8161,7 @@
+@@ -8122,7 +8167,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
@@ -3500,7 +4053,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -8150,19 +8189,6 @@
+@@ -8150,19 +8195,6 @@ _ACEOF
@@ -3520,7 +4073,7 @@ Index: saga/configure
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
-@@ -8175,23 +8201,6 @@
+@@ -8175,23 +8207,6 @@ aix3*)
;;
esac
@@ -3544,7 +4097,7 @@ Index: saga/configure
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -8220,7 +8229,7 @@
+@@ -8220,7 +8235,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -3553,7 +4106,7 @@ Index: saga/configure
# Only perform the check for file, if the check method requires it
-@@ -8230,7 +8239,7 @@
+@@ -8230,7 +8245,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; }
@@ -3562,7 +4115,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8296,7 +8305,7 @@
+@@ -8296,7 +8311,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; }
@@ -3571,7 +4124,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8429,11 +8438,16 @@
+@@ -8429,11 +8444,16 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
@@ -3590,7 +4143,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -8449,15 +8463,15 @@
+@@ -8449,15 +8469,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3609,7 +4162,7 @@ Index: saga/configure
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -8486,8 +8500,6 @@
+@@ -8486,8 +8506,6 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -3618,7 +4171,7 @@ Index: saga/configure
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -8535,6 +8547,12 @@
+@@ -8535,6 +8553,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fno-common'
;;
@@ -3631,7 +4184,7 @@ Index: saga/configure
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8577,6 +8595,15 @@
+@@ -8577,6 +8601,15 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -3647,7 +4200,7 @@ Index: saga/configure
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8639,7 +8666,13 @@
+@@ -8639,7 +8672,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
@@ -3662,7 +4215,7 @@ Index: saga/configure
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8651,25 +8684,40 @@
+@@ -8651,25 +8690,40 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -3709,7 +4262,7 @@ Index: saga/configure
;;
esac
;;
-@@ -8701,7 +8749,7 @@
+@@ -8701,7 +8755,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
@@ -3718,7 +4271,7 @@ Index: saga/configure
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -8758,13 +8806,17 @@
+@@ -8758,13 +8812,17 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -3742,7 +4295,7 @@ Index: saga/configure
#
# Check to make sure the PIC flag actually works.
-@@ -8772,7 +8824,7 @@
+@@ -8772,7 +8830,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; }
@@ -3751,7 +4304,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8788,15 +8840,15 @@
+@@ -8788,15 +8846,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3770,7 +4323,7 @@ Index: saga/configure
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
-@@ -8825,13 +8877,18 @@
+@@ -8825,13 +8883,18 @@ fi
@@ -3790,7 +4343,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8844,7 +8901,7 @@
+@@ -8844,7 +8907,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -3799,7 +4352,7 @@ Index: saga/configure
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -8874,7 +8931,7 @@
+@@ -8874,7 +8937,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; }
@@ -3808,7 +4361,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8893,16 +8950,16 @@
+@@ -8893,16 +8956,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3828,7 +4381,7 @@ Index: saga/configure
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -8929,7 +8986,7 @@
+@@ -8929,7 +8992,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; }
@@ -3837,7 +4390,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8948,16 +9005,16 @@
+@@ -8948,16 +9011,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3857,7 +4410,7 @@ Index: saga/configure
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -9023,7 +9080,6 @@
+@@ -9023,7 +9086,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
hardcode_direct=no
hardcode_direct_absolute=no
hardcode_libdir_flag_spec=
@@ -3865,7 +4418,7 @@ Index: saga/configure
hardcode_libdir_separator=
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
-@@ -9067,13 +9123,39 @@
+@@ -9067,13 +9129,39 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
@@ -3906,7 +4459,7 @@ Index: saga/configure
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9107,11 +9189,12 @@
+@@ -9107,11 +9195,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -3922,7 +4475,7 @@ Index: saga/configure
_LT_EOF
fi
-@@ -9147,10 +9230,12 @@
+@@ -9147,10 +9236,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'
@@ -3936,7 +4489,7 @@ Index: saga/configure
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9168,6 +9253,11 @@
+@@ -9168,6 +9259,11 @@ _LT_EOF
fi
;;
@@ -3948,7 +4501,7 @@ Index: saga/configure
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -9193,15 +9283,16 @@
+@@ -9193,15 +9289,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
@@ -3969,7 +4522,7 @@ Index: saga/configure
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -9212,13 +9303,17 @@
+@@ -9212,13 +9309,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -3989,7 +4542,7 @@ Index: saga/configure
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -9234,17 +9329,16 @@
+@@ -9234,17 +9335,16 @@ _LT_EOF
fi
case $cc_basename in
@@ -4011,7 +4564,7 @@ Index: saga/configure
fi
;;
esac
-@@ -9258,8 +9352,8 @@
+@@ -9258,8 +9358,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -4022,7 +4575,7 @@ Index: saga/configure
fi
;;
-@@ -9277,8 +9371,8 @@
+@@ -9277,8 +9377,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4033,7 +4586,7 @@ Index: saga/configure
else
ld_shlibs=no
fi
-@@ -9324,8 +9418,8 @@
+@@ -9324,8 +9424,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4044,7 +4597,7 @@ Index: saga/configure
else
ld_shlibs=no
fi
-@@ -9365,8 +9459,10 @@
+@@ -9365,8 +9465,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
@@ -4056,7 +4609,7 @@ Index: saga/configure
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -9454,7 +9550,13 @@
+@@ -9454,7 +9556,13 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -4071,7 +4624,7 @@ Index: saga/configure
/* end confdefs.h. */
int
-@@ -9467,25 +9569,32 @@
+@@ -9467,25 +9575,32 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -4118,7 +4671,7 @@ Index: saga/configure
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9494,7 +9603,13 @@
+@@ -9494,7 +9609,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.
@@ -4133,7 +4686,7 @@ Index: saga/configure
/* end confdefs.h. */
int
-@@ -9507,30 +9622,42 @@
+@@ -9507,30 +9628,42 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -4191,7 +4744,7 @@ Index: saga/configure
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -9562,20 +9689,64 @@
+@@ -9562,20 +9695,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.
@@ -4270,7 +4823,7 @@ Index: saga/configure
;;
darwin* | rhapsody*)
-@@ -9585,7 +9756,12 @@
+@@ -9585,7 +9762,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -4284,7 +4837,7 @@ Index: saga/configure
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -9593,7 +9769,7 @@
+@@ -9593,7 +9775,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
@@ -4293,7 +4846,7 @@ Index: saga/configure
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -9611,10 +9787,6 @@
+@@ -9611,10 +9793,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_shlibpath_var=no
;;
@@ -4304,7 +4857,7 @@ Index: saga/configure
# 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 @@
+@@ -9627,7 +9805,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -4313,7 +4866,7 @@ Index: saga/configure
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
-@@ -9636,7 +9808,7 @@
+@@ -9636,7 +9814,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*)
@@ -4322,7 +4875,7 @@ Index: saga/configure
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9644,7 +9816,7 @@
+@@ -9644,7 +9822,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hpux9*)
if test "$GCC" = yes; then
@@ -4331,7 +4884,7 @@ Index: saga/configure
else
archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -9659,14 +9831,13 @@
+@@ -9659,14 +9837,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux10*)
@@ -4348,7 +4901,7 @@ Index: saga/configure
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
-@@ -9678,16 +9849,16 @@
+@@ -9678,16 +9855,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux11*)
@@ -4368,7 +4921,7 @@ Index: saga/configure
;;
esac
else
-@@ -9699,7 +9870,46 @@
+@@ -9699,7 +9876,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'
;;
*)
@@ -4416,7 +4969,7 @@ Index: saga/configure
;;
esac
fi
-@@ -9727,26 +9937,39 @@
+@@ -9727,26 +9943,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4466,7 +5019,7 @@ Index: saga/configure
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9808,17 +10031,17 @@
+@@ -9808,17 +10037,17 @@ rm -f core conftest.err conftest.$ac_objext \
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -4487,7 +5040,7 @@ Index: saga/configure
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9828,13 +10051,13 @@
+@@ -9828,13 +10057,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}\*'
@@ -4504,7 +5057,7 @@ Index: saga/configure
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -9847,9 +10070,9 @@
+@@ -9847,9 +10076,9 @@ rm -f core conftest.err conftest.$ac_objext \
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
@@ -4516,7 +5069,7 @@ Index: saga/configure
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -10037,44 +10260,50 @@
+@@ -10037,44 +10266,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; }
@@ -4596,7 +5149,7 @@ Index: saga/configure
;;
esac
fi
-@@ -10232,11 +10461,6 @@
+@@ -10232,11 +10467,6 @@ esac
@@ -4608,7 +5161,7 @@ Index: saga/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-@@ -10245,16 +10469,23 @@
+@@ -10245,16 +10475,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -4638,7 +5191,7 @@ Index: saga/configure
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -10267,7 +10498,7 @@
+@@ -10267,7 +10504,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -4647,7 +5200,7 @@ Index: saga/configure
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -10287,7 +10518,13 @@
+@@ -10287,7 +10524,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -4662,7 +5215,7 @@ Index: saga/configure
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10313,7 +10550,7 @@
+@@ -10313,7 +10556,7 @@ need_version=unknown
case $host_os in
aix3*)
@@ -4671,7 +5224,7 @@ Index: saga/configure
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
-@@ -10322,7 +10559,7 @@
+@@ -10322,7 +10565,7 @@ aix3*)
;;
aix[4-9]*)
@@ -4680,7 +5233,7 @@ Index: saga/configure
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
-@@ -10375,7 +10612,7 @@
+@@ -10375,7 +10618,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4689,7 +5242,7 @@ Index: saga/configure
;;
esac
;;
-@@ -10387,7 +10624,7 @@
+@@ -10387,7 +10630,7 @@ beos*)
;;
bsdi[45]*)
@@ -4698,7 +5251,7 @@ Index: saga/configure
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 @@
+@@ -10406,8 +10649,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
@@ -4710,7 +5263,7 @@ Index: saga/configure
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -10428,36 +10666,83 @@
+@@ -10428,36 +10672,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}'
@@ -4722,12 +5275,23 @@ Index: saga/configure
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ ;;
-+ pw32*)
-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ esac
+- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+- # It is most probably a Windows format PATH printed by
+- # mingw gcc, but we are running on Cygwin. Gcc prints its search
+- # path with ; separators, and with drive letters. We can handle the
+- # drive letters (cygwin fileutils understands them), so leave them,
+- # especially as we might pass files found there to a mingw objdump,
+- # which wouldn't understand a cygwinified path. Ahh.
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
@@ -4763,27 +5327,16 @@ Index: saga/configure
+ ;;
+ *)
+ sys_lib_search_path_spec="$LIB"
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-- # It is most probably a Windows format PATH printed by
-- # mingw gcc, but we are running on Cygwin. Gcc prints its search
-- # path with ; separators, and with drive letters. We can handle the
-- # drive letters (cygwin fileutils understands them), so leave them,
-- # especially as we might pass files found there to a mingw objdump,
-- # which wouldn't understand a cygwinified path. Ahh.
++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+ # It is most probably a Windows format PATH.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-- ;;
-- pw32*)
-- # pw32 DLLs use 'pw' prefix rather than 'lib'
-- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
- ;;
- esac
++ ;;
++ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
@@ -4808,7 +5361,7 @@ Index: saga/configure
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -10478,7 +10763,7 @@
+@@ -10478,7 +10769,7 @@ darwin* | rhapsody*)
;;
dgux*)
@@ -4817,7 +5370,7 @@ Index: saga/configure
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 @@
+@@ -10486,10 +10777,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -4828,7 +5381,7 @@ Index: saga/configure
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -10497,7 +10778,7 @@
+@@ -10497,7 +10784,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -4837,7 +5390,7 @@ Index: saga/configure
*) objformat=elf ;;
esac
fi
-@@ -10515,7 +10796,7 @@
+@@ -10515,7 +10802,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -4846,7 +5399,7 @@ Index: saga/configure
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -10535,12 +10816,26 @@
+@@ -10535,12 +10822,26 @@ freebsd* | dragonfly*)
;;
gnu*)
@@ -4874,7 +5427,7 @@ Index: saga/configure
hardcode_into_libs=yes
;;
-@@ -10586,12 +10881,14 @@
+@@ -10586,12 +10887,14 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -4891,7 +5444,7 @@ Index: saga/configure
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 @@
+@@ -10607,7 +10910,7 @@ irix5* | irix6* | nonstopux*)
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
@@ -4900,7 +5453,7 @@ Index: saga/configure
else
version_type=irix
fi ;;
-@@ -10644,9 +10941,9 @@
+@@ -10644,9 +10947,9 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
@@ -4912,7 +5465,7 @@ Index: saga/configure
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 @@
+@@ -10654,12 +10957,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -4935,7 +5488,7 @@ Index: saga/configure
/* end confdefs.h. */
int
-@@ -10672,13 +10974,17 @@
+@@ -10672,13 +10980,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 :
@@ -4956,7 +5509,7 @@ Index: saga/configure
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
-@@ -10687,7 +10993,7 @@
+@@ -10687,7 +10999,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
@@ -4965,7 +5518,7 @@ Index: saga/configure
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -10731,7 +11037,7 @@
+@@ -10731,7 +11043,7 @@ netbsd*)
;;
newsos6)
@@ -4974,7 +5527,7 @@ Index: saga/configure
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 @@
+@@ -10800,7 +11112,7 @@ rdos*)
;;
solaris*)
@@ -4983,7 +5536,7 @@ Index: saga/configure
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 @@
+@@ -10825,7 +11137,7 @@ sunos4*)
;;
sysv4 | sysv4.3*)
@@ -4992,7 +5545,7 @@ Index: saga/configure
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 @@
+@@ -10849,7 +11161,7 @@ sysv4 | sysv4.3*)
sysv4*MP*)
if test -d /usr/nec ;then
@@ -5001,7 +5554,7 @@ Index: saga/configure
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 @@
+@@ -10880,7 +11192,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
@@ -5010,7 +5563,7 @@ Index: saga/configure
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 @@
+@@ -10890,7 +11202,7 @@ tpf*)
;;
uts4*)
@@ -5019,7 +5572,7 @@ Index: saga/configure
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 @@
+@@ -11002,6 +11314,11 @@ fi
@@ -5031,7 +5584,7 @@ Index: saga/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
-@@ -11074,7 +11385,7 @@
+@@ -11074,7 +11391,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; }
@@ -5040,7 +5593,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11108,7 +11419,7 @@
+@@ -11108,7 +11425,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; }
@@ -5049,7 +5602,7 @@ Index: saga/configure
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11122,12 +11433,12 @@
+@@ -11122,12 +11439,12 @@ fi
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
@@ -5064,7 +5617,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11161,16 +11472,16 @@
+@@ -11161,16 +11478,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; }
@@ -5084,7 +5637,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11204,12 +11515,12 @@
+@@ -11204,12 +11521,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; }
@@ -5099,7 +5652,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11243,12 +11554,12 @@
+@@ -11243,12 +11560,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; }
@@ -5114,7 +5667,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11282,7 +11593,7 @@
+@@ -11282,7 +11599,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; }
@@ -5123,7 +5676,7 @@ Index: saga/configure
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11323,7 +11634,7 @@
+@@ -11323,7 +11640,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; }
@@ -5132,7 +5685,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11332,7 +11643,7 @@
+@@ -11332,7 +11649,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -5141,7 +5694,7 @@ Index: saga/configure
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11373,7 +11684,13 @@
+@@ -11373,7 +11690,13 @@ else
# endif
#endif
@@ -5156,7 +5709,7 @@ Index: saga/configure
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11382,7 +11699,11 @@
+@@ -11382,7 +11705,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -5169,7 +5722,7 @@ Index: saga/configure
/* dlclose (self); */
}
else
-@@ -11419,7 +11740,7 @@
+@@ -11419,7 +11746,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; }
@@ -5178,7 +5731,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11428,7 +11749,7 @@
+@@ -11428,7 +11755,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -5187,7 +5740,7 @@ Index: saga/configure
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11469,7 +11790,13 @@
+@@ -11469,7 +11796,13 @@ else
# endif
#endif
@@ -5202,7 +5755,7 @@ Index: saga/configure
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11478,7 +11805,11 @@
+@@ -11478,7 +11811,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -5215,7 +5768,7 @@ Index: saga/configure
/* dlclose (self); */
}
else
-@@ -11635,6 +11966,145 @@
+@@ -11635,6 +11972,145 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC="$lt_save_CC"
@@ -5361,7 +5914,7 @@ Index: saga/configure
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -11651,7 +12121,6 @@
+@@ -11651,7 +12127,6 @@ export_dynamic_flag_spec_CXX=
hardcode_direct_CXX=no
hardcode_direct_absolute_CXX=no
hardcode_libdir_flag_spec_CXX=
@@ -5369,7 +5922,7 @@ Index: saga/configure
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
hardcode_shlibpath_var_CXX=unsupported
-@@ -11661,6 +12130,8 @@
+@@ -11661,6 +12136,8 @@ module_cmds_CXX=
module_expsym_cmds_CXX=
link_all_deplibs_CXX=unknown
old_archive_cmds_CXX=$old_archive_cmds
@@ -5378,7 +5931,7 @@ Index: saga/configure
no_undefined_flag_CXX=
whole_archive_flag_spec_CXX=
enable_shared_with_static_runtimes_CXX=no
-@@ -11716,6 +12187,7 @@
+@@ -11716,6 +12193,7 @@ $RM -r conftest*
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
@@ -5386,7 +5939,7 @@ Index: saga/configure
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
-@@ -11733,6 +12205,7 @@
+@@ -11733,6 +12211,7 @@ $RM -r conftest*
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
@@ -5394,7 +5947,7 @@ Index: saga/configure
compiler=$CC
compiler_CXX=$CC
for cc_temp in $compiler""; do
-@@ -11743,7 +12216,7 @@
+@@ -11743,7 +12222,7 @@ $RM -r conftest*
*) break;;
esac
done
@@ -5403,7 +5956,7 @@ Index: saga/configure
if test -n "$compiler"; then
-@@ -11806,7 +12279,7 @@
+@@ -11806,7 +12285,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
@@ -5412,7 +5965,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -11843,10 +12316,10 @@
+@@ -11843,10 +12322,10 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5425,7 +5978,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -11872,8 +12345,8 @@
+@@ -11872,8 +12351,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
@@ -5436,7 +5989,7 @@ Index: saga/configure
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -11905,7 +12378,7 @@
+@@ -11905,7 +12384,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.
@@ -5445,7 +5998,7 @@ Index: saga/configure
else
GXX=no
-@@ -12015,7 +12488,13 @@
+@@ -12015,7 +12494,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.
@@ -5460,7 +6013,7 @@ Index: saga/configure
/* end confdefs.h. */
int
-@@ -12028,26 +12507,33 @@
+@@ -12028,26 +12513,33 @@ main ()
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
@@ -5508,7 +6061,7 @@ Index: saga/configure
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -12056,7 +12542,13 @@
+@@ -12056,7 +12548,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.
@@ -5523,7 +6076,7 @@ Index: saga/configure
/* end confdefs.h. */
int
-@@ -12069,30 +12561,42 @@
+@@ -12069,30 +12567,42 @@ main ()
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
@@ -5581,7 +6134,7 @@ Index: saga/configure
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -12122,28 +12626,75 @@
+@@ -12122,28 +12632,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
cygwin* | mingw* | pw32* | cegcc*)
@@ -5679,7 +6232,7 @@ Index: saga/configure
darwin* | rhapsody*)
-@@ -12151,7 +12702,12 @@
+@@ -12151,7 +12708,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
@@ -5693,7 +6246,7 @@ Index: saga/configure
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -12159,7 +12715,7 @@
+@@ -12159,7 +12721,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
@@ -5702,7 +6255,7 @@ Index: saga/configure
archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -12193,7 +12749,7 @@
+@@ -12193,7 +12755,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
esac
;;
@@ -5711,7 +6264,7 @@ Index: saga/configure
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
-@@ -12212,6 +12768,11 @@
+@@ -12212,6 +12774,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
gnu*)
;;
@@ -5723,7 +6276,7 @@ Index: saga/configure
hpux9*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12236,11 +12797,11 @@
+@@ -12236,11 +12803,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.
@@ -5737,7 +6290,7 @@ Index: saga/configure
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12301,7 +12862,7 @@
+@@ -12301,7 +12868,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.
@@ -5746,7 +6299,7 @@ Index: saga/configure
;;
*)
if test "$GXX" = yes; then
-@@ -12311,10 +12872,10 @@
+@@ -12311,10 +12878,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*)
@@ -5759,7 +6312,7 @@ Index: saga/configure
;;
esac
fi
-@@ -12344,7 +12905,7 @@
+@@ -12344,7 +12911,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $cc_basename in
CC*)
# SGI C++
@@ -5768,7 +6321,7 @@ Index: saga/configure
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -12355,9 +12916,9 @@
+@@ -12355,9 +12922,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
@@ -5780,7 +6333,7 @@ Index: saga/configure
fi
fi
link_all_deplibs_CXX=yes
-@@ -12386,7 +12947,7 @@
+@@ -12386,7 +12953,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.
@@ -5789,7 +6342,7 @@ Index: saga/configure
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12423,26 +12984,26 @@
+@@ -12423,26 +12990,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -5822,7 +6375,7 @@ Index: saga/configure
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
-@@ -12450,7 +13011,7 @@
+@@ -12450,7 +13017,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'
@@ -5831,7 +6384,7 @@ Index: saga/configure
;;
cxx*)
# Compaq C++
-@@ -12469,9 +13030,9 @@
+@@ -12469,9 +13036,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.
@@ -5843,7 +6396,7 @@ Index: saga/configure
# IBM XL 8.0 on PPC, with GNU ld
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12491,13 +13052,13 @@
+@@ -12491,13 +13058,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'
@@ -5859,7 +6412,7 @@ Index: saga/configure
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -12566,7 +13127,7 @@
+@@ -12566,7 +13133,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
@@ -5868,7 +6421,7 @@ Index: saga/configure
else
ld_shlibs_CXX=no
fi
-@@ -12601,15 +13162,15 @@
+@@ -12601,15 +13168,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}\*'
@@ -5887,7 +6440,7 @@ Index: saga/configure
$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
-@@ -12625,17 +13186,17 @@
+@@ -12625,17 +13192,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.
@@ -5908,7 +6461,7 @@ Index: saga/configure
;;
esac
-@@ -12645,7 +13206,7 @@
+@@ -12645,7 +13212,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.
@@ -5917,7 +6470,7 @@ Index: saga/configure
else
# FIXME: insert proper C++ library support
-@@ -12681,7 +13242,7 @@
+@@ -12681,7 +13248,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
solaris*)
case $cc_basename in
@@ -5926,7 +6479,7 @@ Index: saga/configure
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
-@@ -12702,7 +13263,7 @@
+@@ -12702,7 +13269,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
esac
link_all_deplibs_CXX=yes
@@ -5935,7 +6488,7 @@ Index: saga/configure
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -12722,14 +13283,14 @@
+@@ -12722,14 +13289,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
@@ -5953,7 +6506,7 @@ Index: saga/configure
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -12740,7 +13301,7 @@
+@@ -12740,7 +13307,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.
@@ -5962,7 +6515,7 @@ Index: saga/configure
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -12794,6 +13355,10 @@
+@@ -12794,6 +13361,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'
@@ -5973,7 +6526,7 @@ Index: saga/configure
;;
*)
archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -12855,6 +13420,14 @@
+@@ -12855,6 +13426,14 @@ private:
};
_LT_EOF
@@ -5988,7 +6541,7 @@ Index: saga/configure
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -12868,7 +13441,7 @@
+@@ -12868,7 +13447,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
@@ -5997,7 +6550,7 @@ Index: saga/configure
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
-@@ -12877,13 +13450,22 @@
+@@ -12877,13 +13456,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
test $p = "-R"; then
prev=$p
continue
@@ -6024,7 +6577,7 @@ Index: saga/configure
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
-@@ -12903,8 +13485,10 @@
+@@ -12903,8 +13491,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
postdeps_CXX="${postdeps_CXX} ${prev}${p}"
fi
fi
@@ -6035,7 +6588,7 @@ Index: saga/configure
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
-@@ -12940,6 +13524,7 @@
+@@ -12940,6 +13530,7 @@ else
fi
$RM -f confest.$objext
@@ -6043,7 +6596,7 @@ Index: saga/configure
# PORTME: override above test on systems where it is broken
case $host_os in
-@@ -12975,7 +13560,7 @@
+@@ -12975,7 +13566,7 @@ linux*)
solaris*)
case $cc_basename in
@@ -6052,7 +6605,7 @@ Index: saga/configure
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -13040,8 +13625,6 @@
+@@ -13040,8 +13631,6 @@ fi
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -6061,7 +6614,7 @@ Index: saga/configure
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13091,6 +13674,11 @@
+@@ -13091,6 +13680,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=
;;
@@ -6073,7 +6626,7 @@ Index: saga/configure
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -13140,6 +13728,11 @@
+@@ -13140,6 +13734,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
esac
;;
@@ -6085,7 +6638,7 @@ Index: saga/configure
dgux*)
case $cc_basename in
ec++*)
-@@ -13229,8 +13822,8 @@
+@@ -13229,8 +13828,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
@@ -6096,7 +6649,7 @@ Index: saga/configure
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-qpic'
lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -13292,7 +13885,7 @@
+@@ -13292,7 +13891,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
solaris*)
case $cc_basename in
@@ -6105,7 +6658,7 @@ Index: saga/configure
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
-@@ -13357,10 +13950,17 @@
+@@ -13357,10 +13956,17 @@ case $host_os in
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -6126,7 +6679,7 @@ Index: saga/configure
#
# Check to make sure the PIC flag actually works.
-@@ -13368,7 +13968,7 @@
+@@ -13368,7 +13974,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; }
@@ -6135,7 +6688,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -13384,15 +13984,15 @@
+@@ -13384,15 +13990,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6154,7 +6707,7 @@ Index: saga/configure
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works_CXX=yes
-@@ -13418,13 +14018,15 @@
+@@ -13418,13 +14024,15 @@ fi
@@ -6171,7 +6724,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -13437,7 +14039,7 @@
+@@ -13437,7 +14045,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -6180,7 +6733,7 @@ Index: saga/configure
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works_CXX=yes
-@@ -13464,7 +14066,7 @@
+@@ -13464,7 +14072,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; }
@@ -6189,7 +6742,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -13483,16 +14085,16 @@
+@@ -13483,16 +14091,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6209,7 +6762,7 @@ Index: saga/configure
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
-@@ -13516,7 +14118,7 @@
+@@ -13516,7 +14124,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; }
@@ -6218,7 +6771,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -13535,16 +14137,16 @@
+@@ -13535,16 +14143,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6238,7 +6791,7 @@ Index: saga/configure
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
-@@ -13595,30 +14197,40 @@
+@@ -13595,30 +14203,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'
@@ -6287,7 +6840,7 @@ Index: saga/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
-@@ -13650,44 +14262,50 @@
+@@ -13650,44 +14268,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; }
@@ -6367,7 +6920,7 @@ Index: saga/configure
;;
esac
fi
-@@ -13755,8 +14373,6 @@
+@@ -13755,8 +14379,6 @@ esac
@@ -6376,7 +6929,7 @@ Index: saga/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-@@ -13782,7 +14398,7 @@
+@@ -13782,7 +14404,7 @@ need_version=unknown
case $host_os in
aix3*)
@@ -6385,7 +6938,7 @@ Index: saga/configure
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
-@@ -13791,7 +14407,7 @@
+@@ -13791,7 +14413,7 @@ aix3*)
;;
aix[4-9]*)
@@ -6394,7 +6947,7 @@ Index: saga/configure
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
-@@ -13844,7 +14460,7 @@
+@@ -13844,7 +14466,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6403,7 +6956,7 @@ Index: saga/configure
;;
esac
;;
-@@ -13856,7 +14472,7 @@
+@@ -13856,7 +14478,7 @@ beos*)
;;
bsdi[45]*)
@@ -6412,7 +6965,7 @@ Index: saga/configure
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 @@
+@@ -13875,8 +14497,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
@@ -6424,7 +6977,7 @@ Index: saga/configure
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -13897,36 +14514,82 @@
+@@ -13897,36 +14520,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}'
@@ -6521,7 +7074,7 @@ Index: saga/configure
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -13946,7 +14609,7 @@
+@@ -13946,7 +14615,7 @@ darwin* | rhapsody*)
;;
dgux*)
@@ -6530,7 +7083,7 @@ Index: saga/configure
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 @@
+@@ -13954,10 +14623,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -6541,7 +7094,7 @@ Index: saga/configure
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -13965,7 +14624,7 @@
+@@ -13965,7 +14630,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -6550,7 +7103,7 @@ Index: saga/configure
*) objformat=elf ;;
esac
fi
-@@ -13983,7 +14642,7 @@
+@@ -13983,7 +14648,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -6559,7 +7112,7 @@ Index: saga/configure
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -14003,12 +14662,26 @@
+@@ -14003,12 +14668,26 @@ freebsd* | dragonfly*)
;;
gnu*)
@@ -6587,7 +7140,7 @@ Index: saga/configure
hardcode_into_libs=yes
;;
-@@ -14054,12 +14727,14 @@
+@@ -14054,12 +14733,14 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -6604,7 +7157,7 @@ Index: saga/configure
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 @@
+@@ -14075,7 +14756,7 @@ irix5* | irix6* | nonstopux*)
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
@@ -6613,7 +7166,7 @@ Index: saga/configure
else
version_type=irix
fi ;;
-@@ -14112,9 +14787,9 @@
+@@ -14112,9 +14793,9 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
@@ -6625,7 +7178,7 @@ Index: saga/configure
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 @@
+@@ -14122,12 +14803,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -6648,7 +7201,7 @@ Index: saga/configure
/* end confdefs.h. */
int
-@@ -14140,13 +14820,17 @@
+@@ -14140,13 +14826,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 :
@@ -6669,7 +7222,7 @@ Index: saga/configure
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
-@@ -14155,7 +14839,7 @@
+@@ -14155,7 +14845,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
@@ -6678,7 +7231,7 @@ Index: saga/configure
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -14199,7 +14883,7 @@
+@@ -14199,7 +14889,7 @@ netbsd*)
;;
newsos6)
@@ -6687,7 +7240,7 @@ Index: saga/configure
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 @@
+@@ -14268,7 +14958,7 @@ rdos*)
;;
solaris*)
@@ -6696,7 +7249,7 @@ Index: saga/configure
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 @@
+@@ -14293,7 +14983,7 @@ sunos4*)
;;
sysv4 | sysv4.3*)
@@ -6705,7 +7258,7 @@ Index: saga/configure
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 @@
+@@ -14317,7 +15007,7 @@ sysv4 | sysv4.3*)
sysv4*MP*)
if test -d /usr/nec ;then
@@ -6714,7 +7267,7 @@ Index: saga/configure
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 @@
+@@ -14348,7 +15038,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
@@ -6723,7 +7276,7 @@ Index: saga/configure
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 @@
+@@ -14358,7 +15048,7 @@ tpf*)
;;
uts4*)
@@ -6732,7 +7285,7 @@ Index: saga/configure
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 @@
+@@ -14419,6 +15109,8 @@ fi
@@ -6741,7 +7294,7 @@ Index: saga/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
-@@ -14466,6 +15152,7 @@
+@@ -14466,6 +15158,7 @@ fi
fi # test -n "$compiler"
CC=$lt_save_CC
@@ -6749,7 +7302,7 @@ Index: saga/configure
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
-@@ -14494,6 +15181,8 @@
+@@ -14494,6 +15187,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6758,7 +7311,7 @@ Index: saga/configure
ac_config_commands="$ac_config_commands libtool"
-@@ -14506,7 +15195,7 @@
+@@ -14506,7 +15201,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; }
@@ -6767,7 +7320,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14540,13 +15229,13 @@
+@@ -14540,13 +15235,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; }
@@ -6783,7 +7336,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14580,7 +15269,7 @@
+@@ -14580,7 +15275,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; }
@@ -6792,7 +7345,7 @@ Index: saga/configure
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGEOTRANS 1
_ACEOF
-@@ -14591,7 +15280,7 @@
+@@ -14591,7 +15286,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; }
@@ -6801,7 +7354,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14625,13 +15314,13 @@
+@@ -14625,13 +15320,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; }
@@ -6817,7 +7370,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14665,13 +15354,13 @@
+@@ -14665,13 +15360,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; }
@@ -6833,7 +7386,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14705,13 +15394,13 @@
+@@ -14705,13 +15400,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; }
@@ -6849,7 +7402,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14745,13 +15434,13 @@
+@@ -14745,13 +15440,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; }
@@ -6865,7 +7418,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14785,7 +15474,7 @@
+@@ -14785,7 +15480,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; }
@@ -6874,7 +7427,7 @@ Index: saga/configure
ODBCFOUND=1
else
ODBC \(libodbc\) library not found
-@@ -14793,7 +15482,7 @@
+@@ -14793,7 +15488,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; }
@@ -6883,7 +7436,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14827,13 +15516,13 @@
+@@ -14827,13 +15522,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; }
@@ -6899,7 +7452,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14867,7 +15556,7 @@
+@@ -14867,7 +15562,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; }
@@ -6908,7 +7461,7 @@ Index: saga/configure
VIGRAFOUND=1
fi
-@@ -14875,7 +15564,7 @@
+@@ -14875,7 +15570,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; }
@@ -6917,7 +7470,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14989,8 +15678,7 @@
+@@ -14989,8 +15684,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"
@@ -6927,7 +7480,7 @@ Index: saga/configure
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -15002,7 +15690,7 @@
+@@ -15002,7 +15696,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"
@@ -6936,7 +7489,7 @@ Index: saga/configure
cat >>confdefs.h <<_ACEOF
#define HAVE_WCHAR_H 1
_ACEOF
-@@ -15016,7 +15704,7 @@
+@@ -15016,7 +15710,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; }
@@ -6945,7 +7498,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15048,7 +15736,7 @@
+@@ -15048,7 +15742,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];
@@ -6954,7 +7507,7 @@ Index: saga/configure
char f[(_Bool) 0.0 == false ? 1 : -1];
char g[true];
char h[sizeof (_Bool)];
-@@ -15059,25 +15747,6 @@
+@@ -15059,25 +15753,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];
@@ -6980,7 +7533,7 @@ Index: saga/configure
/* Catch a bug in an HP-UX C compiler. See
http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-@@ -15089,6 +15758,7 @@
+@@ -15089,6 +15764,7 @@ int
main ()
{
@@ -6988,7 +7541,7 @@ Index: saga/configure
*pq |= q;
*pq |= ! q;
/* Refer to every declared value, to avoid compiler optimizations. */
-@@ -15109,7 +15779,7 @@
+@@ -15109,7 +15785,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"
@@ -6997,7 +7550,7 @@ Index: saga/configure
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
-@@ -15126,7 +15796,7 @@
+@@ -15126,7 +15802,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; }
@@ -7006,7 +7559,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15206,7 +15876,7 @@
+@@ -15206,7 +15882,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
$as_echo_n "checking for inline... " >&6; }
@@ -7015,7 +7568,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
-@@ -15247,7 +15917,7 @@
+@@ -15247,7 +15923,7 @@ _ACEOF
esac
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
@@ -7024,7 +7577,7 @@ Index: saga/configure
else
-@@ -15259,7 +15929,7 @@
+@@ -15259,7 +15935,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; }
@@ -7033,7 +7586,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15297,7 +15967,7 @@
+@@ -15297,7 +15973,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"
@@ -7042,7 +7595,7 @@ Index: saga/configure
cat >>confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
-@@ -15308,7 +15978,7 @@
+@@ -15308,7 +15984,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; }
@@ -7051,7 +7604,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15363,7 +16033,7 @@
+@@ -15363,7 +16039,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
$as_echo_n "checking for working memcmp... " >&6; }
@@ -7060,7 +7613,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15426,7 +16096,7 @@
+@@ -15426,7 +16102,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"
@@ -7069,7 +7622,7 @@ Index: saga/configure
cat >>confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
-@@ -15437,7 +16107,7 @@
+@@ -15437,7 +16113,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; }
@@ -7078,7 +7631,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15492,7 +16162,7 @@
+@@ -15492,7 +16168,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; }
@@ -7087,7 +7640,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
rm -f conftest.sym conftest.file
-@@ -15554,7 +16224,7 @@
+@@ -15554,7 +16230,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; }
@@ -7096,7 +7649,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15600,7 +16270,7 @@
+@@ -15600,7 +16276,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
$as_echo_n "checking for working strtod... " >&6; }
@@ -7105,7 +7658,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15659,14 +16329,14 @@
+@@ -15659,14 +16335,14 @@ if test $ac_cv_func_strtod = no; then
esac
ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
@@ -7122,7 +7675,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -15700,7 +16370,7 @@
+@@ -15700,7 +16376,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; }
@@ -7131,7 +7684,7 @@ Index: saga/configure
POW_LIB=-lm
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
-@@ -15714,13 +16384,13 @@
+@@ -15714,13 +16390,13 @@ fi
for ac_func in vprintf
do :
ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
@@ -7147,7 +7700,7 @@ Index: saga/configure
$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-@@ -15734,8 +16404,7 @@
+@@ -15734,8 +16410,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"
@@ -7157,7 +7710,7 @@ Index: saga/configure
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15784,7 +16453,7 @@
+@@ -15784,7 +16459,7 @@ if test "${enable_debug+set}" = set; then :
enableval=$enable_debug; case "${enableval}" in
yes) debug=true ;;
no) debug=false ;;
@@ -7166,7 +7719,7 @@ Index: saga/configure
esac
else
debug=false
-@@ -15804,7 +16473,7 @@
+@@ -15804,7 +16479,7 @@ if test "${enable_unicode+set}" = set; then :
enableval=$enable_unicode; case "${enableval}" in
yes) unicode=true ;;
no) unicode=false ;;
@@ -7175,7 +7728,7 @@ Index: saga/configure
esac
else
unicode=false
-@@ -15824,7 +16493,7 @@
+@@ -15824,7 +16499,7 @@ if test "${enable_gui+set}" = set; then :
enableval=$enable_gui; case "${enableval}" in
yes) gui=true ;;
no) gui=false ;;
@@ -7184,7 +7737,7 @@ Index: saga/configure
esac
else
gui=true
-@@ -15855,7 +16524,7 @@
+@@ -15855,7 +16530,7 @@ if test "${enable_odbc+set}" = set; then :
enableval=$enable_odbc; case "${enableval}" in
yes) odbc=true ;;
no) odbc=false ;;
@@ -7193,7 +7746,7 @@ Index: saga/configure
esac
else
odbc=true
-@@ -15936,7 +16605,7 @@
+@@ -15936,7 +16611,7 @@ if test "${enable_python+set}" = set; then :
enableval=$enable_python; case "${enableval}" in
yes) python=true ;;
no) python=false ;;
@@ -7202,7 +7755,18 @@ Index: saga/configure
esac
else
python=false
-@@ -15963,7 +16632,7 @@
+@@ -15955,15 +16630,17 @@ if test x$python = xtrue; then
+
+
+
++
++
+ # Find any Python interpreter.
+ if test -z "$PYTHON"; then
+- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
++ for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -7211,7 +7775,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -16008,13 +16677,13 @@
+@@ -16008,13 +16685,13 @@ test -n "$PYTHON" || PYTHON=":"
if test "$PYTHON" = :; then
@@ -7227,7 +7791,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-@@ -16033,7 +16702,7 @@
+@@ -16033,7 +16710,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; }
@@ -7236,25 +7800,51 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
-@@ -16047,7 +16716,7 @@
+@@ -16045,9 +16722,9 @@ $as_echo "$am_cv_python_platform" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
++ { $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; }
-if test "${am_cv_python_pythondir+set}" = set; then :
+if ${am_cv_python_pythondir+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -16085,7 +16754,7 @@
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+@@ -16056,8 +16733,7 @@ else
+ else
+ am_py_prefix=$prefix
+ fi
+- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+@@ -16083,9 +16759,9 @@ $as_echo "$am_cv_python_pythondir" >&6; }
+ pkgpythondir=\${pythondir}/$PACKAGE
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
++ { $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; }
-if test "${am_cv_python_pyexecdir+set}" = set; then :
+if ${am_cv_python_pyexecdir+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -16135,7 +16804,7 @@
+@@ -16094,8 +16770,7 @@ else
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+@@ -16135,7 +16810,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; }
@@ -7263,7 +7853,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -16172,7 +16841,7 @@
+@@ -16172,7 +16847,7 @@ fi
if test -z "$PYTHON"; then
@@ -7272,7 +7862,7 @@ Index: saga/configure
PYTHON_VERSION=""
fi
-@@ -16190,7 +16859,7 @@
+@@ -16190,7 +16865,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;}
@@ -7281,7 +7871,7 @@ Index: saga/configure
This version of the AC_PYTHON_DEVEL macro
doesn't work properly with versions of Python before
2.1.0. You may need to re-run configure, setting the
-@@ -16199,7 +16868,7 @@
+@@ -16199,7 +16874,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.
@@ -7290,7 +7880,7 @@ Index: saga/configure
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5
$as_echo "skip at user request" >&6; }
-@@ -16224,7 +16893,7 @@
+@@ -16224,7 +16899,7 @@ $as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7299,7 +7889,7 @@ Index: saga/configure
If you have it installed, but it isn't the default Python
interpreter in your system path, please pass the PYTHON_VERSION
variable to configure. See \`\`configure --help'' for reference.
-@@ -16245,7 +16914,7 @@
+@@ -16245,7 +16920,7 @@ $as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7308,7 +7898,7 @@ Index: saga/configure
Please check your Python installation. The error was:
$ac_distutils_result" "$LINENO" 5
PYTHON_VERSION=""
-@@ -16350,7 +17019,7 @@
+@@ -16350,7 +17025,7 @@ EOD`
fi
if test -z "PYTHON_LDFLAGS"; then
@@ -7317,7 +7907,7 @@ Index: saga/configure
Cannot determine location of your Python DSO. Please check it was installed with
dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
" "$LINENO" 5
-@@ -16453,7 +17122,7 @@
+@@ -16453,7 +17128,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;}
@@ -7326,7 +7916,7 @@ Index: saga/configure
Could not link test program to Python. Maybe the main Python library has been
installed in some non-standard library path. If so, pass it to configure,
via the LDFLAGS environment variable.
-@@ -16464,7 +17133,7 @@
+@@ -16464,7 +17139,7 @@ as_fn_error "
for your distribution. The exact name of this package varies among them.
============================================================================
@@ -7335,7 +7925,7 @@ Index: saga/configure
PYTHON_VERSION=""
fi
-@@ -16478,7 +17147,7 @@
+@@ -16478,7 +17153,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; }
@@ -7344,7 +7934,7 @@ Index: saga/configure
$as_echo_n "(cached) " >&6
else
case $SWIG in
-@@ -16601,7 +17270,7 @@
+@@ -16601,7 +17276,7 @@ $as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
fi
#AC_CONFIG_FILES([Makefile])
@@ -7353,7 +7943,7 @@ Index: saga/configure
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -16667,10 +17336,21 @@
+@@ -16667,10 +17342,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
@@ -7377,7 +7967,7 @@ Index: saga/configure
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-@@ -16686,6 +17366,7 @@
+@@ -16686,6 +17372,7 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
@@ -7385,7 +7975,7 @@ Index: saga/configure
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -16709,59 +17390,55 @@
+@@ -16709,59 +17396,55 @@ else
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -7458,7 +8048,7 @@ Index: saga/configure
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-@@ -16862,6 +17539,7 @@
+@@ -16862,6 +17545,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -7466,7 +8056,7 @@ Index: saga/configure
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -16907,19 +17585,19 @@
+@@ -16907,19 +17591,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -7494,7 +8084,7 @@ Index: saga/configure
as_fn_exit $as_status
} # as_fn_error
-@@ -17115,7 +17793,7 @@
+@@ -17115,7 +17799,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -7503,7 +8093,7 @@ Index: saga/configure
} # as_fn_mkdir_p
-@@ -17169,7 +17847,7 @@
+@@ -17169,7 +17853,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.8, which was
@@ -7512,7 +8102,7 @@ Index: saga/configure
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17235,10 +17913,10 @@
+@@ -17235,10 +17919,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.8
@@ -7525,7 +8115,7 @@ Index: saga/configure
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -17256,11 +17934,16 @@
+@@ -17256,11 +17940,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
@@ -7543,7 +8133,7 @@ Index: saga/configure
*)
ac_option=$1
ac_optarg=$2
-@@ -17282,6 +17965,7 @@
+@@ -17282,6 +17971,7 @@ do
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -7551,7 +8141,7 @@ Index: saga/configure
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
-@@ -17294,7 +17978,7 @@
+@@ -17294,7 +17984,7 @@ do
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
@@ -7560,7 +8150,7 @@ Index: saga/configure
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-@@ -17303,7 +17987,7 @@
+@@ -17303,7 +17993,7 @@ Try \`$0 --help' for more information.";;
ac_cs_silent=: ;;
# This is an error.
@@ -7569,7 +8159,7 @@ Index: saga/configure
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
-@@ -17357,184 +18041,208 @@
+@@ -17357,184 +18047,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'
@@ -7950,7 +8540,7 @@ Index: saga/configure
GREP \
EGREP \
FGREP \
-@@ -17547,8 +18255,13 @@
+@@ -17547,8 +18261,13 @@ reload_flag \
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
@@ -7964,7 +8554,7 @@ Index: saga/configure
STRIP \
RANLIB \
CC \
-@@ -17558,14 +18271,14 @@
+@@ -17558,14 +18277,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 \
@@ -7982,7 +8572,7 @@ Index: saga/configure
DSYMUTIL \
NMEDIT \
LIPO \
-@@ -17579,9 +18292,7 @@
+@@ -17579,9 +18298,7 @@ with_gnu_ld \
allow_undefined_flag \
no_undefined_flag \
hardcode_libdir_flag_spec \
@@ -7992,7 +8582,7 @@ Index: saga/configure
exclude_expsyms \
include_expsyms \
file_list_spec \
-@@ -17589,6 +18300,7 @@
+@@ -17589,6 +18306,7 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
@@ -8000,7 +8590,7 @@ Index: saga/configure
finish_eval \
old_striplib \
striplib \
-@@ -17599,10 +18311,11 @@
+@@ -17599,10 +18317,11 @@ predeps \
postdeps \
compiler_lib_search_path \
LD_CXX \
@@ -8013,7 +8603,7 @@ Index: saga/configure
lt_prog_compiler_static_CXX \
lt_cv_prog_compiler_c_o_CXX \
export_dynamic_flag_spec_CXX \
-@@ -17612,9 +18325,7 @@
+@@ -17612,9 +18331,7 @@ with_gnu_ld_CXX \
allow_undefined_flag_CXX \
no_undefined_flag_CXX \
hardcode_libdir_flag_spec_CXX \
@@ -8023,7 +8613,7 @@ Index: saga/configure
exclude_expsyms_CXX \
include_expsyms_CXX \
file_list_spec_CXX \
-@@ -17624,9 +18335,9 @@
+@@ -17624,9 +18341,9 @@ postdep_objects_CXX \
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
@@ -8035,7 +8625,7 @@ Index: saga/configure
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17648,11 +18359,13 @@
+@@ -17648,11 +18365,13 @@ module_cmds \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
@@ -8049,7 +8639,7 @@ Index: saga/configure
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
-@@ -17661,10 +18374,11 @@
+@@ -17661,10 +18380,11 @@ archive_expsym_cmds_CXX \
module_cmds_CXX \
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
@@ -8064,7 +8654,7 @@ Index: saga/configure
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17672,12 +18386,6 @@
+@@ -17672,12 +18392,6 @@ prelink_cmds_CXX; do
esac
done
@@ -8077,7 +8667,7 @@ Index: saga/configure
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -17812,8 +18520,6 @@
+@@ -17812,8 +18526,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" ;;
@@ -8086,7 +8676,7 @@ Index: saga/configure
"src/modules_terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/Makefile" ;;
"src/modules_terrain_analysis/terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/Makefile" ;;
"src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile" ;;
-@@ -17824,7 +18530,7 @@
+@@ -17824,7 +18536,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" ;;
@@ -8095,7 +8685,7 @@ Index: saga/configure
esac
done
-@@ -17847,9 +18553,10 @@
+@@ -17847,9 +18559,10 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
@@ -8108,7 +8698,7 @@ Index: saga/configure
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
-@@ -17857,12 +18564,13 @@
+@@ -17857,12 +18570,13 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
@@ -8124,7 +8714,7 @@ Index: saga/configure
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -17879,12 +18587,12 @@
+@@ -17879,12 +18593,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
@@ -8139,7 +8729,7 @@ Index: saga/configure
_ACEOF
-@@ -17893,18 +18601,18 @@
+@@ -17893,18 +18607,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -8162,7 +8752,7 @@ Index: saga/configure
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -17912,7 +18620,7 @@
+@@ -17912,7 +18626,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -8171,7 +8761,7 @@ Index: saga/configure
_ACEOF
sed -n '
h
-@@ -17960,7 +18668,7 @@
+@@ -17960,7 +18674,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
@@ -8180,7 +8770,7 @@ Index: saga/configure
for (key in S) S_is_set[key] = 1
FS = ""
-@@ -17992,21 +18700,29 @@
+@@ -17992,21 +18706,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
@@ -8219,7 +8809,7 @@ Index: saga/configure
s/^[^=]*=[ ]*$//
}'
fi
-@@ -18018,7 +18734,7 @@
+@@ -18018,7 +18740,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
@@ -8228,7 +8818,7 @@ Index: saga/configure
BEGIN {
_ACEOF
-@@ -18030,11 +18746,11 @@
+@@ -18030,11 +18752,11 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
@@ -8243,7 +8833,7 @@ Index: saga/configure
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -18119,7 +18835,7 @@
+@@ -18119,7 +18841,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -8252,7 +8842,7 @@ Index: saga/configure
fi # test -n "$CONFIG_HEADERS"
-@@ -18132,7 +18848,7 @@
+@@ -18132,7 +18854,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -8261,7 +8851,7 @@ Index: saga/configure
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -18151,7 +18867,7 @@
+@@ -18151,7 +18873,7 @@ do
for ac_f
do
case $ac_f in
@@ -8270,7 +8860,7 @@ Index: saga/configure
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
-@@ -18160,7 +18876,7 @@
+@@ -18160,7 +18882,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -8279,7 +8869,7 @@ Index: saga/configure
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -18186,8 +18902,8 @@
+@@ -18186,8 +18908,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
@@ -8290,7 +8880,7 @@ Index: saga/configure
esac
;;
esac
-@@ -18323,23 +19039,24 @@
+@@ -18323,23 +19045,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
@@ -8325,7 +8915,7 @@ Index: saga/configure
;;
:H)
#
-@@ -18348,21 +19065,21 @@
+@@ -18348,21 +19071,21 @@ which seems to be undefined. Please make sure it is defined." >&2;}
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
@@ -8355,7 +8945,7 @@ Index: saga/configure
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -18523,7 +19240,8 @@
+@@ -18523,7 +19246,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,
@@ -8365,7 +8955,7 @@ Index: saga/configure
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -18571,6 +19289,15 @@
+@@ -18571,6 +19295,15 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -8381,7 +8971,7 @@ Index: saga/configure
# The host system.
host_alias=$host_alias
host=$host
-@@ -18620,9 +19347,11 @@
+@@ -18620,9 +19353,11 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -8396,7 +8986,7 @@ Index: saga/configure
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
-@@ -18630,13 +19359,30 @@
+@@ -18630,13 +19365,30 @@ OBJDUMP=$lt_OBJDUMP
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -8428,7 +9018,7 @@ Index: saga/configure
# A symbol stripping program.
STRIP=$lt_STRIP
-@@ -18645,6 +19391,9 @@
+@@ -18645,6 +19397,9 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -8438,7 +9028,7 @@ Index: saga/configure
# A C compiler.
LTCC=$lt_CC
-@@ -18663,14 +19412,14 @@
+@@ -18663,14 +19418,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
@@ -8459,7 +9049,7 @@ Index: saga/configure
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -18678,6 +19427,9 @@
+@@ -18678,6 +19433,9 @@ MAGIC_CMD=$MAGIC_CMD
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
@@ -8469,7 +9059,7 @@ Index: saga/configure
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
-@@ -18734,6 +19486,9 @@
+@@ -18734,6 +19492,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
@@ -8479,7 +9069,7 @@ Index: saga/configure
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -18773,6 +19528,10 @@
+@@ -18773,6 +19534,10 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
@@ -8490,7 +9080,7 @@ Index: saga/configure
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -18785,12 +19544,12 @@
+@@ -18785,12 +19550,12 @@ with_gcc=$GCC
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
@@ -8506,7 +9096,7 @@ Index: saga/configure
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
-@@ -18840,10 +19599,6 @@
+@@ -18840,10 +19605,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
@@ -8517,7 +9107,7 @@ Index: saga/configure
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
-@@ -18877,9 +19632,6 @@
+@@ -18877,9 +19638,6 @@ inherit_rpath=$inherit_rpath
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
@@ -8527,7 +9117,7 @@ Index: saga/configure
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -18895,6 +19647,9 @@
+@@ -18895,6 +19653,9 @@ include_expsyms=$lt_include_expsyms
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
@@ -8537,7 +9127,7 @@ Index: saga/configure
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
-@@ -18941,212 +19696,169 @@
+@@ -18941,212 +19702,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?
@@ -8741,9 +9331,15 @@ Index: saga/configure
-_LT_EOF
- ;;
- esac
+-
+-
+- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+- || (rm -f "$cfgfile"; exit 1)
+-
+- mv -f "$cfgfile" "$ofile" ||
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
-
++
+ if test x"$xsi_shell" = xyes; then
+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
@@ -8901,16 +9497,13 @@ Index: saga/configure
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
-
-- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-- || (rm -f "$cfgfile"; exit 1)
-
-- mv -f "$cfgfile" "$ofile" ||
++
++
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
-@@ -19158,6 +19870,10 @@
+@@ -19158,6 +19876,10 @@ _LT_EOF
# The linker used to build libraries.
LD=$lt_LD_CXX
@@ -8921,7 +9514,7 @@ Index: saga/configure
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
-@@ -19170,12 +19886,12 @@
+@@ -19170,12 +19892,12 @@ with_gcc=$GCC_CXX
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
@@ -8937,7 +9530,7 @@ Index: saga/configure
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static_CXX
-@@ -19225,10 +19941,6 @@
+@@ -19225,10 +19947,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
@@ -8948,7 +9541,7 @@ Index: saga/configure
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-@@ -19262,9 +19974,6 @@
+@@ -19262,9 +19980,6 @@ inherit_rpath=$inherit_rpath_CXX
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs_CXX
@@ -8958,7 +9551,7 @@ Index: saga/configure
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -19280,6 +19989,9 @@
+@@ -19280,6 +19995,9 @@ include_expsyms=$lt_include_expsyms_CXX
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds_CXX
@@ -8968,7 +9561,7 @@ Index: saga/configure
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec_CXX
-@@ -19314,7 +20026,7 @@
+@@ -19314,7 +20032,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
@@ -8977,7 +9570,7 @@ Index: saga/configure
# configure is writing to config.log, and then calls config.status.
-@@ -19335,7 +20047,7 @@
+@@ -19335,7 +20053,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.
@@ -8986,10 +9579,12 @@ Index: saga/configure
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-Index: saga/ltmain.sh
-===================================================================
---- saga.orig/ltmain.sh 2012-01-09 14:09:39.000000000 +0100
-+++ saga/ltmain.sh 2012-01-09 14:10:07.000000000 +0100
+diff --git a/ltmain.sh b/ltmain.sh
+old mode 100755
+new mode 100644
+index 7ed280b..c7d06c3
+--- a/ltmain.sh
++++ b/ltmain.sh
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
@@ -9091,7 +9686,7 @@ Index: saga/ltmain.sh
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -91,10 +98,15 @@
+@@ -91,10 +98,15 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
@@ -9110,7 +9705,7 @@ Index: saga/ltmain.sh
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -107,24 +119,28 @@
+@@ -107,24 +119,28 @@ do
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
@@ -9145,7 +9740,7 @@ Index: saga/ltmain.sh
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
-@@ -144,6 +160,27 @@
+@@ -144,6 +160,27 @@ IFS=" $lt_nl"
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
@@ -9173,7 +9768,7 @@ Index: saga/ltmain.sh
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
-@@ -158,33 +195,183 @@
+@@ -158,33 +195,183 @@ basename="s,^.*/,,"
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
@@ -9377,7 +9972,7 @@ Index: saga/ltmain.sh
# Make sure we have an absolute path for reexecution:
case $progpath in
-@@ -196,7 +383,7 @@
+@@ -196,7 +383,7 @@ case $progpath in
;;
*)
save_IFS="$IFS"
@@ -9386,7 +9981,7 @@ Index: saga/ltmain.sh
for progdir in $PATH; do
IFS="$save_IFS"
test -x "$progdir/$progname" && break
-@@ -215,6 +402,15 @@
+@@ -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'
@@ -9402,7 +9997,7 @@ Index: saga/ltmain.sh
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
-@@ -243,7 +439,7 @@
+@@ -243,7 +439,7 @@ opt_warning=:
# name if it has been set yet.
func_echo ()
{
@@ -9411,7 +10006,7 @@ Index: saga/ltmain.sh
}
# func_verbose arg...
-@@ -258,18 +454,25 @@
+@@ -258,18 +454,25 @@ func_verbose ()
:
}
@@ -9439,7 +10034,7 @@ Index: saga/ltmain.sh
# bash bug again:
:
-@@ -326,9 +529,9 @@
+@@ -326,9 +529,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
@@ -9451,7 +10046,7 @@ Index: saga/ltmain.sh
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
-@@ -378,7 +581,7 @@
+@@ -378,7 +581,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
@@ -9460,7 +10055,7 @@ Index: saga/ltmain.sh
}
-@@ -392,7 +595,7 @@
+@@ -392,7 +595,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
@@ -9469,7 +10064,7 @@ Index: saga/ltmain.sh
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
-@@ -419,7 +622,7 @@
+@@ -419,7 +622,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
@@ -9478,7 +10073,7 @@ Index: saga/ltmain.sh
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
-@@ -488,15 +691,39 @@
+@@ -488,15 +691,39 @@ func_show_eval_locale ()
fi
}
@@ -9521,7 +10116,7 @@ Index: saga/ltmain.sh
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -509,22 +736,28 @@
+@@ -509,22 +736,28 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
@@ -9554,7 +10149,7 @@ Index: saga/ltmain.sh
s/^# //
s/^# *$//
s*\$progname*'$progname'*
-@@ -534,11 +767,18 @@
+@@ -534,11 +767,18 @@ func_help ()
s*\$LTCFLAGS*'"$LTCFLAGS"'*
s*\$LD*'"$LD"'*
s/\$with_gnu_ld/'"$with_gnu_ld"'/
@@ -9577,7 +10172,7 @@ Index: saga/ltmain.sh
}
# func_missing_arg argname
-@@ -546,63 +786,106 @@
+@@ -546,63 +786,106 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
@@ -9597,7 +10192,7 @@ Index: saga/ltmain.sh
+{
+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-+
+
+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
@@ -9614,7 +10209,7 @@ Index: saga/ltmain.sh
+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
-
++
+exit_cmd=:
@@ -9715,7 +10310,7 @@ Index: saga/ltmain.sh
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
-@@ -636,16 +919,16 @@
+@@ -636,16 +919,16 @@ func_config ()
# Display the features supported by this script.
func_features ()
{
@@ -9737,7 +10332,7 @@ Index: saga/ltmain.sh
fi
exit $?
-@@ -692,117 +975,209 @@
+@@ -692,117 +975,209 @@ func_enable_tag ()
esac
}
@@ -9773,31 +10368,7 @@ Index: saga/ltmain.sh
+$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
+}
@@ -9827,9 +10398,7 @@ Index: saga/ltmain.sh
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+esac
-
-- # Parse non-mode specific arguments:
-- while test "$#" -gt 0; do
++
+
+
+# Option defaults:
@@ -9846,8 +10415,34 @@ Index: saga/ltmain.sh
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
-+
-+
+
+- # Shorthand for --mode=foo, only valid as the first argument
+- case $1 in
+- clean|clea|cle|cl)
+- shift; set dummy --mode clean ${1+"$@"}; shift
+- ;;
+- compile|compil|compi|comp|com|co|c)
+- shift; set dummy --mode compile ${1+"$@"}; shift
+- ;;
+- execute|execut|execu|exec|exe|ex|e)
+- shift; set dummy --mode execute ${1+"$@"}; shift
+- ;;
+- finish|finis|fini|fin|fi|f)
+- shift; set dummy --mode finish ${1+"$@"}; shift
+- ;;
+- install|instal|insta|inst|ins|in|i)
+- shift; set dummy --mode install ${1+"$@"}; shift
+- ;;
+- link|lin|li|l)
+- shift; set dummy --mode link ${1+"$@"}; shift
+- ;;
+- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+- shift; set dummy --mode uninstall ${1+"$@"}; shift
+- ;;
+- esac
+
+- # Parse non-mode specific arguments:
+- while test "$#" -gt 0; do
+# Parse options once, thoroughly. This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
@@ -10031,7 +10626,7 @@ Index: saga/ltmain.sh
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
-@@ -810,82 +1185,44 @@
+@@ -810,82 +1185,44 @@ func_enable_tag ()
opt_duplicate_compiler_generated_deps=:
;;
*)
@@ -10085,9 +10680,7 @@ Index: saga/ltmain.sh
- fi
-}
-
-+ # Darwin sucks
-+ eval std_shrext=\"$shrext_cmds\"
-
+-
-## ----------- ##
-## Main. ##
-## ----------- ##
@@ -10095,7 +10688,9 @@ Index: saga/ltmain.sh
-$opt_help || {
- # Sanity checks first:
- func_check_version_match
--
++ # Darwin sucks
++ eval std_shrext=\"$shrext_cmds\"
+
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
- fi
@@ -10138,7 +10733,7 @@ Index: saga/ltmain.sh
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
-@@ -950,12 +1287,9 @@
+@@ -950,12 +1287,9 @@ func_ltwrapper_executable_p ()
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
@@ -10154,7 +10749,7 @@ Index: saga/ltmain.sh
}
# func_ltwrapper_p file
-@@ -1001,6 +1335,37 @@
+@@ -1001,6 +1335,37 @@ func_source ()
}
@@ -10192,7 +10787,7 @@ Index: saga/ltmain.sh
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
-@@ -1013,13 +1378,15 @@
+@@ -1013,13 +1378,15 @@ func_infer_tag ()
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -10211,7 +10806,7 @@ Index: saga/ltmain.sh
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
-@@ -1030,11 +1397,13 @@
+@@ -1030,11 +1397,13 @@ func_infer_tag ()
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -10228,7 +10823,7 @@ Index: saga/ltmain.sh
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
-@@ -1097,6 +1466,486 @@
+@@ -1097,6 +1466,486 @@ EOF
}
}
@@ -10715,7 +11310,7 @@ Index: saga/ltmain.sh
# func_mode_compile arg...
func_mode_compile ()
{
-@@ -1137,12 +1986,12 @@
+@@ -1137,12 +1986,12 @@ func_mode_compile ()
;;
-pie | -fpie | -fPIE)
@@ -10730,7 +11325,7 @@ Index: saga/ltmain.sh
continue
;;
-@@ -1163,15 +2012,14 @@
+@@ -1163,15 +2012,14 @@ func_mode_compile ()
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
@@ -10748,7 +11343,7 @@ Index: saga/ltmain.sh
continue
;;
-@@ -1187,8 +2035,7 @@
+@@ -1187,8 +2035,7 @@ func_mode_compile ()
esac # case $arg_mode
# Aesthetically quote the previous argument.
@@ -10758,7 +11353,7 @@ Index: saga/ltmain.sh
done # for arg
case $arg_mode in
-@@ -1213,7 +2060,7 @@
+@@ -1213,7 +2060,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
@@ -10767,7 +11362,7 @@ Index: saga/ltmain.sh
func_xform "$libobj"
libobj=$func_xform_result
;;
-@@ -1288,7 +2135,7 @@
+@@ -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
@@ -10776,7 +11371,7 @@ Index: saga/ltmain.sh
lockfile="$output_obj.lock"
else
output_obj=
-@@ -1319,17 +2166,16 @@
+@@ -1319,17 +2166,16 @@ compiler."
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
@@ -10798,7 +11393,7 @@ Index: saga/ltmain.sh
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
-@@ -1349,7 +2195,7 @@
+@@ -1349,7 +2195,7 @@ compiler."
if test -z "$output_obj"; then
# Place PIC objects in $objdir
@@ -10807,7 +11402,7 @@ Index: saga/ltmain.sh
fi
func_show_eval_locale "$command" \
-@@ -1396,11 +2242,11 @@
+@@ -1396,11 +2242,11 @@ compiler."
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
@@ -10821,7 +11416,7 @@ Index: saga/ltmain.sh
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-@@ -1445,13 +2291,13 @@
+@@ -1445,13 +2291,13 @@ compiler."
}
$opt_help || {
@@ -10837,7 +11432,7 @@ Index: saga/ltmain.sh
"")
# Generic help is extracted from the usage comments
# at the start of this file.
-@@ -1482,10 +2328,11 @@
+@@ -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
@@ -10851,7 +11446,7 @@ Index: saga/ltmain.sh
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
-@@ -1538,7 +2385,7 @@
+@@ -1538,7 +2385,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -10860,7 +11455,7 @@ Index: saga/ltmain.sh
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
-@@ -1558,6 +2405,8 @@
+@@ -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
@@ -10869,7 +11464,7 @@ Index: saga/ltmain.sh
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-@@ -1586,6 +2435,11 @@
+@@ -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
@@ -10881,7 +11476,7 @@ Index: saga/ltmain.sh
All other options (arguments beginning with \`-') are ignored.
-@@ -1619,18 +2473,44 @@
+@@ -1619,18 +2473,44 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
@@ -10932,7 +11527,7 @@ Index: saga/ltmain.sh
# func_mode_execute arg...
-@@ -1643,13 +2523,16 @@
+@@ -1643,13 +2523,16 @@ func_mode_execute ()
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
@@ -10950,7 +11545,7 @@ Index: saga/ltmain.sh
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
-@@ -1671,7 +2554,7 @@
+@@ -1671,7 +2554,7 @@ func_mode_execute ()
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
@@ -10959,7 +11554,7 @@ Index: saga/ltmain.sh
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-@@ -1712,7 +2595,7 @@
+@@ -1712,7 +2595,7 @@ func_mode_execute ()
for file
do
case $file in
@@ -10968,7 +11563,7 @@ Index: saga/ltmain.sh
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
-@@ -1728,8 +2611,7 @@
+@@ -1728,8 +2611,7 @@ func_mode_execute ()
;;
esac
# Quote arguments (to preserve shell metacharacters).
@@ -10978,7 +11573,7 @@ Index: saga/ltmain.sh
done
if test "X$opt_dry_run" = Xfalse; then
-@@ -1754,29 +2636,66 @@
+@@ -1754,29 +2636,66 @@ func_mode_execute ()
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
@@ -10992,16 +11587,22 @@ Index: saga/ltmain.sh
-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
@@ -11018,7 +11619,7 @@ Index: saga/ltmain.sh
+ 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"`
@@ -11026,13 +11627,7 @@ Index: saga/ltmain.sh
+ 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
@@ -11049,16 +11644,11 @@ Index: saga/ltmain.sh
+ 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 +2705,7 @@
+@@ -1786,7 +2705,7 @@ func_mode_finish ()
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
@@ -11067,7 +11657,7 @@ Index: saga/ltmain.sh
$cmds"
fi
done
-@@ -1795,53 +2714,55 @@
+@@ -1795,53 +2714,55 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
@@ -11165,7 +11755,7 @@ Index: saga/ltmain.sh
# func_mode_install arg...
-@@ -1852,7 +2773,7 @@
+@@ -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.
@@ -11174,7 +11764,7 @@ Index: saga/ltmain.sh
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
-@@ -1866,7 +2787,12 @@
+@@ -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"
@@ -11188,7 +11778,7 @@ Index: saga/ltmain.sh
# We need to accept at least all the BSD install flags.
dest=
-@@ -1876,10 +2802,12 @@
+@@ -1876,10 +2802,12 @@ func_mode_install ()
install_type=
isdir=no
stripme=
@@ -11202,7 +11792,7 @@ Index: saga/ltmain.sh
dest=$arg
continue
fi
-@@ -1887,10 +2815,9 @@
+@@ -1887,10 +2815,9 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
@@ -11216,7 +11806,7 @@ Index: saga/ltmain.sh
;;
-g | -m | -o)
prev=$arg
-@@ -1904,6 +2831,10 @@
+@@ -1904,6 +2831,10 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
@@ -11227,7 +11817,7 @@ Index: saga/ltmain.sh
prev=
else
dest=$arg
-@@ -1914,7 +2845,11 @@
+@@ -1914,7 +2845,11 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
@@ -11240,7 +11830,7 @@ Index: saga/ltmain.sh
done
test -z "$install_prog" && \
-@@ -1923,6 +2858,13 @@
+@@ -1923,6 +2858,13 @@ func_mode_install ()
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
@@ -11254,7 +11844,7 @@ Index: saga/ltmain.sh
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
-@@ -1977,10 +2919,13 @@
+@@ -1977,10 +2919,13 @@ func_mode_install ()
case $file in
*.$libext)
# Do the static libraries later.
@@ -11269,7 +11859,7 @@ Index: saga/ltmain.sh
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
-@@ -1994,23 +2939,23 @@
+@@ -1994,23 +2939,23 @@ func_mode_install ()
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
@@ -11297,7 +11887,7 @@ Index: saga/ltmain.sh
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
-@@ -2023,9 +2968,9 @@
+@@ -2023,9 +2968,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -11309,7 +11899,7 @@ Index: saga/ltmain.sh
fi
func_warning "relinking \`$file'"
-@@ -2043,7 +2988,7 @@
+@@ -2043,7 +2988,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
@@ -11318,7 +11908,7 @@ Index: saga/ltmain.sh
'exit $?'
tstripme="$stripme"
case $host_os in
-@@ -2083,7 +3028,7 @@
+@@ -2083,7 +3028,7 @@ func_mode_install ()
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -11327,7 +11917,7 @@ Index: saga/ltmain.sh
;;
*.lo)
-@@ -2183,7 +3128,7 @@
+@@ -2183,7 +3128,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
@@ -11336,7 +11926,7 @@ Index: saga/ltmain.sh
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
-@@ -2202,7 +3147,7 @@
+@@ -2202,7 +3147,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -11345,7 +11935,7 @@ Index: saga/ltmain.sh
$opt_silent || {
func_quote_for_expand "$relink_command"
-@@ -2221,7 +3166,7 @@
+@@ -2221,7 +3166,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
@@ -11354,7 +11944,7 @@ Index: saga/ltmain.sh
fi
fi
-@@ -2257,11 +3202,13 @@
+@@ -2257,11 +3202,13 @@ func_mode_install ()
# Set up the ranlib parameters.
oldlib="$destdir/$name"
@@ -11369,7 +11959,7 @@ Index: saga/ltmain.sh
fi
# Do each command in the postinstall commands.
-@@ -2280,7 +3227,7 @@
+@@ -2280,7 +3227,7 @@ func_mode_install ()
fi
}
@@ -11378,7 +11968,7 @@ Index: saga/ltmain.sh
# func_generate_dlsyms outputname originator pic_p
-@@ -2323,6 +3270,22 @@
+@@ -2323,6 +3270,22 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
@@ -11401,7 +11991,7 @@ Index: saga/ltmain.sh
/* External symbol declarations for the compiler. */\
"
-@@ -2332,10 +3295,11 @@
+@@ -2332,10 +3295,11 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
@@ -11416,7 +12006,7 @@ Index: saga/ltmain.sh
done
if test -n "$exclude_expsyms"; then
-@@ -2371,7 +3335,7 @@
+@@ -2371,7 +3335,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -11425,7 +12015,7 @@ Index: saga/ltmain.sh
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
-@@ -2384,10 +3348,52 @@
+@@ -2384,10 +3348,52 @@ extern \"C\" {
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
@@ -11482,7 +12072,7 @@ Index: saga/ltmain.sh
done
$opt_dry_run || {
-@@ -2415,36 +3421,19 @@
+@@ -2415,36 +3421,19 @@ extern \"C\" {
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
@@ -11523,7 +12113,7 @@ Index: saga/ltmain.sh
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
-@@ -2457,7 +3446,7 @@
+@@ -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
@@ -11532,7 +12122,7 @@ Index: saga/ltmain.sh
{0, (void *) 0}
};
-@@ -2484,7 +3473,7 @@
+@@ -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.
@@ -11541,7 +12131,7 @@ Index: saga/ltmain.sh
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
-@@ -2500,7 +3489,7 @@
+@@ -2500,7 +3489,7 @@ static const void *lt_preloaded_setup() {
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
@@ -11550,7 +12140,7 @@ Index: saga/ltmain.sh
esac
done
-@@ -2515,16 +3504,16 @@
+@@ -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
@@ -11573,7 +12163,7 @@ Index: saga/ltmain.sh
;;
esac
;;
-@@ -2538,8 +3527,8 @@
+@@ -2538,8 +3527,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
@@ -11584,7 +12174,7 @@ Index: saga/ltmain.sh
fi
}
-@@ -2549,6 +3538,7 @@
+@@ -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.
@@ -11592,7 +12182,7 @@ Index: saga/ltmain.sh
func_win32_libid ()
{
$opt_debug
-@@ -2559,9 +3549,11 @@
+@@ -2559,9 +3549,11 @@ func_win32_libid ()
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
@@ -11606,7 +12196,7 @@ Index: saga/ltmain.sh
$SED -n -e '
1,100{
/ I /{
-@@ -2590,6 +3582,131 @@
+@@ -2590,6 +3582,131 @@ func_win32_libid ()
$ECHO "$win32_libid_type"
}
@@ -11738,7 +12328,7 @@ Index: saga/ltmain.sh
# func_extract_an_archive dir oldlib
-@@ -2598,7 +3715,18 @@
+@@ -2598,7 +3715,18 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
@@ -11758,7 +12348,7 @@ Index: saga/ltmain.sh
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
-@@ -2669,7 +3797,7 @@
+@@ -2669,7 +3797,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -11767,7 +12357,7 @@ Index: saga/ltmain.sh
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
-@@ -2684,25 +3812,30 @@
+@@ -2684,25 +3812,30 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
@@ -11782,35 +12372,34 @@ Index: saga/ltmain.sh
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [arg=no]
- #
--# Emit the first part of a libtool wrapper script on stdout.
--# For more information, see the description associated with
--# func_emit_wrapper(), below.
--func_emit_wrapper_part1 ()
--{
-- func_emit_wrapper_part1_arg1=no
-- if test -n "$1" ; then
-- func_emit_wrapper_part1_arg1=$1
-- fi
++#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
-+#
+ #
+-# Emit the first part of a libtool wrapper script on stdout.
+-# For more information, see the description associated with
+-# func_emit_wrapper(), below.
+-func_emit_wrapper_part1 ()
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take. If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
-+{
+ {
+- func_emit_wrapper_part1_arg1=no
+- if test -n "$1" ; then
+- func_emit_wrapper_part1_arg1=$1
+- fi
+ func_emit_wrapper_arg1=${1-no}
$ECHO "\
#! $SHELL
-@@ -2718,7 +3851,6 @@
+@@ -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.
@@ -11818,7 +12407,7 @@ Index: saga/ltmain.sh
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
-@@ -2749,31 +3881,135 @@
+@@ -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
@@ -11972,7 +12561,7 @@ Index: saga/ltmain.sh
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
-@@ -2783,30 +4019,13 @@
+@@ -2783,30 +4019,13 @@ else
esac
fi
@@ -12006,7 +12595,7 @@ Index: saga/ltmain.sh
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
-@@ -2814,7 +4033,7 @@
+@@ -2814,7 +4033,7 @@ func_emit_wrapper_part2 ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
@@ -12015,7 +12604,7 @@ Index: saga/ltmain.sh
$objdir ) thisdir=. ;;
esac
fi
-@@ -2869,6 +4088,18 @@
+@@ -2869,6 +4088,18 @@ func_emit_wrapper_part2 ()
if test -f \"\$progdir/\$program\"; then"
@@ -12034,7 +12623,7 @@ Index: saga/ltmain.sh
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
-@@ -2877,253 +4108,28 @@
+@@ -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
@@ -12190,7 +12779,7 @@ Index: saga/ltmain.sh
- fi
-}
-# end: func_to_host_path
--
+
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
@@ -12288,11 +12877,10 @@ Index: saga/ltmain.sh
- fi
-}
-# end: func_to_host_pathlist
-+
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
-@@ -3141,31 +4147,23 @@
+@@ -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.
@@ -12327,7 +12915,7 @@ Index: saga/ltmain.sh
# endif
#endif
#include <malloc.h>
-@@ -3177,6 +4175,44 @@
+@@ -3177,6 +4175,44 @@ int setenv (const char *, const char *, int);
#include <fcntl.h>
#include <sys/stat.h>
@@ -12372,7 +12960,7 @@ Index: saga/ltmain.sh
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
-@@ -3192,14 +4228,7 @@
+@@ -3192,14 +4228,7 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
@@ -12388,7 +12976,7 @@ Index: saga/ltmain.sh
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
-@@ -3230,10 +4259,6 @@
+@@ -3230,10 +4259,6 @@ int setenv (const char *, const char *, int);
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
@@ -12399,7 +12987,7 @@ Index: saga/ltmain.sh
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
-@@ -3246,22 +4271,13 @@
+@@ -3246,22 +4271,13 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
@@ -12426,7 +13014,7 @@ Index: saga/ltmain.sh
void *xmalloc (size_t num);
char *xstrdup (const char *string);
-@@ -3271,41 +4287,27 @@
+@@ -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);
@@ -12477,7 +13065,7 @@ Index: saga/ltmain.sh
EOF
else
cat <<"EOF"
-@@ -3314,10 +4316,10 @@
+@@ -3314,10 +4316,10 @@ EOF
fi
if test -n "$dllsearchpath"; then
@@ -12490,7 +13078,7 @@ Index: saga/ltmain.sh
EOF
else
cat <<"EOF"
-@@ -3340,24 +4342,10 @@
+@@ -3340,24 +4342,10 @@ EOF
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
@@ -12516,7 +13104,7 @@ Index: saga/ltmain.sh
int
main (int argc, char *argv[])
-@@ -3374,10 +4362,13 @@
+@@ -3374,10 +4362,13 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
@@ -12533,7 +13121,7 @@ Index: saga/ltmain.sh
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3391,25 +4382,57 @@
+@@ -3391,25 +4382,57 @@ EOF
esac
cat <<"EOF"
@@ -12600,7 +13188,7 @@ Index: saga/ltmain.sh
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
-@@ -3427,8 +4450,9 @@
+@@ -3427,8 +4450,9 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
@@ -12612,7 +13200,7 @@ Index: saga/ltmain.sh
EOF
cat <<EOF
-@@ -3478,80 +4502,19 @@
+@@ -3478,80 +4502,19 @@ EOF
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
@@ -12702,7 +13290,7 @@ Index: saga/ltmain.sh
}
EOF
-@@ -3560,11 +4523,14 @@
+@@ -3560,11 +4523,14 @@ EOF
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
@@ -12718,7 +13306,7 @@ Index: saga/ltmain.sh
return 127;
}
return rval;
-@@ -3586,7 +4552,7 @@
+@@ -3586,7 +4552,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
@@ -12727,7 +13315,7 @@ Index: saga/ltmain.sh
return p;
}
-@@ -3620,8 +4586,8 @@
+@@ -3620,8 +4586,8 @@ check_executable (const char *path)
{
struct stat st;
@@ -12738,7 +13326,7 @@ Index: saga/ltmain.sh
if ((!path) || (!*path))
return 0;
-@@ -3638,8 +4604,8 @@
+@@ -3638,8 +4604,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
@@ -12749,7 +13337,7 @@ Index: saga/ltmain.sh
if ((!path) || (!*path))
return 0;
-@@ -3665,8 +4631,8 @@
+@@ -3665,8 +4631,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
@@ -12760,7 +13348,7 @@ Index: saga/ltmain.sh
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
-@@ -3719,7 +4685,8 @@
+@@ -3719,7 +4685,8 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -12770,7 +13358,7 @@ Index: saga/ltmain.sh
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3744,7 +4711,8 @@
+@@ -3744,7 +4711,8 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -12780,7 +13368,7 @@ Index: saga/ltmain.sh
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
-@@ -3770,8 +4738,9 @@
+@@ -3770,8 +4738,9 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
@@ -12792,7 +13380,7 @@ Index: saga/ltmain.sh
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
-@@ -3793,8 +4762,9 @@
+@@ -3793,8 +4762,9 @@ chase_symlinks (const char *pathspec)
}
else
{
@@ -12804,7 +13392,7 @@ Index: saga/ltmain.sh
}
}
XFREE (tmp_pathspec);
-@@ -3807,7 +4777,8 @@
+@@ -3807,7 +4777,8 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
@@ -12814,7 +13402,7 @@ Index: saga/ltmain.sh
}
return xstrdup (tmp_pathspec);
#endif
-@@ -3833,11 +4804,25 @@
+@@ -3833,11 +4804,25 @@ strendzap (char *str, const char *pat)
return str;
}
@@ -12842,7 +13430,7 @@ Index: saga/ltmain.sh
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
-@@ -3846,20 +4831,32 @@
+@@ -3846,20 +4831,32 @@ lt_error_core (int exit_status, const char *mode,
}
void
@@ -12880,7 +13468,7 @@ Index: saga/ltmain.sh
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
-@@ -3904,95 +4901,12 @@
+@@ -3904,95 +4901,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
return new_value;
}
@@ -12979,7 +13567,7 @@ Index: saga/ltmain.sh
if (name && *name && value && *value)
{
-@@ -4011,9 +4925,9 @@
+@@ -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)
{
@@ -12992,7 +13580,7 @@ Index: saga/ltmain.sh
if (name && *name && value && *value)
{
-@@ -4023,11 +4937,158 @@
+@@ -4023,11 +4937,158 @@ lt_update_lib_path (const char *name, const char *value)
}
}
@@ -13151,7 +13739,7 @@ Index: saga/ltmain.sh
# func_mode_link arg...
func_mode_link ()
{
-@@ -4072,6 +5133,7 @@
+@@ -4072,6 +5133,7 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
@@ -13159,7 +13747,7 @@ Index: saga/ltmain.sh
dlfiles=
dlprefiles=
dlself=no
-@@ -4164,6 +5226,11 @@
+@@ -4164,6 +5226,11 @@ func_mode_link ()
esac
case $prev in
@@ -13171,7 +13759,7 @@ Index: saga/ltmain.sh
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
-@@ -4195,9 +5262,9 @@
+@@ -4195,9 +5262,9 @@ func_mode_link ()
;;
*)
if test "$prev" = dlfiles; then
@@ -13183,7 +13771,7 @@ Index: saga/ltmain.sh
fi
prev=
continue
-@@ -4221,7 +5288,7 @@
+@@ -4221,7 +5288,7 @@ func_mode_link ()
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
@@ -13192,7 +13780,7 @@ Index: saga/ltmain.sh
;;
esac
;;
-@@ -4240,7 +5307,7 @@
+@@ -4240,7 +5307,7 @@ func_mode_link ()
moreargs=
for fil in `cat "$save_arg"`
do
@@ -13201,7 +13789,7 @@ Index: saga/ltmain.sh
arg=$fil
# A libtool-controlled object.
-@@ -4269,7 +5336,7 @@
+@@ -4269,7 +5336,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -13210,7 +13798,7 @@ Index: saga/ltmain.sh
prev=
continue
else
-@@ -4281,7 +5348,7 @@
+@@ -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.
@@ -13219,7 +13807,7 @@ Index: saga/ltmain.sh
prev=
fi
-@@ -4351,12 +5418,12 @@
+@@ -4351,12 +5418,12 @@ func_mode_link ()
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
@@ -13234,7 +13822,7 @@ Index: saga/ltmain.sh
esac
fi
prev=
-@@ -4368,28 +5435,28 @@
+@@ -4368,28 +5435,28 @@ func_mode_link ()
continue
;;
weak)
@@ -13269,7 +13857,7 @@ Index: saga/ltmain.sh
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
-@@ -4425,6 +5492,11 @@
+@@ -4425,6 +5492,11 @@ func_mode_link ()
continue
;;
@@ -13281,7 +13869,7 @@ Index: saga/ltmain.sh
-dlopen)
prev=dlfiles
continue
-@@ -4475,15 +5547,16 @@
+@@ -4475,15 +5547,16 @@ func_mode_link ()
;;
-L*)
@@ -13301,7 +13889,7 @@ Index: saga/ltmain.sh
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -4495,24 +5568,30 @@
+@@ -4495,24 +5568,30 @@ func_mode_link ()
;;
esac
case "$deplibs " in
@@ -13338,7 +13926,7 @@ Index: saga/ltmain.sh
esac
;;
esac
-@@ -4522,7 +5601,7 @@
+@@ -4522,7 +5601,7 @@ func_mode_link ()
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -13347,7 +13935,7 @@ Index: saga/ltmain.sh
# These systems don't actually have a C or math library (as such)
continue
;;
-@@ -4536,7 +5615,7 @@
+@@ -4536,7 +5615,7 @@ func_mode_link ()
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -13356,7 +13944,7 @@ Index: saga/ltmain.sh
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
-@@ -4556,7 +5635,7 @@
+@@ -4556,7 +5635,7 @@ func_mode_link ()
;;
esac
fi
@@ -13365,7 +13953,7 @@ Index: saga/ltmain.sh
continue
;;
-@@ -4568,21 +5647,22 @@
+@@ -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.
@@ -13393,7 +13981,7 @@ Index: saga/ltmain.sh
esac
continue
;;
-@@ -4649,13 +5729,17 @@
+@@ -4649,13 +5729,17 @@ func_mode_link ()
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -13412,7 +14000,7 @@ Index: saga/ltmain.sh
esac
continue
;;
-@@ -4708,8 +5792,8 @@
+@@ -4708,8 +5792,8 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
@@ -13423,7 +14011,7 @@ Index: saga/ltmain.sh
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
-@@ -4724,9 +5808,9 @@
+@@ -4724,9 +5808,9 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
@@ -13436,7 +14024,7 @@ Index: saga/ltmain.sh
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
-@@ -4754,23 +5838,27 @@
+@@ -4754,23 +5838,27 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
@@ -13476,7 +14064,7 @@ Index: saga/ltmain.sh
continue
;;
-@@ -4782,7 +5870,7 @@
+@@ -4782,7 +5870,7 @@ func_mode_link ()
*.$objext)
# A standard object.
@@ -13485,7 +14073,7 @@ Index: saga/ltmain.sh
;;
*.lo)
-@@ -4813,7 +5901,7 @@
+@@ -4813,7 +5901,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -13494,7 +14082,7 @@ Index: saga/ltmain.sh
prev=
continue
else
-@@ -4825,7 +5913,7 @@
+@@ -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.
@@ -13503,7 +14091,7 @@ Index: saga/ltmain.sh
prev=
fi
-@@ -4870,24 +5958,25 @@
+@@ -4870,24 +5958,25 @@ func_mode_link ()
*.$libext)
# An archive.
@@ -13534,7 +14122,7 @@ Index: saga/ltmain.sh
fi
continue
;;
-@@ -4925,7 +6014,7 @@
+@@ -4925,7 +6014,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
@@ -13543,7 +14131,7 @@ Index: saga/ltmain.sh
else
shlib_search_path=
fi
-@@ -4934,6 +6023,8 @@
+@@ -4934,6 +6023,8 @@ func_mode_link ()
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
@@ -13552,7 +14140,7 @@ Index: saga/ltmain.sh
# Create the object directory.
func_mkdir_p "$output_objdir"
-@@ -4954,12 +6045,12 @@
+@@ -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
@@ -13568,7 +14156,7 @@ Index: saga/ltmain.sh
done
if test "$linkmode" = lib; then
-@@ -4972,9 +6063,9 @@
+@@ -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
@@ -13580,7 +14168,7 @@ Index: saga/ltmain.sh
done
fi
pre_post_deps=
-@@ -5044,17 +6135,19 @@
+@@ -5044,17 +6135,19 @@ func_mode_link ()
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
@@ -13603,7 +14191,7 @@ Index: saga/ltmain.sh
esac
done
done
-@@ -5070,16 +6163,17 @@
+@@ -5070,16 +6163,17 @@ func_mode_link ()
lib=
found=no
case $deplib in
@@ -13624,7 +14212,7 @@ Index: saga/ltmain.sh
esac
fi
fi
-@@ -5164,7 +6258,7 @@
+@@ -5164,7 +6258,7 @@ func_mode_link ()
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
@@ -13633,7 +14221,7 @@ Index: saga/ltmain.sh
esac
fi
fi
-@@ -5177,7 +6271,8 @@
+@@ -5177,7 +6271,8 @@ func_mode_link ()
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
@@ -13643,7 +14231,7 @@ Index: saga/ltmain.sh
;;
prog)
if test "$pass" = conv; then
-@@ -5191,7 +6286,8 @@
+@@ -5191,7 +6286,8 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
@@ -13653,7 +14241,7 @@ Index: saga/ltmain.sh
;;
*)
func_warning "\`-L' is ignored for archives/objects"
-@@ -5202,17 +6298,21 @@
+@@ -5202,17 +6298,21 @@ func_mode_link ()
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
@@ -13678,7 +14266,7 @@ Index: saga/ltmain.sh
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
-@@ -5230,7 +6330,7 @@
+@@ -5230,7 +6330,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
@@ -13687,7 +14275,7 @@ Index: saga/ltmain.sh
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
-@@ -5240,15 +6340,15 @@
+@@ -5240,15 +6340,15 @@ func_mode_link ()
;;
esac
if test "$valid_a_lib" != yes; then
@@ -13710,7 +14298,7 @@ Index: saga/ltmain.sh
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
-@@ -5275,11 +6375,11 @@
+@@ -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.
@@ -13724,7 +14312,7 @@ Index: saga/ltmain.sh
fi
fi
continue
-@@ -5321,20 +6421,20 @@
+@@ -5321,20 +6421,20 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
@@ -13750,7 +14338,7 @@ Index: saga/ltmain.sh
fi
if test "$pass" = conv; then
-@@ -5345,17 +6445,17 @@
+@@ -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.
@@ -13773,7 +14361,7 @@ Index: saga/ltmain.sh
done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
-@@ -5366,9 +6466,15 @@
+@@ -5366,9 +6466,15 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
@@ -13792,7 +14380,7 @@ Index: saga/ltmain.sh
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
-@@ -5385,9 +6491,9 @@
+@@ -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.
@@ -13804,7 +14392,7 @@ Index: saga/ltmain.sh
fi
continue
fi # $pass = dlopen
-@@ -5409,14 +6515,14 @@
+@@ -5409,14 +6515,14 @@ func_mode_link ()
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
@@ -13822,7 +14410,7 @@ Index: saga/ltmain.sh
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
-@@ -5424,12 +6530,12 @@
+@@ -5424,12 +6530,12 @@ func_mode_link ()
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
@@ -13837,7 +14425,7 @@ Index: saga/ltmain.sh
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
-@@ -5440,20 +6546,46 @@
+@@ -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
@@ -13898,7 +14486,7 @@ Index: saga/ltmain.sh
fi # $pass = dlpreopen
if test -z "$libdir"; then
-@@ -5471,7 +6603,7 @@
+@@ -5471,7 +6603,7 @@ func_mode_link ()
if test "$linkmode" = prog && test "$pass" != link; then
@@ -13907,7 +14495,7 @@ Index: saga/ltmain.sh
deplibs="$lib $deplibs"
linkalldeplibs=no
-@@ -5484,7 +6616,8 @@
+@@ -5484,7 +6616,8 @@ func_mode_link ()
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
@@ -13917,7 +14505,7 @@ Index: saga/ltmain.sh
;;
esac
# Need to link against all dependency_libs?
-@@ -5495,12 +6628,12 @@
+@@ -5495,12 +6628,12 @@ func_mode_link ()
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
@@ -13933,7 +14521,7 @@ Index: saga/ltmain.sh
done # for deplib
continue
fi # $linkmode = prog...
-@@ -5515,7 +6648,7 @@
+@@ -5515,7 +6648,7 @@ func_mode_link ()
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
@@ -13942,7 +14530,7 @@ Index: saga/ltmain.sh
esac
fi
-@@ -5527,7 +6660,7 @@
+@@ -5527,7 +6660,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
@@ -13951,7 +14539,7 @@ Index: saga/ltmain.sh
esac
;;
esac
-@@ -5536,7 +6669,7 @@
+@@ -5536,7 +6669,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -13960,7 +14548,7 @@ Index: saga/ltmain.sh
esac
;;
esac
-@@ -5561,12 +6694,12 @@
+@@ -5561,12 +6694,12 @@ func_mode_link ()
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
@@ -13975,7 +14563,7 @@ Index: saga/ltmain.sh
need_relink=yes
fi
;;
-@@ -5583,7 +6716,7 @@
+@@ -5583,7 +6716,7 @@ func_mode_link ()
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
@@ -13984,7 +14572,7 @@ Index: saga/ltmain.sh
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
-@@ -5601,7 +6734,7 @@
+@@ -5601,7 +6734,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
@@ -13993,7 +14581,7 @@ Index: saga/ltmain.sh
esac
;;
esac
-@@ -5610,7 +6743,7 @@
+@@ -5610,7 +6743,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -14002,7 +14590,7 @@ Index: saga/ltmain.sh
esac
;;
esac
-@@ -5664,7 +6797,7 @@
+@@ -5664,7 +6797,7 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
@@ -14011,7 +14599,7 @@ Index: saga/ltmain.sh
add_shlibpath=
add_dir=
add=
-@@ -5686,9 +6819,9 @@
+@@ -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
@@ -14024,7 +14612,7 @@ Index: saga/ltmain.sh
else
add="$dir/$old_library"
fi
-@@ -5715,12 +6848,12 @@
+@@ -5715,12 +6848,12 @@ func_mode_link ()
test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
@@ -14039,7 +14627,7 @@ Index: saga/ltmain.sh
;;
esac
fi
-@@ -5742,7 +6875,7 @@
+@@ -5742,7 +6875,7 @@ func_mode_link ()
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
@@ -14048,7 +14636,7 @@ Index: saga/ltmain.sh
esac
fi
if test "$linkmode" = prog; then
-@@ -5756,13 +6889,13 @@
+@@ -5756,13 +6889,13 @@ func_mode_link ()
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
@@ -14064,7 +14652,7 @@ Index: saga/ltmain.sh
add_shlibpath=
add_dir=
add=
-@@ -5776,7 +6909,7 @@
+@@ -5776,7 +6909,7 @@ func_mode_link ()
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
@@ -14073,7 +14661,7 @@ Index: saga/ltmain.sh
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
-@@ -5793,7 +6926,7 @@
+@@ -5793,7 +6926,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
@@ -14082,7 +14670,7 @@ Index: saga/ltmain.sh
;;
esac
fi
-@@ -5828,21 +6961,21 @@
+@@ -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.
@@ -14116,7 +14704,7 @@ Index: saga/ltmain.sh
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
-@@ -5870,27 +7003,33 @@
+@@ -5870,27 +7003,33 @@ func_mode_link ()
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
@@ -14156,7 +14744,7 @@ Index: saga/ltmain.sh
done
if test "$link_all_deplibs" != no; then
-@@ -5900,8 +7039,10 @@
+@@ -5900,8 +7039,10 @@ func_mode_link ()
case $deplib in
-L*) path="$deplib" ;;
*.la)
@@ -14168,7 +14756,7 @@ Index: saga/ltmain.sh
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-@@ -5928,8 +7069,8 @@
+@@ -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
@@ -14179,7 +14767,7 @@ Index: saga/ltmain.sh
path=
fi
fi
-@@ -5962,7 +7103,7 @@
+@@ -5962,7 +7103,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
@@ -14188,7 +14776,7 @@ Index: saga/ltmain.sh
fi
fi
dependency_libs="$newdependency_libs"
-@@ -5979,7 +7120,7 @@
+@@ -5979,7 +7120,7 @@ func_mode_link ()
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
@@ -14197,7 +14785,7 @@ Index: saga/ltmain.sh
esac
done
newlib_search_path=
-@@ -6037,10 +7178,10 @@
+@@ -6037,10 +7178,10 @@ func_mode_link ()
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
@@ -14210,7 +14798,7 @@ Index: saga/ltmain.sh
esac
done
eval $var=\"$tmp_libs\"
-@@ -6056,7 +7197,7 @@
+@@ -6056,7 +7197,7 @@ func_mode_link ()
;;
esac
if test -n "$i" ; then
@@ -14219,7 +14807,7 @@ Index: saga/ltmain.sh
fi
done
dependency_libs=$tmp_libs
-@@ -6097,7 +7238,7 @@
+@@ -6097,7 +7238,7 @@ func_mode_link ()
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
@@ -14228,7 +14816,7 @@ Index: saga/ltmain.sh
;;
lib)
-@@ -6130,10 +7271,10 @@
+@@ -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
@@ -14241,7 +14829,7 @@ Index: saga/ltmain.sh
fi
fi
-@@ -6192,13 +7333,14 @@
+@@ -6192,13 +7333,14 @@ func_mode_link ()
# which has an extra 1 added just for fun
#
case $version_type in
@@ -14257,7 +14845,7 @@ Index: saga/ltmain.sh
current="$number_major"
revision="$number_minor"
age="0"
-@@ -6311,7 +7453,7 @@
+@@ -6311,7 +7453,7 @@ func_mode_link ()
versuffix="$major.$revision"
;;
@@ -14266,7 +14854,7 @@ Index: saga/ltmain.sh
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
-@@ -6334,7 +7476,7 @@
+@@ -6334,7 +7476,7 @@ func_mode_link ()
done
# Make executables depend on our current version.
@@ -14275,7 +14863,7 @@ Index: saga/ltmain.sh
;;
qnx)
-@@ -6402,10 +7544,10 @@
+@@ -6402,10 +7544,10 @@ func_mode_link ()
fi
func_generate_dlsyms "$libname" "$libname" "yes"
@@ -14288,7 +14876,7 @@ Index: saga/ltmain.sh
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
-@@ -6421,7 +7563,7 @@
+@@ -6421,7 +7563,7 @@ func_mode_link ()
continue
fi
fi
@@ -14297,7 +14885,7 @@ Index: saga/ltmain.sh
;;
*) ;;
esac
-@@ -6432,27 +7574,28 @@
+@@ -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
@@ -14333,7 +14921,7 @@ Index: saga/ltmain.sh
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-@@ -6466,7 +7609,7 @@
+@@ -6466,7 +7609,7 @@ func_mode_link ()
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
@@ -14342,7 +14930,7 @@ Index: saga/ltmain.sh
esac
done
-@@ -6476,19 +7619,19 @@
+@@ -6476,19 +7619,19 @@ func_mode_link ()
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
@@ -14365,7 +14953,7 @@ Index: saga/ltmain.sh
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
-@@ -6505,7 +7648,7 @@
+@@ -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
@@ -14374,7 +14962,7 @@ Index: saga/ltmain.sh
fi
;;
esac
-@@ -6554,7 +7697,7 @@
+@@ -6554,7 +7697,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -14383,7 +14971,7 @@ Index: saga/ltmain.sh
i=""
;;
esac
-@@ -6565,21 +7708,21 @@
+@@ -6565,21 +7708,21 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -14413,7 +15001,7 @@ Index: saga/ltmain.sh
;;
esac
done
-@@ -6597,7 +7740,7 @@
+@@ -6597,7 +7740,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -14422,7 +15010,7 @@ Index: saga/ltmain.sh
i=""
;;
esac
-@@ -6608,29 +7751,29 @@
+@@ -6608,29 +7751,29 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -14464,7 +15052,7 @@ Index: saga/ltmain.sh
;;
esac
done
-@@ -6647,15 +7790,27 @@
+@@ -6647,15 +7790,27 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -14494,7 +15082,7 @@ Index: saga/ltmain.sh
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
-@@ -6672,13 +7827,13 @@
+@@ -6672,13 +7827,13 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
@@ -14510,7 +15098,7 @@ Index: saga/ltmain.sh
a_deplib=""
break 2
fi
-@@ -6687,12 +7842,12 @@
+@@ -6687,12 +7842,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -14528,7 +15116,7 @@ Index: saga/ltmain.sh
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
-@@ -6703,7 +7858,7 @@
+@@ -6703,7 +7858,7 @@ EOF
;;
*)
# Add a -L argument.
@@ -14537,7 +15125,7 @@ Index: saga/ltmain.sh
;;
esac
done # Gone through all deplibs.
-@@ -6719,7 +7874,7 @@
+@@ -6719,7 +7874,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -14546,7 +15134,7 @@ Index: saga/ltmain.sh
a_deplib=""
;;
esac
-@@ -6730,9 +7885,9 @@
+@@ -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
@@ -14558,7 +15146,7 @@ Index: saga/ltmain.sh
a_deplib=""
break 2
fi
-@@ -6741,12 +7896,12 @@
+@@ -6741,12 +7896,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -14576,7 +15164,7 @@ Index: saga/ltmain.sh
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
-@@ -6757,32 +7912,32 @@
+@@ -6757,32 +7912,32 @@ EOF
;;
*)
# Add a -L argument.
@@ -14620,7 +15208,7 @@ Index: saga/ltmain.sh
;;
esac
versuffix=$versuffix_save
-@@ -6794,23 +7949,23 @@
+@@ -6794,23 +7949,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
@@ -14654,7 +15242,7 @@ Index: saga/ltmain.sh
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
-@@ -6820,16 +7975,16 @@
+@@ -6820,16 +7975,16 @@ EOF
build_libtool_libs=no
fi
else
@@ -14679,7 +15267,7 @@ Index: saga/ltmain.sh
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
-@@ -6846,9 +8001,9 @@
+@@ -6846,9 +8001,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
@@ -14692,7 +15280,7 @@ Index: saga/ltmain.sh
;;
esac
-@@ -6861,7 +8016,7 @@
+@@ -6861,7 +8016,7 @@ EOF
*)
case " $deplibs " in
*" -L$path/$objdir "*)
@@ -14701,7 +15289,7 @@ Index: saga/ltmain.sh
esac
;;
esac
-@@ -6871,10 +8026,10 @@
+@@ -6871,10 +8026,10 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
@@ -14714,7 +15302,7 @@ Index: saga/ltmain.sh
esac
done
deplibs="$new_libs"
-@@ -6886,15 +8041,22 @@
+@@ -6886,15 +8041,22 @@ EOF
# Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then
@@ -14738,7 +15326,7 @@ Index: saga/ltmain.sh
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
-@@ -6903,18 +8065,18 @@
+@@ -6903,18 +8065,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -14760,7 +15348,7 @@ Index: saga/ltmain.sh
esac
fi
done
-@@ -6922,17 +8084,13 @@
+@@ -6922,17 +8084,13 @@ EOF
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
@@ -14780,7 +15368,7 @@ Index: saga/ltmain.sh
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
-@@ -6940,7 +8098,7 @@
+@@ -6940,7 +8098,7 @@ EOF
fi
shlibpath="$finalize_shlibpath"
@@ -14789,7 +15377,7 @@ Index: saga/ltmain.sh
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
-@@ -6966,18 +8124,18 @@
+@@ -6966,18 +8124,18 @@ EOF
linknames=
for link
do
@@ -14811,7 +15399,7 @@ Index: saga/ltmain.sh
fi
orig_export_symbols=
-@@ -7008,13 +8166,45 @@
+@@ -7008,13 +8166,45 @@ EOF
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
@@ -14862,7 +15450,7 @@ Index: saga/ltmain.sh
skipped_export=false
else
# The command line is too long to execute in one step.
-@@ -7036,7 +8226,7 @@
+@@ -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"
@@ -14871,7 +15459,7 @@ Index: saga/ltmain.sh
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7048,7 +8238,7 @@
+@@ -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
@@ -14880,7 +15468,7 @@ Index: saga/ltmain.sh
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
-@@ -7058,7 +8248,7 @@
+@@ -7058,7 +8248,7 @@ EOF
case " $convenience " in
*" $test_deplib "*) ;;
*)
@@ -14889,7 +15477,7 @@ Index: saga/ltmain.sh
;;
esac
done
-@@ -7078,21 +8268,21 @@
+@@ -7078,21 +8268,21 @@ EOF
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
@@ -14915,7 +15503,7 @@ Index: saga/ltmain.sh
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
-@@ -7137,7 +8327,8 @@
+@@ -7137,7 +8327,8 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
@@ -14925,7 +15513,7 @@ Index: saga/ltmain.sh
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -7150,13 +8341,16 @@
+@@ -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"
@@ -14946,7 +15534,7 @@ Index: saga/ltmain.sh
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
func_verbose "creating linker input file list: $output"
-@@ -7170,10 +8364,12 @@
+@@ -7170,10 +8364,12 @@ EOF
fi
for obj
do
@@ -14962,7 +15550,7 @@ Index: saga/ltmain.sh
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
-@@ -7197,17 +8393,19 @@
+@@ -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.
@@ -14985,7 +15573,7 @@ Index: saga/ltmain.sh
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
-@@ -7217,11 +8415,12 @@
+@@ -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~
@@ -15000,7 +15588,7 @@ Index: saga/ltmain.sh
else
output=
-@@ -7255,7 +8454,7 @@
+@@ -7255,7 +8454,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
@@ -15009,7 +15597,7 @@ Index: saga/ltmain.sh
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
-@@ -7276,7 +8475,7 @@
+@@ -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"
@@ -15018,7 +15606,7 @@ Index: saga/ltmain.sh
fi
if test -n "$orig_export_symbols"; then
-@@ -7288,7 +8487,7 @@
+@@ -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
@@ -15027,7 +15615,7 @@ Index: saga/ltmain.sh
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
-@@ -7329,10 +8528,10 @@
+@@ -7329,10 +8528,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
@@ -15040,7 +15628,7 @@ Index: saga/ltmain.sh
test "X$libobjs" = "X " && libobjs=
fi
-@@ -7348,7 +8547,7 @@
+@@ -7348,7 +8547,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
@@ -15049,7 +15637,7 @@ Index: saga/ltmain.sh
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
-@@ -7360,7 +8559,7 @@
+@@ -7360,7 +8559,7 @@ EOF
IFS="$save_ifs"
# Restore the uninstalled library and exit
@@ -15058,7 +15646,7 @@ Index: saga/ltmain.sh
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
-@@ -7441,18 +8640,21 @@
+@@ -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\"
@@ -15083,7 +15671,7 @@ Index: saga/ltmain.sh
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -7512,8 +8714,8 @@
+@@ -7512,8 +8714,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -15094,7 +15682,7 @@ Index: saga/ltmain.sh
;;
esac
-@@ -7524,14 +8726,14 @@
+@@ -7524,14 +8726,14 @@ EOF
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
@@ -15113,7 +15701,7 @@ Index: saga/ltmain.sh
;;
esac
-@@ -7545,7 +8747,7 @@
+@@ -7545,7 +8747,7 @@ EOF
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
@@ -15122,7 +15710,7 @@ Index: saga/ltmain.sh
esac
;;
esac
-@@ -7555,17 +8757,17 @@
+@@ -7555,17 +8757,17 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
@@ -15144,7 +15732,7 @@ Index: saga/ltmain.sh
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -7573,7 +8775,7 @@
+@@ -7573,7 +8775,7 @@ EOF
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -15153,7 +15741,7 @@ Index: saga/ltmain.sh
esac
done
fi
-@@ -7592,18 +8794,18 @@
+@@ -7592,18 +8794,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -15175,7 +15763,7 @@ Index: saga/ltmain.sh
esac
fi
case $host in
-@@ -7612,12 +8814,12 @@
+@@ -7612,12 +8814,12 @@ EOF
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -15190,7 +15778,7 @@ Index: saga/ltmain.sh
esac
;;
esac
-@@ -7643,18 +8845,18 @@
+@@ -7643,18 +8845,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -15212,7 +15800,7 @@ Index: saga/ltmain.sh
esac
fi
done
-@@ -7668,8 +8870,8 @@
+@@ -7668,8 +8870,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
@@ -15223,7 +15811,7 @@ Index: saga/ltmain.sh
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -7681,15 +8883,15 @@
+@@ -7681,15 +8883,15 @@ EOF
wrappers_required=yes
case $host in
@@ -15243,7 +15831,7 @@ Index: saga/ltmain.sh
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
-@@ -7698,13 +8900,19 @@
+@@ -7698,13 +8900,19 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
@@ -15264,7 +15852,7 @@ Index: saga/ltmain.sh
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-@@ -7727,7 +8935,7 @@
+@@ -7727,7 +8935,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
@@ -15273,7 +15861,7 @@ Index: saga/ltmain.sh
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
-@@ -7735,7 +8943,7 @@
+@@ -7735,7 +8943,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
@@ -15282,7 +15870,7 @@ Index: saga/ltmain.sh
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
-@@ -7745,11 +8953,18 @@
+@@ -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.
@@ -15302,7 +15890,7 @@ Index: saga/ltmain.sh
exit $EXIT_SUCCESS
fi
-@@ -7764,7 +8979,7 @@
+@@ -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
@@ -15311,7 +15899,7 @@ Index: saga/ltmain.sh
else
# fast_install is set to needless
relink_command=
-@@ -7776,13 +8991,19 @@
+@@ -7776,13 +8991,19 @@ EOF
fi
# Replace the output file specification.
@@ -15332,7 +15920,7 @@ Index: saga/ltmain.sh
# Now create the wrapper script.
func_verbose "creating $output"
-@@ -7800,18 +9021,7 @@
+@@ -7800,18 +9021,7 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -15352,7 +15940,7 @@ Index: saga/ltmain.sh
fi
# Only actually do things if not in dry run mode.
-@@ -7891,7 +9101,7 @@
+@@ -7891,7 +9101,7 @@ EOF
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
@@ -15361,7 +15949,7 @@ Index: saga/ltmain.sh
fi
fi
addlibs="$old_convenience"
-@@ -7899,10 +9109,10 @@
+@@ -7899,10 +9109,10 @@ EOF
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -15374,7 +15962,7 @@ Index: saga/ltmain.sh
fi
# Do each command in the archive commands.
-@@ -7913,10 +9123,10 @@
+@@ -7913,10 +9123,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
@@ -15387,7 +15975,7 @@ Index: saga/ltmain.sh
fi
# POSIX demands no paths to be encoded in archives. We have
-@@ -7932,9 +9142,9 @@
+@@ -7932,9 +9142,9 @@ EOF
done | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -15399,7 +15987,7 @@ Index: saga/ltmain.sh
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
-@@ -7958,18 +9168,30 @@
+@@ -7958,18 +9168,30 @@ EOF
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
@@ -15432,7 +16020,7 @@ Index: saga/ltmain.sh
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
-@@ -8043,7 +9265,7 @@
+@@ -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@)"
@@ -15441,7 +16029,7 @@ Index: saga/ltmain.sh
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -8063,12 +9285,23 @@
+@@ -8063,12 +9285,23 @@ EOF
*.la)
func_basename "$deplib"
name="$func_basename_result"
@@ -15468,7 +16056,7 @@ Index: saga/ltmain.sh
esac
done
dependency_libs="$newdependency_libs"
-@@ -8082,9 +9315,9 @@
+@@ -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"
@@ -15480,7 +16068,7 @@ Index: saga/ltmain.sh
esac
done
dlfiles="$newdlfiles"
-@@ -8101,7 +9334,7 @@
+@@ -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"
@@ -15489,7 +16077,7 @@ Index: saga/ltmain.sh
;;
esac
done
-@@ -8113,7 +9346,7 @@
+@@ -8113,7 +9346,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
@@ -15498,7 +16086,7 @@ Index: saga/ltmain.sh
done
dlfiles="$newdlfiles"
newdlprefiles=
-@@ -8122,15 +9355,33 @@
+@@ -8122,15 +9355,33 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
@@ -15534,7 +16122,7 @@ Index: saga/ltmain.sh
esac
$ECHO > $output "\
# $outputname - a libtool library file
-@@ -8189,7 +9440,7 @@
+@@ -8189,7 +9440,7 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
@@ -15543,7 +16131,7 @@ Index: saga/ltmain.sh
func_mode_link ${1+"$@"}
-@@ -8209,9 +9460,9 @@
+@@ -8209,9 +9460,9 @@ func_mode_uninstall ()
for arg
do
case $arg in
@@ -15556,7 +16144,7 @@ Index: saga/ltmain.sh
esac
done
-@@ -8220,24 +9471,23 @@
+@@ -8220,24 +9471,23 @@ func_mode_uninstall ()
rmdirs=
@@ -15588,7 +16176,7 @@ Index: saga/ltmain.sh
esac
fi
-@@ -8263,18 +9513,17 @@
+@@ -8263,18 +9513,17 @@ func_mode_uninstall ()
# Delete the libtool libraries and symlinks.
for n in $library_names; do
@@ -15613,7 +16201,7 @@ Index: saga/ltmain.sh
;;
uninstall)
if test -n "$library_names"; then
-@@ -8302,19 +9551,19 @@
+@@ -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
@@ -15636,7 +16224,7 @@ Index: saga/ltmain.sh
noexename=$name
case $file in
*.exe)
-@@ -8324,7 +9573,7 @@
+@@ -8324,7 +9573,7 @@ func_mode_uninstall ()
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
@@ -15645,7 +16233,7 @@ Index: saga/ltmain.sh
;;
esac
# Do a test to see if this is a libtool program.
-@@ -8333,7 +9582,7 @@
+@@ -8333,7 +9582,7 @@ func_mode_uninstall ()
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
@@ -15654,7 +16242,7 @@ Index: saga/ltmain.sh
else
relink_command=
func_source $dir/$noexename
-@@ -8341,12 +9590,12 @@
+@@ -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
@@ -15670,7 +16258,7 @@ Index: saga/ltmain.sh
fi
fi
fi
-@@ -8354,7 +9603,6 @@
+@@ -8354,7 +9603,6 @@ func_mode_uninstall ()
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
@@ -15678,7 +16266,7 @@ Index: saga/ltmain.sh
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
-@@ -8366,16 +9614,16 @@
+@@ -8366,16 +9614,16 @@ func_mode_uninstall ()
exit $exit_status
}
@@ -15698,10 +16286,10 @@ Index: saga/ltmain.sh
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
-Index: saga/m4/libtool.m4
-===================================================================
---- saga.orig/m4/libtool.m4 2012-01-09 14:09:37.000000000 +0100
-+++ saga/m4/libtool.m4 2012-01-09 14:10:07.000000000 +0100
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index a3fee53..828104c 100644
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
@@ -1,7 +1,8 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
@@ -15722,7 +16310,7 @@ Index: saga/m4/libtool.m4
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -37,7 +39,7 @@
+@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
@@ -15731,7 +16319,7 @@ Index: saga/m4/libtool.m4
# LT_PREREQ(VERSION)
-@@ -66,6 +68,7 @@
+@@ -66,6 +68,7 @@ esac
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
@@ -15739,7 +16327,7 @@ Index: saga/m4/libtool.m4
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
-@@ -82,6 +85,8 @@
+@@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
@@ -15748,7 +16336,7 @@ Index: saga/m4/libtool.m4
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
-@@ -118,7 +123,7 @@
+@@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME],
*) break;;
esac
done
@@ -15757,7 +16345,7 @@ Index: saga/m4/libtool.m4
])
-@@ -138,6 +143,11 @@
+@@ -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
@@ -15769,7 +16357,7 @@ Index: saga/m4/libtool.m4
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
-@@ -160,10 +170,13 @@
+@@ -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
@@ -15783,7 +16371,7 @@ Index: saga/m4/libtool.m4
_LT_CONFIG_LIBTOOL_INIT([
# See if we are running on zsh, and set the options which allow our
-@@ -179,7 +192,6 @@
+@@ -179,7 +192,6 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
@@ -15791,7 +16379,7 @@ Index: saga/m4/libtool.m4
case $host_os in
aix3*)
-@@ -193,23 +205,6 @@
+@@ -193,23 +205,6 @@ aix3*)
;;
esac
@@ -15815,7 +16403,7 @@ Index: saga/m4/libtool.m4
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -250,6 +245,28 @@
+@@ -250,6 +245,28 @@ _LT_CONFIG_COMMANDS
])# _LT_SETUP
@@ -15844,7 +16432,7 @@ Index: saga/m4/libtool.m4
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
-@@ -408,7 +425,7 @@
+@@ -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],
@@ -15853,7 +16441,7 @@ Index: saga/m4/libtool.m4
# _LT_CONFIG_STATUS_DECLARATIONS
-@@ -418,7 +435,7 @@
+@@ -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:
#
@@ -15862,7 +16450,7 @@ Index: saga/m4/libtool.m4
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-@@ -517,12 +534,20 @@
+@@ -517,12 +534,20 @@ LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
@@ -15885,7 +16473,7 @@ Index: saga/m4/libtool.m4
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -533,9 +558,9 @@
+@@ -533,9 +558,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
@@ -15897,7 +16485,7 @@ Index: saga/m4/libtool.m4
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -543,16 +568,38 @@
+@@ -543,16 +568,38 @@ for var in lt_decl_all_varnames([[ \
esac
done
@@ -15943,7 +16531,7 @@ Index: saga/m4/libtool.m4
# LT_OUTPUT
# ---------
-@@ -562,20 +609,11 @@
+@@ -562,20 +609,11 @@ _LT_OUTPUT_LIBTOOL_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
@@ -15967,7 +16555,7 @@ Index: saga/m4/libtool.m4
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
-@@ -601,7 +639,7 @@
+@@ -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.
@@ -15976,7 +16564,7 @@ Index: saga/m4/libtool.m4
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-@@ -646,15 +684,13 @@
+@@ -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.
@@ -15999,7 +16587,7 @@ Index: saga/m4/libtool.m4
])# LT_OUTPUT
-@@ -717,15 +753,12 @@
+@@ -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?
@@ -16019,7 +16607,7 @@ Index: saga/m4/libtool.m4
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
],
-@@ -770,6 +803,7 @@
+@@ -770,6 +803,7 @@ AC_DEFUN([LT_LANG],
m4_case([$1],
[C], [_LT_LANG(C)],
[C++], [_LT_LANG(CXX)],
@@ -16027,7 +16615,7 @@ Index: saga/m4/libtool.m4
[Java], [_LT_LANG(GCJ)],
[Fortran 77], [_LT_LANG(F77)],
[Fortran], [_LT_LANG(FC)],
-@@ -791,6 +825,31 @@
+@@ -791,6 +825,31 @@ m4_defun([_LT_LANG],
])# _LT_LANG
@@ -16059,7 +16647,7 @@ Index: saga/m4/libtool.m4
# _LT_LANG_DEFAULT_CONFIG
# -----------------------
m4_defun([_LT_LANG_DEFAULT_CONFIG],
-@@ -821,6 +880,10 @@
+@@ -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)])])])])])
@@ -16070,7 +16658,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -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)])
@@ -16084,7 +16672,7 @@ Index: saga/m4/libtool.m4
# _LT_TAG_COMPILER
-@@ -921,7 +986,13 @@
+@@ -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=$?
@@ -16099,7 +16687,7 @@ Index: saga/m4/libtool.m4
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
-@@ -929,6 +1000,7 @@
+@@ -929,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
rm -rf libconftest.dylib*
rm -f conftest.*
fi])
@@ -16107,7 +16695,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -940,6 +1012,34 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
@@ -16142,7 +16730,7 @@ Index: saga/m4/libtool.m4
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -967,7 +1067,7 @@
+@@ -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
@@ -16151,7 +16739,7 @@ Index: saga/m4/libtool.m4
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -977,8 +1077,8 @@
+@@ -977,8 +1077,8 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
])
@@ -16162,7 +16750,7 @@ Index: saga/m4/libtool.m4
# Checks for linker and compiler features on darwin
m4_defun([_LT_DARWIN_LINKER_FEATURES],
[
-@@ -987,7 +1087,13 @@
+@@ -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
@@ -16177,7 +16765,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -995,7 +1101,7 @@
+@@ -995,7 +1101,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -16186,7 +16774,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -1011,203 +1117,142 @@
+@@ -1011,203 +1117,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
fi
])
@@ -16497,7 +17085,7 @@ Index: saga/m4/libtool.m4
# _LT_ENABLE_LOCK
# ---------------
m4_defun([_LT_ENABLE_LOCK],
-@@ -1236,7 +1281,7 @@
+@@ -1236,7 +1281,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -16506,7 +17094,7 @@ Index: saga/m4/libtool.m4
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -1329,14 +1374,27 @@
+@@ -1329,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -16536,7 +17124,7 @@ Index: saga/m4/libtool.m4
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
-@@ -1354,14 +1412,47 @@
+@@ -1354,14 +1412,47 @@ need_locks="$enable_libtool_lock"
])# _LT_ENABLE_LOCK
@@ -16589,7 +17177,7 @@ Index: saga/m4/libtool.m4
AC_CHECK_TOOL(STRIP, strip, :)
test -z "$STRIP" && STRIP=:
-@@ -1380,18 +1471,27 @@
+@@ -1380,18 +1471,27 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -16620,7 +17208,7 @@ Index: saga/m4/libtool.m4
])# _LT_CMD_OLD_ARCHIVE
-@@ -1416,15 +1516,15 @@
+@@ -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:'`
@@ -16639,7 +17227,7 @@ Index: saga/m4/libtool.m4
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -1464,7 +1564,7 @@
+@@ -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
@@ -16648,7 +17236,7 @@ Index: saga/m4/libtool.m4
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -1527,6 +1627,11 @@
+@@ -1527,6 +1627,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
@@ -16660,7 +17248,7 @@ Index: saga/m4/libtool.m4
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -1552,6 +1657,11 @@
+@@ -1552,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=196608
;;
@@ -16672,7 +17260,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -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.
@@ -16683,7 +17271,7 @@ Index: saga/m4/libtool.m4
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -1643,7 +1753,7 @@
+@@ -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
@@ -16692,7 +17280,7 @@ Index: saga/m4/libtool.m4
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -1684,7 +1794,13 @@
+@@ -1684,7 +1794,13 @@ else
# endif
#endif
@@ -16707,7 +17295,7 @@ Index: saga/m4/libtool.m4
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -1693,7 +1809,11 @@
+@@ -1693,7 +1809,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -16720,7 +17308,7 @@ Index: saga/m4/libtool.m4
/* dlclose (self); */
}
else
-@@ -1869,16 +1989,16 @@
+@@ -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:'`
@@ -16740,7 +17328,7 @@ Index: saga/m4/libtool.m4
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-@@ -2037,6 +2157,7 @@
+@@ -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
@@ -16748,7 +17336,7 @@ Index: saga/m4/libtool.m4
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-@@ -2045,16 +2166,23 @@
+@@ -2045,16 +2166,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -16778,7 +17366,7 @@ Index: saga/m4/libtool.m4
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -2067,7 +2195,7 @@
+@@ -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
@@ -16787,7 +17375,7 @@ Index: saga/m4/libtool.m4
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -2087,7 +2215,13 @@
+@@ -2087,7 +2215,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
@@ -16802,7 +17390,7 @@ Index: saga/m4/libtool.m4
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
-@@ -2113,7 +2247,7 @@
+@@ -2113,7 +2247,7 @@ need_version=unknown
case $host_os in
aix3*)
@@ -16811,7 +17399,7 @@ Index: saga/m4/libtool.m4
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
-@@ -2122,7 +2256,7 @@
+@@ -2122,7 +2256,7 @@ aix3*)
;;
aix[[4-9]]*)
@@ -16820,7 +17408,7 @@ Index: saga/m4/libtool.m4
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
-@@ -2175,7 +2309,7 @@
+@@ -2175,7 +2309,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -16829,7 +17417,7 @@ Index: saga/m4/libtool.m4
;;
esac
;;
-@@ -2187,7 +2321,7 @@
+@@ -2187,7 +2321,7 @@ beos*)
;;
bsdi[[45]]*)
@@ -16838,7 +17426,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -2206,8 +2340,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
@@ -16850,7 +17438,7 @@ Index: saga/m4/libtool.m4
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -2228,36 +2363,83 @@
+@@ -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}'
@@ -16948,7 +17536,7 @@ Index: saga/m4/libtool.m4
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -2278,7 +2460,7 @@
+@@ -2278,7 +2460,7 @@ m4_if([$1], [],[
;;
dgux*)
@@ -16957,7 +17545,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -2286,10 +2468,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -16968,7 +17556,7 @@ Index: saga/m4/libtool.m4
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -2297,7 +2475,7 @@
+@@ -2297,7 +2475,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -16977,7 +17565,7 @@ Index: saga/m4/libtool.m4
*) objformat=elf ;;
esac
fi
-@@ -2315,7 +2493,7 @@
+@@ -2315,7 +2493,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -16986,7 +17574,7 @@ Index: saga/m4/libtool.m4
shlibpath_overrides_runpath=yes
;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-@@ -2335,12 +2513,26 @@
+@@ -2335,12 +2513,26 @@ freebsd* | dragonfly*)
;;
gnu*)
@@ -17014,7 +17602,7 @@ Index: saga/m4/libtool.m4
hardcode_into_libs=yes
;;
-@@ -2386,12 +2578,14 @@
+@@ -2386,12 +2578,14 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -17031,7 +17619,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -2407,7 +2601,7 @@ irix5* | irix6* | nonstopux*)
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
@@ -17040,7 +17628,7 @@ Index: saga/m4/libtool.m4
else
version_type=irix
fi ;;
-@@ -2444,9 +2638,9 @@
+@@ -2444,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
@@ -17052,7 +17640,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -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
@@ -17083,7 +17671,7 @@ Index: saga/m4/libtool.m4
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
-@@ -2472,7 +2671,7 @@
+@@ -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
@@ -17092,7 +17680,7 @@ Index: saga/m4/libtool.m4
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -2516,7 +2715,7 @@
+@@ -2516,7 +2715,7 @@ netbsd*)
;;
newsos6)
@@ -17101,7 +17689,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -2585,7 +2784,7 @@ rdos*)
;;
solaris*)
@@ -17110,7 +17698,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -2610,7 +2809,7 @@ sunos4*)
;;
sysv4 | sysv4.3*)
@@ -17119,7 +17707,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -2634,7 +2833,7 @@ sysv4 | sysv4.3*)
sysv4*MP*)
if test -d /usr/nec ;then
@@ -17128,7 +17716,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -2665,7 +2864,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
@@ -17137,7 +17725,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -2675,7 +2874,7 @@ tpf*)
;;
uts4*)
@@ -17146,7 +17734,7 @@ Index: saga/m4/libtool.m4
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 @@
+@@ -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]])
@@ -17155,7 +17743,7 @@ Index: saga/m4/libtool.m4
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
-@@ -2829,6 +3030,7 @@
+@@ -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
@@ -17163,7 +17751,7 @@ Index: saga/m4/libtool.m4
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
-@@ -2950,6 +3152,11 @@
+@@ -2950,6 +3152,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
@@ -17175,7 +17763,7 @@ Index: saga/m4/libtool.m4
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -2958,8 +3165,8 @@
+@@ -2958,8 +3165,8 @@ case $host_os in
fi
;;
esac
@@ -17186,7 +17774,7 @@ Index: saga/m4/libtool.m4
])# _LT_CMD_RELOAD
-@@ -3011,16 +3218,18 @@
+@@ -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.
@@ -17208,7 +17796,7 @@ Index: saga/m4/libtool.m4
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -3050,6 +3259,10 @@
+@@ -3050,6 +3259,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -17219,7 +17807,7 @@ Index: saga/m4/libtool.m4
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -3058,11 +3271,11 @@
+@@ -3058,11 +3271,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -17233,7 +17821,7 @@ Index: saga/m4/libtool.m4
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -3083,7 +3296,7 @@
+@@ -3083,7 +3296,7 @@ irix5* | irix6* | nonstopux*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -17242,7 +17830,7 @@ Index: saga/m4/libtool.m4
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3162,6 +3375,21 @@
+@@ -3162,6 +3375,21 @@ tpf*)
;;
esac
])
@@ -17264,7 +17852,7 @@ Index: saga/m4/libtool.m4
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -3169,7 +3397,11 @@
+@@ -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],
@@ -17277,11 +17865,12 @@ Index: saga/m4/libtool.m4
])# _LT_CHECK_MAGIC_METHOD
-@@ -3226,7 +3458,19 @@
+@@ -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
@@ -17295,10 +17884,11 @@ Index: saga/m4/libtool.m4
+ ;;
+ esac
+ fi
- AC_SUBST([DUMPBIN])
++ AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -3239,13 +3483,13 @@
+ 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
@@ -17315,7 +17905,7 @@ Index: saga/m4/libtool.m4
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -3260,6 +3504,67 @@
+@@ -3260,6 +3504,67 @@ dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AM_PROG_NM], [])
dnl AC_DEFUN([AC_PROG_NM], [])
@@ -17383,7 +17973,7 @@ Index: saga/m4/libtool.m4
# LT_LIB_M
# --------
-@@ -3268,7 +3573,7 @@
+@@ -3268,7 +3573,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
@@ -17392,7 +17982,7 @@ Index: saga/m4/libtool.m4
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
-@@ -3296,7 +3601,12 @@
+@@ -3296,7 +3601,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
@@ -17406,7 +17996,7 @@ Index: saga/m4/libtool.m4
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
-@@ -3313,6 +3623,7 @@
+@@ -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
@@ -17414,7 +18004,7 @@ Index: saga/m4/libtool.m4
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -3380,8 +3691,8 @@
+@@ -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
@@ -17425,7 +18015,7 @@ Index: saga/m4/libtool.m4
# Handle CRLF in mingw tool chain
opt_cr=
-@@ -3405,6 +3716,7 @@
+@@ -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};"\
@@ -17433,7 +18023,7 @@ Index: saga/m4/libtool.m4
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-@@ -3417,6 +3729,7 @@
+@@ -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
@@ -17441,7 +18031,7 @@ Index: saga/m4/libtool.m4
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -3438,7 +3751,7 @@
+@@ -3438,7 +3751,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -17450,7 +18040,7 @@ Index: saga/m4/libtool.m4
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -3450,6 +3763,18 @@
+@@ -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
@@ -17469,7 +18059,7 @@ Index: saga/m4/libtool.m4
#ifdef __cplusplus
extern "C" {
#endif
-@@ -3461,7 +3786,7 @@
+@@ -3461,7 +3786,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
@@ -17478,7 +18068,7 @@ Index: saga/m4/libtool.m4
const char *name;
void *address;
}
-@@ -3487,15 +3812,15 @@
+@@ -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
@@ -17498,7 +18088,7 @@ Index: saga/m4/libtool.m4
else
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
fi
-@@ -3528,6 +3853,13 @@
+@@ -3528,6 +3853,13 @@ else
AC_MSG_RESULT(ok)
fi
@@ -17512,7 +18102,7 @@ Index: saga/m4/libtool.m4
_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-@@ -3538,6 +3870,8 @@
+@@ -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])
@@ -17521,7 +18111,7 @@ Index: saga/m4/libtool.m4
]) # _LT_CMD_GLOBAL_SYMBOLS
-@@ -3549,7 +3883,6 @@
+@@ -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)=
@@ -17529,7 +18119,7 @@ Index: saga/m4/libtool.m4
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -3600,6 +3933,11 @@
+@@ -3600,6 +3933,11 @@ m4_if([$1], [CXX], [
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -17541,7 +18131,7 @@ Index: saga/m4/libtool.m4
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -3649,6 +3987,12 @@
+@@ -3649,6 +3987,12 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -17554,7 +18144,7 @@ Index: saga/m4/libtool.m4
dgux*)
case $cc_basename in
ec++*)
-@@ -3738,8 +4082,8 @@
+@@ -3738,8 +4082,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -17565,7 +18155,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-@@ -3801,7 +4145,7 @@
+@@ -3801,7 +4145,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
@@ -17574,7 +18164,7 @@ Index: saga/m4/libtool.m4
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -3905,6 +4249,12 @@
+@@ -3905,6 +4249,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -17587,7 +18177,7 @@ Index: saga/m4/libtool.m4
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -3947,6 +4297,15 @@
+@@ -3947,6 +4297,15 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
@@ -17603,7 +18193,7 @@ Index: saga/m4/libtool.m4
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -4010,7 +4369,13 @@
+@@ -4010,7 +4369,13 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
@@ -17618,7 +18208,7 @@ Index: saga/m4/libtool.m4
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -4022,25 +4387,40 @@
+@@ -4022,25 +4387,40 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -17665,7 +18255,7 @@ Index: saga/m4/libtool.m4
;;
esac
;;
-@@ -4072,7 +4452,7 @@
+@@ -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
@@ -17674,7 +18264,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4129,9 +4509,11 @@
+@@ -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
@@ -17689,7 +18279,7 @@ Index: saga/m4/libtool.m4
#
# Check to make sure the PIC flag actually works.
-@@ -4150,6 +4532,8 @@
+@@ -4150,6 +4532,8 @@ fi
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
[Additional compiler flags for building library objects])
@@ -17698,7 +18288,7 @@ Index: saga/m4/libtool.m4
#
# Check to make sure the static flag actually works.
#
-@@ -4170,6 +4554,7 @@
+@@ -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
@@ -17706,7 +18296,7 @@ Index: saga/m4/libtool.m4
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -4178,30 +4563,40 @@
+@@ -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'
@@ -17755,7 +18345,7 @@ Index: saga/m4/libtool.m4
], [
runpath_var=
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -4216,7 +4611,6 @@
+@@ -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)=
@@ -17763,7 +18353,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -4261,13 +4655,39 @@
+@@ -4261,13 +4655,39 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd*)
with_gnu_ld=no
;;
@@ -17804,7 +18394,7 @@ Index: saga/m4/libtool.m4
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -4301,11 +4721,12 @@
+@@ -4301,11 +4721,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -17820,7 +18410,7 @@ Index: saga/m4/libtool.m4
_LT_EOF
fi
-@@ -4341,10 +4762,12 @@
+@@ -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'
@@ -17834,7 +18424,7 @@ Index: saga/m4/libtool.m4
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -4362,6 +4785,11 @@
+@@ -4362,6 +4785,11 @@ _LT_EOF
fi
;;
@@ -17846,7 +18436,7 @@ Index: saga/m4/libtool.m4
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4387,15 +4815,16 @@
+@@ -4387,15 +4815,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
@@ -17867,7 +18457,7 @@ Index: saga/m4/libtool.m4
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -4406,13 +4835,17 @@
+@@ -4406,13 +4835,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
@@ -17887,7 +18477,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -4428,17 +4861,16 @@
+@@ -4428,17 +4861,16 @@ _LT_EOF
fi
case $cc_basename in
@@ -17909,7 +18499,7 @@ Index: saga/m4/libtool.m4
fi
;;
esac
-@@ -4452,8 +4884,8 @@
+@@ -4452,8 +4884,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -17920,7 +18510,7 @@ Index: saga/m4/libtool.m4
fi
;;
-@@ -4471,8 +4903,8 @@
+@@ -4471,8 +4903,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17931,7 +18521,7 @@ Index: saga/m4/libtool.m4
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4518,8 +4950,8 @@
+@@ -4518,8 +4950,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17942,7 +18532,7 @@ Index: saga/m4/libtool.m4
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4559,8 +4991,10 @@
+@@ -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
@@ -17954,7 +18544,7 @@ Index: saga/m4/libtool.m4
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -4648,9 +5082,9 @@
+@@ -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.
@@ -17966,7 +18556,7 @@ Index: saga/m4/libtool.m4
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -4659,14 +5093,19 @@
+@@ -4659,14 +5093,19 @@ _LT_EOF
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -17989,7 +18579,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -4698,20 +5137,64 @@
+@@ -4698,20 +5137,64 @@ _LT_EOF
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
@@ -18068,7 +18658,7 @@ Index: saga/m4/libtool.m4
;;
darwin* | rhapsody*)
-@@ -4724,10 +5207,6 @@
+@@ -4724,10 +5207,6 @@ _LT_EOF
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -18079,7 +18669,7 @@ Index: saga/m4/libtool.m4
# 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 @@
+@@ -4740,7 +5219,7 @@ _LT_EOF
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -18088,7 +18678,7 @@ Index: saga/m4/libtool.m4
_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 @@
+@@ -4749,7 +5228,7 @@ _LT_EOF
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
@@ -18097,7 +18687,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4757,7 +5236,7 @@
+@@ -4757,7 +5236,7 @@ _LT_EOF
hpux9*)
if test "$GCC" = yes; then
@@ -18106,7 +18696,7 @@ Index: saga/m4/libtool.m4
else
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -4772,14 +5251,13 @@
+@@ -4772,14 +5251,13 @@ _LT_EOF
;;
hpux10*)
@@ -18123,7 +18713,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-@@ -4791,16 +5269,16 @@
+@@ -4791,16 +5269,16 @@ _LT_EOF
;;
hpux11*)
@@ -18143,7 +18733,7 @@ Index: saga/m4/libtool.m4
;;
esac
else
-@@ -4812,7 +5290,14 @@
+@@ -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'
;;
*)
@@ -18159,7 +18749,7 @@ Index: saga/m4/libtool.m4
;;
esac
fi
-@@ -4840,19 +5325,34 @@
+@@ -4840,19 +5325,34 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -18203,7 +18793,7 @@ Index: saga/m4/libtool.m4
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4914,17 +5414,17 @@
+@@ -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
@@ -18224,7 +18814,7 @@ Index: saga/m4/libtool.m4
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4934,13 +5434,13 @@
+@@ -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}\*'
@@ -18241,7 +18831,7 @@ Index: saga/m4/libtool.m4
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4953,9 +5453,9 @@
+@@ -4953,9 +5453,9 @@ _LT_EOF
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
@@ -18253,7 +18843,7 @@ Index: saga/m4/libtool.m4
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -5131,36 +5631,38 @@
+@@ -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.
@@ -18322,7 +18912,7 @@ Index: saga/m4/libtool.m4
;;
esac
fi
-@@ -5197,9 +5699,6 @@
+@@ -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])
@@ -18332,7 +18922,7 @@ Index: saga/m4/libtool.m4
_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 @@
+@@ -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])
@@ -18341,7 +18931,7 @@ Index: saga/m4/libtool.m4
_LT_TAGDECL([], [always_export_symbols], [0],
[Set to "yes" if exported symbols are required])
_LT_TAGDECL([], [export_symbols_cmds], [2],
-@@ -5237,6 +5734,8 @@
+@@ -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])
@@ -18350,7 +18940,7 @@ Index: saga/m4/libtool.m4
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
dnl FIXME: Not yet implemented
-@@ -5330,37 +5829,22 @@
+@@ -5330,37 +5829,22 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
@@ -18397,7 +18987,7 @@ Index: saga/m4/libtool.m4
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -5372,7 +5856,6 @@
+@@ -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)=
@@ -18405,7 +18995,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -5382,6 +5865,8 @@
+@@ -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
@@ -18414,7 +19004,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -5413,6 +5898,7 @@
+@@ -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
@@ -18422,7 +19012,7 @@ Index: saga/m4/libtool.m4
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
-@@ -5430,6 +5916,7 @@
+@@ -5430,6 +5916,7 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
@@ -18430,7 +19020,7 @@ Index: saga/m4/libtool.m4
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -5451,8 +5938,8 @@
+@@ -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
@@ -18441,7 +19031,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5484,7 +5971,7 @@
+@@ -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.
@@ -18450,7 +19040,7 @@ Index: saga/m4/libtool.m4
else
GXX=no
-@@ -5593,10 +6080,10 @@
+@@ -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.
@@ -18463,7 +19053,7 @@ Index: saga/m4/libtool.m4
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -5605,14 +6092,19 @@
+@@ -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.
@@ -18486,7 +19076,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -5642,28 +6134,75 @@
+@@ -5642,28 +6134,75 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
cygwin* | mingw* | pw32* | cegcc*)
@@ -18584,7 +19174,7 @@ Index: saga/m4/libtool.m4
darwin* | rhapsody*)
_LT_DARWIN_LINKER_FEATURES($1)
;;
-@@ -5686,7 +6225,7 @@
+@@ -5686,7 +6225,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
;;
@@ -18593,7 +19183,7 @@ Index: saga/m4/libtool.m4
# C++ shared libraries reported to be fairly broken before
# switch to ELF
_LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5705,6 +6244,11 @@
+@@ -5705,6 +6244,11 @@ if test "$_lt_caught_CXX_error" != yes; then
gnu*)
;;
@@ -18605,7 +19195,7 @@ Index: saga/m4/libtool.m4
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -5729,11 +6273,11 @@
+@@ -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.
@@ -18619,7 +19209,7 @@ Index: saga/m4/libtool.m4
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5794,7 +6338,7 @@
+@@ -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.
@@ -18628,7 +19218,7 @@ Index: saga/m4/libtool.m4
;;
*)
if test "$GXX" = yes; then
-@@ -5804,10 +6348,10 @@
+@@ -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*)
@@ -18641,7 +19231,7 @@ Index: saga/m4/libtool.m4
;;
esac
fi
-@@ -5837,7 +6381,7 @@
+@@ -5837,7 +6381,7 @@ if test "$_lt_caught_CXX_error" != yes; then
case $cc_basename in
CC*)
# SGI C++
@@ -18650,7 +19240,7 @@ Index: saga/m4/libtool.m4
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -5848,9 +6392,9 @@
+@@ -5848,9 +6392,9 @@ if test "$_lt_caught_CXX_error" != yes; then
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -18662,7 +19252,7 @@ Index: saga/m4/libtool.m4
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -5879,7 +6423,7 @@
+@@ -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.
@@ -18671,7 +19261,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5916,26 +6460,26 @@
+@@ -5916,26 +6460,26 @@ if test "$_lt_caught_CXX_error" != yes; then
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -18704,7 +19294,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
-@@ -5943,7 +6487,7 @@
+@@ -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'
@@ -18713,7 +19303,7 @@ Index: saga/m4/libtool.m4
;;
cxx*)
# Compaq C++
-@@ -5962,9 +6506,9 @@
+@@ -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.
@@ -18725,7 +19315,7 @@ Index: saga/m4/libtool.m4
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5984,13 +6528,13 @@
+@@ -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'
@@ -18741,7 +19331,7 @@ Index: saga/m4/libtool.m4
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6059,7 +6603,7 @@
+@@ -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
@@ -18750,7 +19340,7 @@ Index: saga/m4/libtool.m4
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -6094,15 +6638,15 @@
+@@ -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}\*'
@@ -18769,7 +19359,7 @@ Index: saga/m4/libtool.m4
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
-@@ -6118,17 +6662,17 @@
+@@ -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.
@@ -18790,7 +19380,7 @@ Index: saga/m4/libtool.m4
;;
esac
-@@ -6138,7 +6682,7 @@
+@@ -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.
@@ -18799,7 +19389,7 @@ Index: saga/m4/libtool.m4
else
# FIXME: insert proper C++ library support
-@@ -6174,7 +6718,7 @@
+@@ -6174,7 +6718,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris*)
case $cc_basename in
@@ -18808,7 +19398,7 @@ Index: saga/m4/libtool.m4
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -6195,7 +6739,7 @@
+@@ -6195,7 +6739,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -18817,7 +19407,7 @@ Index: saga/m4/libtool.m4
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6215,14 +6759,14 @@
+@@ -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
@@ -18835,7 +19425,7 @@ Index: saga/m4/libtool.m4
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -6233,7 +6777,7 @@
+@@ -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.
@@ -18844,7 +19434,7 @@ Index: saga/m4/libtool.m4
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-@@ -6287,6 +6831,10 @@
+@@ -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'
@@ -18855,7 +19445,7 @@ Index: saga/m4/libtool.m4
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -6342,6 +6890,7 @@
+@@ -6342,6 +6890,7 @@ if test "$_lt_caught_CXX_error" != yes; then
fi # test -n "$compiler"
CC=$lt_save_CC
@@ -18863,7 +19453,7 @@ Index: saga/m4/libtool.m4
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
-@@ -6356,6 +6905,29 @@
+@@ -6356,6 +6905,29 @@ AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -18893,7 +19483,7 @@ Index: saga/m4/libtool.m4
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
-@@ -6364,6 +6936,7 @@
+@@ -6364,6 +6936,7 @@ AC_LANG_POP
# objects, libraries and library flags.
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -18901,7 +19491,7 @@ Index: saga/m4/libtool.m4
# Dependencies to place before and after the object being linked:
_LT_TAGVAR(predep_objects, $1)=
_LT_TAGVAR(postdep_objects, $1)=
-@@ -6413,7 +6986,20 @@
+@@ -6413,7 +6986,20 @@ public class foo {
}
};
_LT_EOF
@@ -18922,7 +19512,7 @@ Index: saga/m4/libtool.m4
dnl Parse the compiler output and extract the necessary
dnl objects, libraries and library flags.
if AC_TRY_EVAL(ac_compile); then
-@@ -6425,7 +7011,7 @@
+@@ -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
@@ -18931,7 +19521,7 @@ Index: saga/m4/libtool.m4
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
-@@ -6434,13 +7020,22 @@
+@@ -6434,13 +7020,22 @@ if AC_TRY_EVAL(ac_compile); then
test $p = "-R"; then
prev=$p
continue
@@ -18958,7 +19548,7 @@ Index: saga/m4/libtool.m4
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
-@@ -6460,8 +7055,10 @@
+@@ -6460,8 +7055,10 @@ if AC_TRY_EVAL(ac_compile); then
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
fi
fi
@@ -18969,7 +19559,7 @@ Index: saga/m4/libtool.m4
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
-@@ -6497,6 +7094,7 @@
+@@ -6497,6 +7094,7 @@ else
fi
$RM -f confest.$objext
@@ -18977,7 +19567,7 @@ Index: saga/m4/libtool.m4
# PORTME: override above test on systems where it is broken
m4_if([$1], [CXX],
-@@ -6533,7 +7131,7 @@
+@@ -6533,7 +7131,7 @@ linux*)
solaris*)
case $cc_basename in
@@ -18986,7 +19576,7 @@ Index: saga/m4/libtool.m4
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -6577,32 +7175,16 @@
+@@ -6577,32 +7175,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
])# _LT_SYS_HIDDEN_LIBDEPS
@@ -19023,7 +19613,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6612,7 +7194,6 @@
+@@ -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)=
@@ -19031,7 +19621,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
-@@ -6621,6 +7202,8 @@
+@@ -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
@@ -19040,7 +19630,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6660,7 +7243,9 @@
+@@ -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
@@ -19050,7 +19640,7 @@ Index: saga/m4/libtool.m4
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -6714,38 +7299,24 @@
+@@ -6714,38 +7299,24 @@ if test "$_lt_disable_F77" != yes; then
GCC=$lt_save_GCC
CC="$lt_save_CC"
@@ -19095,7 +19685,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6755,7 +7326,6 @@
+@@ -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)=
@@ -19103,7 +19693,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
-@@ -6764,6 +7334,8 @@
+@@ -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
@@ -19112,7 +19702,7 @@ Index: saga/m4/libtool.m4
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6803,7 +7375,9 @@
+@@ -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
@@ -19122,7 +19712,7 @@ Index: saga/m4/libtool.m4
compiler=$CC
GCC=$ac_cv_fc_compiler_gnu
-@@ -6859,7 +7433,8 @@
+@@ -6859,7 +7433,8 @@ if test "$_lt_disable_FC" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
@@ -19132,7 +19722,7 @@ Index: saga/m4/libtool.m4
fi # test "$_lt_disable_FC" != yes
AC_LANG_POP
-@@ -6896,10 +7471,12 @@
+@@ -6896,10 +7471,12 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
@@ -19146,7 +19736,7 @@ Index: saga/m4/libtool.m4
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
-@@ -6909,6 +7486,8 @@
+@@ -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
@@ -19155,7 +19745,7 @@ Index: saga/m4/libtool.m4
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -6928,10 +7507,82 @@
+@@ -6928,10 +7507,82 @@ fi
AC_LANG_RESTORE
GCC=$lt_save_GCC
@@ -19239,7 +19829,7 @@ Index: saga/m4/libtool.m4
# _LT_LANG_RC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
-@@ -6963,9 +7614,11 @@
+@@ -6963,9 +7614,11 @@ _LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
@@ -19251,7 +19841,7 @@ Index: saga/m4/libtool.m4
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -6978,7 +7631,8 @@
+@@ -6978,7 +7631,8 @@ fi
GCC=$lt_save_GCC
AC_LANG_RESTORE
@@ -19261,7 +19851,7 @@ Index: saga/m4/libtool.m4
])# _LT_LANG_RC_CONFIG
-@@ -6998,6 +7652,13 @@
+@@ -6998,6 +7652,13 @@ dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
@@ -19275,7 +19865,7 @@ Index: saga/m4/libtool.m4
# LT_PROG_RC
# ----------
AC_DEFUN([LT_PROG_RC],
-@@ -7037,6 +7698,15 @@
+@@ -7037,6 +7698,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
AC_SUBST([OBJDUMP])
])
@@ -19291,7 +19881,7 @@ Index: saga/m4/libtool.m4
# _LT_DECL_SED
# ------------
-@@ -7130,8 +7800,8 @@
+@@ -7130,8 +7800,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
@@ -19302,7 +19892,7 @@ Index: saga/m4/libtool.m4
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-@@ -7170,208 +7840,162 @@
+@@ -7170,208 +7840,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
@@ -19387,12 +19977,6 @@ Index: saga/m4/libtool.m4
-{
- func_xform_result=${1%.*}.lo
-}
--
--# func_arith arithmetic-term...
--func_arith ()
--{
-- func_arith_result=$(( $[*] ))
--}
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
@@ -19409,17 +19993,18 @@ Index: saga/m4/libtool.m4
+test 0 -eq $? || _lt_function_replace_fail=:
+])
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=$(( $[*] ))
+-}
+
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-
--_LT_EOF
-- ;;
-- *) # Bourne compatible functions.
-- cat << \_LT_EOF >> "$cfgfile"
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
@@ -19442,6 +20027,17 @@ Index: saga/m4/libtool.m4
+ esac
+ func_basename_result="${1##*/}"])
+-_LT_EOF
+- ;;
+- *) # Bourne compatible functions.
+- cat << \_LT_EOF >> "$cfgfile"
++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++ # positional parameters, so assign one to ordinary parameter first.
++ func_stripname_result=${3}
++ func_stripname_result=${func_stripname_result#"${1}"}
++ func_stripname_result=${func_stripname_result%"${2}"}])
+
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
@@ -19455,28 +20051,27 @@ Index: saga/m4/libtool.m4
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+ # positional parameters, so assign one to ordinary parameter first.
-+ func_stripname_result=${3}
-+ func_stripname_result=${func_stripname_result#"${1}"}
-+ func_stripname_result=${func_stripname_result%"${2}"}])
++ _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_long_opt], [dnl
-+ func_split_long_opt_name=${1%%=*}
-+ func_split_long_opt_arg=${1#*=}])
++ _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_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_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.
@@ -19493,16 +20088,12 @@ Index: saga/m4/libtool.m4
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
-+ _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_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_xform], [ func_xform_result=${1%.*}.lo])
++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-# func_opt_split
-func_opt_split ()
@@ -19510,33 +20101,28 @@ Index: saga/m4/libtool.m4
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
+-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-+fi
-
+-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-+if test x"$lt_shell_append" = xyes; then
-+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
++fi
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$[@]"`
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-+ func_quote_for_eval "${2}"
-+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
++if test x"$lt_shell_append" = xyes; then
++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-# func_len string
-# STRING may not start with a hyphen.
@@ -19544,6 +20130,13 @@ Index: saga/m4/libtool.m4
-{
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
++ func_quote_for_eval "${2}"
++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+-_LT_EOF
+-esac
+ # Save a `func_append' function call where possible by direct use of '+='
+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
@@ -19557,17 +20150,14 @@ Index: saga/m4/libtool.m4
+ test 0 -eq $? || _lt_function_replace_fail=:
+fi
--_LT_EOF
--esac
+-case $lt_shell_append in
+- yes)
+- cat << \_LT_EOF >> "$cfgfile"
+if test x"$_lt_function_replace_fail" = x":"; then
+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
--case $lt_shell_append in
-- yes)
-- cat << \_LT_EOF >> "$cfgfile"
--
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
@@ -19653,10 +20243,10 @@ Index: saga/m4/libtool.m4
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+ [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
-Index: saga/m4/ltoptions.m4
-===================================================================
---- saga.orig/m4/ltoptions.m4 2012-01-09 14:09:37.000000000 +0100
-+++ saga/m4/ltoptions.m4 2012-01-09 14:10:07.000000000 +0100
+diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
+index 34151a3..5d9acd8 100644
+--- a/m4/ltoptions.m4
++++ b/m4/ltoptions.m4
@@ -1,13 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
@@ -19674,7 +20264,7 @@ Index: saga/m4/ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-@@ -125,7 +126,7 @@
+@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
@@ -19683,7 +20273,7 @@ Index: saga/m4/ltoptions.m4
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -133,13 +134,13 @@
+@@ -133,13 +134,13 @@ case $host in
esac
test -z "$AS" && AS=as
@@ -19700,7 +20290,7 @@ Index: saga/m4/ltoptions.m4
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-@@ -325,9 +326,24 @@
+@@ -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],
@@ -19727,10 +20317,10 @@ Index: saga/m4/ltoptions.m4
[pic_mode=default])
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-Index: saga/m4/ltversion.m4
-===================================================================
---- saga.orig/m4/ltversion.m4 2012-01-09 14:09:37.000000000 +0100
-+++ saga/m4/ltversion.m4 2012-01-09 14:10:07.000000000 +0100
+diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
+index f3c5309..07a8602 100644
+--- a/m4/ltversion.m4
++++ b/m4/ltversion.m4
@@ -7,17 +7,17 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
@@ -19755,10 +20345,10 @@ Index: saga/m4/ltversion.m4
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
-Index: saga/m4/lt~obsolete.m4
-===================================================================
---- saga.orig/m4/lt~obsolete.m4 2012-01-09 14:09:37.000000000 +0100
-+++ saga/m4/lt~obsolete.m4 2012-01-09 14:10:07.000000000 +0100
+diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
+index 637bb20..c573da9 100644
+--- a/m4/lt~obsolete.m4
++++ b/m4/lt~obsolete.m4
@@ -1,13 +1,13 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
@@ -19775,7 +20365,7 @@ Index: saga/m4/lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-@@ -77,7 +77,6 @@
+@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
@@ -19783,7 +20373,7 @@ Index: saga/m4/lt~obsolete.m4
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-@@ -90,3 +89,10 @@
+@@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
@@ -19794,11 +20384,24 @@ Index: saga/m4/lt~obsolete.m4
+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-Index: saga/src/Makefile.in
-===================================================================
---- saga.orig/src/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 8758ac8..4794408 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19806,7 +20409,7 @@ Index: saga/src/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19814,7 +20417,7 @@ Index: saga/src/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19822,7 +20425,7 @@ Index: saga/src/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19830,11 +20433,44 @@ Index: saga/src/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/Makefile.in
-===================================================================
---- saga.orig/src/modules/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
+index 701c05d..f0e99af 100644
+--- a/src/modules/Makefile.in
++++ b/src/modules/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19842,7 +20478,7 @@ Index: saga/src/modules/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19850,7 +20486,7 @@ Index: saga/src/modules/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19858,7 +20494,7 @@ Index: saga/src/modules/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19866,11 +20502,44 @@ Index: saga/src/modules/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/grid/Makefile.in
-===================================================================
---- saga.orig/src/modules/grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/grid/Makefile.in b/src/modules/grid/Makefile.in
+index 165f3da..ae141eb 100644
+--- a/src/modules/grid/Makefile.in
++++ b/src/modules/grid/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19878,7 +20547,7 @@ Index: saga/src/modules/grid/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19886,7 +20555,7 @@ Index: saga/src/modules/grid/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19894,7 +20563,7 @@ Index: saga/src/modules/grid/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19902,11 +20571,57 @@ Index: saga/src/modules/grid/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/grid/grid_analysis/Makefile.in
-===================================================================
---- saga.orig/src/modules/grid/grid_analysis/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/grid/grid_analysis/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -133,6 +133,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/grid/grid_analysis/Makefile.in b/src/modules/grid/grid_analysis/Makefile.in
+index b2cb540..d98dc32 100644
+--- a/src/modules/grid/grid_analysis/Makefile.in
++++ b/src/modules/grid/grid_analysis/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgrid_analysis_la_DEPENDENCIES = \
+@@ -133,6 +139,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19914,7 +20629,7 @@ Index: saga/src/modules/grid/grid_analysis/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -159,6 +160,7 @@
+@@ -159,6 +166,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19922,7 +20637,7 @@ Index: saga/src/modules/grid/grid_analysis/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -197,6 +199,7 @@
+@@ -197,6 +205,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19930,7 +20645,7 @@ Index: saga/src/modules/grid/grid_analysis/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -230,7 +233,6 @@
+@@ -230,7 +239,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19938,11 +20653,66 @@ Index: saga/src/modules/grid/grid_analysis/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/grid/grid_calculus/Makefile.in
-===================================================================
---- saga.orig/src/modules/grid/grid_calculus/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/grid/grid_calculus/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -131,6 +131,7 @@
+@@ -367,7 +375,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgrid_analysis.la: $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_DEPENDENCIES)
++libgrid_analysis.la: $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_DEPENDENCIES) $(EXTRA_libgrid_analysis_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -522,10 +530,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/grid/grid_calculus/Makefile.in b/src/modules/grid/grid_calculus/Makefile.in
+index 120fe40..4892064 100644
+--- a/src/modules/grid/grid_calculus/Makefile.in
++++ b/src/modules/grid/grid_calculus/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgrid_calculus_la_DEPENDENCIES = \
+@@ -131,6 +137,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19950,7 +20720,7 @@ Index: saga/src/modules/grid/grid_calculus/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@
+@@ -157,6 +164,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19958,7 +20728,7 @@ Index: saga/src/modules/grid/grid_calculus/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@
+@@ -195,6 +203,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -19966,7 +20736,7 @@ Index: saga/src/modules/grid/grid_calculus/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@
+@@ -228,7 +237,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -19974,11 +20744,66 @@ Index: saga/src/modules/grid/grid_calculus/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/grid/grid_calculus_bsl/Makefile.in
-===================================================================
---- saga.orig/src/modules/grid/grid_calculus_bsl/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/grid/grid_calculus_bsl/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -131,6 +131,7 @@
+@@ -357,7 +365,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgrid_calculus.la: $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_DEPENDENCIES)
++libgrid_calculus.la: $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_DEPENDENCIES) $(EXTRA_libgrid_calculus_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -508,10 +516,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/grid/grid_calculus_bsl/Makefile.in b/src/modules/grid/grid_calculus_bsl/Makefile.in
+index 3945ad5..24aa00b 100644
+--- a/src/modules/grid/grid_calculus_bsl/Makefile.in
++++ b/src/modules/grid/grid_calculus_bsl/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgrid_calculus_bsl_la_DEPENDENCIES = \
+@@ -131,6 +137,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -19986,7 +20811,7 @@ Index: saga/src/modules/grid/grid_calculus_bsl/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@
+@@ -157,6 +164,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -19994,7 +20819,7 @@ Index: saga/src/modules/grid/grid_calculus_bsl/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@
+@@ -195,6 +203,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20002,7 +20827,7 @@ Index: saga/src/modules/grid/grid_calculus_bsl/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@
+@@ -228,7 +237,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20010,11 +20835,66 @@ Index: saga/src/modules/grid/grid_calculus_bsl/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/grid/grid_filter/Makefile.in
-===================================================================
---- saga.orig/src/modules/grid/grid_filter/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/grid/grid_filter/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -365,7 +373,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgrid_calculus_bsl.la: $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_DEPENDENCIES)
++libgrid_calculus_bsl.la: $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_DEPENDENCIES) $(EXTRA_libgrid_calculus_bsl_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -518,10 +526,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/grid/grid_filter/Makefile.in b/src/modules/grid/grid_filter/Makefile.in
+index 34636b9..8ac35e3 100644
+--- a/src/modules/grid/grid_filter/Makefile.in
++++ b/src/modules/grid/grid_filter/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgrid_filter_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20022,7 +20902,7 @@ Index: saga/src/modules/grid/grid_filter/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20030,7 +20910,7 @@ Index: saga/src/modules/grid/grid_filter/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20038,7 +20918,7 @@ Index: saga/src/modules/grid/grid_filter/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20046,11 +20926,66 @@ Index: saga/src/modules/grid/grid_filter/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/grid/grid_gridding/Makefile.in
-===================================================================
---- saga.orig/src/modules/grid/grid_gridding/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/grid/grid_gridding/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -81,7 +81,7 @@
+@@ -347,7 +355,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgrid_filter.la: $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_DEPENDENCIES)
++libgrid_filter.la: $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_DEPENDENCIES) $(EXTRA_libgrid_filter_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -494,10 +502,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/grid/grid_gridding/Makefile.in b/src/modules/grid/grid_gridding/Makefile.in
+index ab3ea25..bb8e058 100644
+--- a/src/modules/grid/grid_gridding/Makefile.in
++++ b/src/modules/grid/grid_gridding/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgrid_gridding_la_DEPENDENCIES = \
+@@ -81,7 +87,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 \
@@ -20059,7 +20994,7 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -132,6 +132,7 @@
+@@ -132,6 +138,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20067,7 +21002,7 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@
+@@ -158,6 +165,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20075,7 +21010,7 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@
+@@ -196,6 +204,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20083,7 +21018,7 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@
+@@ -229,7 +238,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20091,7 +21026,7 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -259,7 +261,7 @@
+@@ -259,7 +267,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)
@@ -20100,7 +21035,7 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
pkglib_LTLIBRARIES = libgrid_gridding.la
libgrid_gridding_la_SOURCES = \
Interpolation.cpp\
-@@ -279,7 +281,6 @@
+@@ -279,7 +287,6 @@ Shepard.cpp\
./nn/nnai.c\
./nn/nncommon.c\
./nn/nnpi.c\
@@ -20108,7 +21043,7 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
Interpolation.h\
Interpolation_InverseDistance.h\
Interpolation_NaturalNeighbour.h\
-@@ -295,7 +296,6 @@
+@@ -295,7 +302,6 @@ Shepard.h\
./nn/istack.h\
./nn/nan.h\
./nn/nn.h\
@@ -20116,7 +21051,16 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
./nn/version.h
libgrid_gridding_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
-@@ -390,7 +390,6 @@
+@@ -364,7 +370,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgrid_gridding.la: $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_DEPENDENCIES)
++libgrid_gridding.la: $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_DEPENDENCIES) $(EXTRA_libgrid_gridding_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -390,7 +396,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@
@@ -20124,7 +21068,7 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -462,13 +461,6 @@
+@@ -462,13 +467,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
@@ -20138,11 +21082,57 @@ Index: saga/src/modules/grid/grid_gridding/Makefile.in
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-Index: saga/src/modules/grid/grid_spline/Makefile.in
-===================================================================
---- saga.orig/src/modules/grid/grid_spline/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/grid/grid_spline/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -130,6 +130,7 @@
+@@ -595,10 +593,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/grid/grid_spline/Makefile.in b/src/modules/grid/grid_spline/Makefile.in
+index 15ac42b..b6019ae 100644
+--- a/src/modules/grid/grid_spline/Makefile.in
++++ b/src/modules/grid/grid_spline/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgrid_spline_la_DEPENDENCIES = \
+@@ -130,6 +136,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20150,7 +21140,7 @@ Index: saga/src/modules/grid/grid_spline/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@
+@@ -156,6 +163,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20158,7 +21148,7 @@ Index: saga/src/modules/grid/grid_spline/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@
+@@ -194,6 +202,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20166,7 +21156,7 @@ Index: saga/src/modules/grid/grid_spline/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@
+@@ -227,7 +236,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20174,11 +21164,66 @@ Index: saga/src/modules/grid/grid_spline/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/grid/grid_tools/Makefile.in
-===================================================================
---- saga.orig/src/modules/grid/grid_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/grid/grid_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -136,6 +136,7 @@
+@@ -346,7 +354,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgrid_spline.la: $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_DEPENDENCIES)
++libgrid_spline.la: $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_DEPENDENCIES) $(EXTRA_libgrid_spline_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -513,10 +521,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/grid/grid_tools/Makefile.in b/src/modules/grid/grid_tools/Makefile.in
+index 020f381..c56f87d 100644
+--- a/src/modules/grid/grid_tools/Makefile.in
++++ b/src/modules/grid/grid_tools/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgrid_tools_la_DEPENDENCIES = \
+@@ -136,6 +142,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20186,7 +21231,7 @@ Index: saga/src/modules/grid/grid_tools/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -162,6 +163,7 @@
+@@ -162,6 +169,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20194,7 +21239,7 @@ Index: saga/src/modules/grid/grid_tools/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -200,6 +202,7 @@
+@@ -200,6 +208,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20202,7 +21247,7 @@ Index: saga/src/modules/grid/grid_tools/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -233,7 +236,6 @@
+@@ -233,7 +242,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20210,11 +21255,66 @@ Index: saga/src/modules/grid/grid_tools/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/grid/grid_visualisation/Makefile.in
-===================================================================
---- saga.orig/src/modules/grid/grid_visualisation/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/grid/grid_visualisation/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -131,6 +131,7 @@
+@@ -392,7 +400,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgrid_tools.la: $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_DEPENDENCIES)
++libgrid_tools.la: $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_DEPENDENCIES) $(EXTRA_libgrid_tools_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -558,10 +566,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/grid/grid_visualisation/Makefile.in b/src/modules/grid/grid_visualisation/Makefile.in
+index af2b578..778c5cc 100644
+--- a/src/modules/grid/grid_visualisation/Makefile.in
++++ b/src/modules/grid/grid_visualisation/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgrid_visualisation_la_DEPENDENCIES = \
+@@ -131,6 +137,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20222,7 +21322,7 @@ Index: saga/src/modules/grid/grid_visualisation/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@
+@@ -157,6 +164,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20230,7 +21330,7 @@ Index: saga/src/modules/grid/grid_visualisation/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@
+@@ -195,6 +203,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20238,7 +21338,7 @@ Index: saga/src/modules/grid/grid_visualisation/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@
+@@ -228,7 +237,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20246,11 +21346,53 @@ Index: saga/src/modules/grid/grid_visualisation/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/pointcloud/Makefile.in
-===================================================================
---- saga.orig/src/modules/pointcloud/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/pointcloud/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -343,7 +351,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgrid_visualisation.la: $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_DEPENDENCIES)
++libgrid_visualisation.la: $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_DEPENDENCIES) $(EXTRA_libgrid_visualisation_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -487,10 +495,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/pointcloud/Makefile.in b/src/modules/pointcloud/Makefile.in
+index 7b9ab32..4cd9fc0 100644
+--- a/src/modules/pointcloud/Makefile.in
++++ b/src/modules/pointcloud/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20258,7 +21400,7 @@ Index: saga/src/modules/pointcloud/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20266,7 +21408,7 @@ Index: saga/src/modules/pointcloud/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20274,7 +21416,7 @@ Index: saga/src/modules/pointcloud/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20282,11 +21424,57 @@ Index: saga/src/modules/pointcloud/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/pointcloud/pointcloud_tools/Makefile.in
-===================================================================
---- saga.orig/src/modules/pointcloud/pointcloud_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/pointcloud/pointcloud_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -130,6 +130,7 @@
+@@ -481,10 +483,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/pointcloud/pointcloud_tools/Makefile.in b/src/modules/pointcloud/pointcloud_tools/Makefile.in
+index 6f31ca3..25f839e 100644
+--- a/src/modules/pointcloud/pointcloud_tools/Makefile.in
++++ b/src/modules/pointcloud/pointcloud_tools/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libpointcloud_tools_la_DEPENDENCIES = \
+@@ -130,6 +136,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20294,7 +21482,7 @@ Index: saga/src/modules/pointcloud/pointcloud_tools/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@
+@@ -156,6 +163,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20302,7 +21490,7 @@ Index: saga/src/modules/pointcloud/pointcloud_tools/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@
+@@ -194,6 +202,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20310,7 +21498,7 @@ Index: saga/src/modules/pointcloud/pointcloud_tools/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@
+@@ -227,7 +236,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20318,11 +21506,66 @@ Index: saga/src/modules/pointcloud/pointcloud_tools/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/pointcloud/pointcloud_viewer/Makefile.in
-===================================================================
---- saga.orig/src/modules/pointcloud/pointcloud_viewer/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/pointcloud/pointcloud_viewer/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -130,6 +130,7 @@
+@@ -350,7 +358,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libpointcloud_tools.la: $(libpointcloud_tools_la_OBJECTS) $(libpointcloud_tools_la_DEPENDENCIES)
++libpointcloud_tools.la: $(libpointcloud_tools_la_OBJECTS) $(libpointcloud_tools_la_DEPENDENCIES) $(EXTRA_libpointcloud_tools_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libpointcloud_tools_la_OBJECTS) $(libpointcloud_tools_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -498,10 +506,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/pointcloud/pointcloud_viewer/Makefile.in b/src/modules/pointcloud/pointcloud_viewer/Makefile.in
+index 5425739..82bbc21 100644
+--- a/src/modules/pointcloud/pointcloud_viewer/Makefile.in
++++ b/src/modules/pointcloud/pointcloud_viewer/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libpointcloud_viewer_la_DEPENDENCIES = \
+@@ -130,6 +136,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20330,7 +21573,7 @@ Index: saga/src/modules/pointcloud/pointcloud_viewer/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@
+@@ -156,6 +163,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20338,7 +21581,7 @@ Index: saga/src/modules/pointcloud/pointcloud_viewer/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@
+@@ -194,6 +202,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20346,7 +21589,7 @@ Index: saga/src/modules/pointcloud/pointcloud_viewer/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@
+@@ -227,7 +236,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20354,11 +21597,53 @@ Index: saga/src/modules/pointcloud/pointcloud_viewer/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/shapes/Makefile.in
-===================================================================
---- saga.orig/src/modules/shapes/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/shapes/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -335,7 +343,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libpointcloud_viewer.la: $(libpointcloud_viewer_la_OBJECTS) $(libpointcloud_viewer_la_DEPENDENCIES)
++libpointcloud_viewer.la: $(libpointcloud_viewer_la_OBJECTS) $(libpointcloud_viewer_la_DEPENDENCIES) $(EXTRA_libpointcloud_viewer_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libpointcloud_viewer_la_OBJECTS) $(libpointcloud_viewer_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -476,10 +484,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/shapes/Makefile.in b/src/modules/shapes/Makefile.in
+index bd4a260..a0b4332 100644
+--- a/src/modules/shapes/Makefile.in
++++ b/src/modules/shapes/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20366,7 +21651,7 @@ Index: saga/src/modules/shapes/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20374,7 +21659,7 @@ Index: saga/src/modules/shapes/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20382,7 +21667,7 @@ Index: saga/src/modules/shapes/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20390,19 +21675,65 @@ Index: saga/src/modules/shapes/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/shapes/shapes_grid/Makefile.in
-===================================================================
---- saga.orig/src/modules/shapes/shapes_grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/shapes/shapes_grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -131,6 +131,7 @@
- DEFS = @DEFS@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/shapes/shapes_grid/Makefile.in b/src/modules/shapes/shapes_grid/Makefile.in
+index bcfc2ed..558206f 100644
+--- a/src/modules/shapes/shapes_grid/Makefile.in
++++ b/src/modules/shapes/shapes_grid/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libshapes_grid_la_DEPENDENCIES = \
+@@ -131,6 +137,7 @@ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@
+@@ -157,6 +164,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20410,7 +21741,7 @@ Index: saga/src/modules/shapes/shapes_grid/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@
+@@ -195,6 +203,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20418,7 +21749,7 @@ Index: saga/src/modules/shapes/shapes_grid/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@
+@@ -228,7 +237,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20426,11 +21757,66 @@ Index: saga/src/modules/shapes/shapes_grid/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/shapes/shapes_lines/Makefile.in
-===================================================================
---- saga.orig/src/modules/shapes/shapes_lines/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/shapes/shapes_lines/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -351,7 +359,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libshapes_grid.la: $(libshapes_grid_la_OBJECTS) $(libshapes_grid_la_DEPENDENCIES)
++libshapes_grid.la: $(libshapes_grid_la_OBJECTS) $(libshapes_grid_la_DEPENDENCIES) $(EXTRA_libshapes_grid_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libshapes_grid_la_OBJECTS) $(libshapes_grid_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -499,10 +507,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/shapes/shapes_lines/Makefile.in b/src/modules/shapes/shapes_lines/Makefile.in
+index faefd7d..27b6f9f 100644
+--- a/src/modules/shapes/shapes_lines/Makefile.in
++++ b/src/modules/shapes/shapes_lines/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libshapes_lines_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20438,7 +21824,7 @@ Index: saga/src/modules/shapes/shapes_lines/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20446,7 +21832,7 @@ Index: saga/src/modules/shapes/shapes_lines/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20454,7 +21840,7 @@ Index: saga/src/modules/shapes/shapes_lines/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20462,11 +21848,66 @@ Index: saga/src/modules/shapes/shapes_lines/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/shapes/shapes_points/Makefile.in
-===================================================================
---- saga.orig/src/modules/shapes/shapes_points/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/shapes/shapes_points/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -132,6 +132,7 @@
+@@ -338,7 +346,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libshapes_lines.la: $(libshapes_lines_la_OBJECTS) $(libshapes_lines_la_DEPENDENCIES)
++libshapes_lines.la: $(libshapes_lines_la_OBJECTS) $(libshapes_lines_la_DEPENDENCIES) $(EXTRA_libshapes_lines_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libshapes_lines_la_OBJECTS) $(libshapes_lines_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -481,10 +489,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/shapes/shapes_points/Makefile.in b/src/modules/shapes/shapes_points/Makefile.in
+index cc358de..ede3ad9 100644
+--- a/src/modules/shapes/shapes_points/Makefile.in
++++ b/src/modules/shapes/shapes_points/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libshapes_points_la_DEPENDENCIES = \
+@@ -132,6 +138,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20474,7 +21915,7 @@ Index: saga/src/modules/shapes/shapes_points/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@
+@@ -158,6 +165,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20482,7 +21923,7 @@ Index: saga/src/modules/shapes/shapes_points/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@
+@@ -196,6 +204,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20490,7 +21931,7 @@ Index: saga/src/modules/shapes/shapes_points/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@
+@@ -229,7 +238,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20498,11 +21939,66 @@ Index: saga/src/modules/shapes/shapes_points/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/shapes/shapes_polygons/Makefile.in
-===================================================================
---- saga.orig/src/modules/shapes/shapes_polygons/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/shapes/shapes_polygons/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -131,6 +131,7 @@
+@@ -364,7 +372,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libshapes_points.la: $(libshapes_points_la_OBJECTS) $(libshapes_points_la_DEPENDENCIES)
++libshapes_points.la: $(libshapes_points_la_OBJECTS) $(libshapes_points_la_DEPENDENCIES) $(EXTRA_libshapes_points_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libshapes_points_la_OBJECTS) $(libshapes_points_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -518,10 +526,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/shapes/shapes_polygons/Makefile.in b/src/modules/shapes/shapes_polygons/Makefile.in
+index cace281..d2856d3 100644
+--- a/src/modules/shapes/shapes_polygons/Makefile.in
++++ b/src/modules/shapes/shapes_polygons/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libshapes_polygons_la_DEPENDENCIES = \
+@@ -131,6 +137,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20510,7 +22006,7 @@ Index: saga/src/modules/shapes/shapes_polygons/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@
+@@ -157,6 +164,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20518,7 +22014,7 @@ Index: saga/src/modules/shapes/shapes_polygons/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@
+@@ -195,6 +203,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20526,7 +22022,7 @@ Index: saga/src/modules/shapes/shapes_polygons/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@
+@@ -228,7 +237,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20534,11 +22030,66 @@ Index: saga/src/modules/shapes/shapes_polygons/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/shapes/shapes_tools/Makefile.in
-===================================================================
---- saga.orig/src/modules/shapes/shapes_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/shapes/shapes_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -134,6 +134,7 @@
+@@ -351,7 +359,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libshapes_polygons.la: $(libshapes_polygons_la_OBJECTS) $(libshapes_polygons_la_DEPENDENCIES)
++libshapes_polygons.la: $(libshapes_polygons_la_OBJECTS) $(libshapes_polygons_la_DEPENDENCIES) $(EXTRA_libshapes_polygons_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libshapes_polygons_la_OBJECTS) $(libshapes_polygons_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -499,10 +507,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/shapes/shapes_tools/Makefile.in b/src/modules/shapes/shapes_tools/Makefile.in
+index 9743244..e6b4afd 100644
+--- a/src/modules/shapes/shapes_tools/Makefile.in
++++ b/src/modules/shapes/shapes_tools/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libshapes_tools_la_DEPENDENCIES = \
+@@ -134,6 +140,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20546,7 +22097,7 @@ Index: saga/src/modules/shapes/shapes_tools/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -160,6 +161,7 @@
+@@ -160,6 +167,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20554,7 +22105,7 @@ Index: saga/src/modules/shapes/shapes_tools/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -198,6 +200,7 @@
+@@ -198,6 +206,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20562,7 +22113,7 @@ Index: saga/src/modules/shapes/shapes_tools/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -231,7 +234,6 @@
+@@ -231,7 +240,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20570,11 +22121,66 @@ Index: saga/src/modules/shapes/shapes_tools/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/shapes/shapes_transect/Makefile.in
-===================================================================
---- saga.orig/src/modules/shapes/shapes_transect/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/shapes/shapes_transect/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -126,6 +126,7 @@
+@@ -372,7 +380,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libshapes_tools.la: $(libshapes_tools_la_OBJECTS) $(libshapes_tools_la_DEPENDENCIES)
++libshapes_tools.la: $(libshapes_tools_la_OBJECTS) $(libshapes_tools_la_DEPENDENCIES) $(EXTRA_libshapes_tools_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libshapes_tools_la_OBJECTS) $(libshapes_tools_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -529,10 +537,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/shapes/shapes_transect/Makefile.in b/src/modules/shapes/shapes_transect/Makefile.in
+index 945084e..d757a57 100644
+--- a/src/modules/shapes/shapes_transect/Makefile.in
++++ b/src/modules/shapes/shapes_transect/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libtransect_la_DEPENDENCIES = \
+@@ -126,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20582,7 +22188,7 @@ Index: saga/src/modules/shapes/shapes_transect/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@
+@@ -152,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20590,7 +22196,7 @@ Index: saga/src/modules/shapes/shapes_transect/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@
+@@ -190,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20598,7 +22204,7 @@ Index: saga/src/modules/shapes/shapes_transect/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@
+@@ -223,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20606,11 +22212,53 @@ Index: saga/src/modules/shapes/shapes_transect/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/table/Makefile.in
-===================================================================
---- saga.orig/src/modules/table/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/table/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -326,7 +334,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libtransect.la: $(libtransect_la_OBJECTS) $(libtransect_la_DEPENDENCIES)
++libtransect.la: $(libtransect_la_OBJECTS) $(libtransect_la_DEPENDENCIES) $(EXTRA_libtransect_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libtransect_la_OBJECTS) $(libtransect_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -464,10 +472,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/table/Makefile.in b/src/modules/table/Makefile.in
+index 42558e0..0f0a419 100644
+--- a/src/modules/table/Makefile.in
++++ b/src/modules/table/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20618,7 +22266,7 @@ Index: saga/src/modules/table/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20626,7 +22274,7 @@ Index: saga/src/modules/table/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20634,7 +22282,7 @@ Index: saga/src/modules/table/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20642,11 +22290,57 @@ Index: saga/src/modules/table/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/table/table_calculus/Makefile.in
-===================================================================
---- saga.orig/src/modules/table/table_calculus/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/table/table_calculus/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/table/table_calculus/Makefile.in b/src/modules/table/table_calculus/Makefile.in
+index a404f86..92d1543 100644
+--- a/src/modules/table/table_calculus/Makefile.in
++++ b/src/modules/table/table_calculus/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libtable_calculus_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20654,7 +22348,7 @@ Index: saga/src/modules/table/table_calculus/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20662,7 +22356,7 @@ Index: saga/src/modules/table/table_calculus/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20670,7 +22364,7 @@ Index: saga/src/modules/table/table_calculus/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20678,11 +22372,66 @@ Index: saga/src/modules/table/table_calculus/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/table/table_tools/Makefile.in
-===================================================================
---- saga.orig/src/modules/table/table_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/table/table_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -345,7 +353,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libtable_calculus.la: $(libtable_calculus_la_OBJECTS) $(libtable_calculus_la_DEPENDENCIES)
++libtable_calculus.la: $(libtable_calculus_la_OBJECTS) $(libtable_calculus_la_DEPENDENCIES) $(EXTRA_libtable_calculus_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libtable_calculus_la_OBJECTS) $(libtable_calculus_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -491,10 +499,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/table/table_tools/Makefile.in b/src/modules/table/table_tools/Makefile.in
+index 529ee4a..49f7f5a 100644
+--- a/src/modules/table/table_tools/Makefile.in
++++ b/src/modules/table/table_tools/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libtable_tools_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20690,7 +22439,7 @@ Index: saga/src/modules/table/table_tools/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20698,7 +22447,7 @@ Index: saga/src/modules/table/table_tools/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20706,7 +22455,7 @@ Index: saga/src/modules/table/table_tools/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20714,11 +22463,53 @@ Index: saga/src/modules/table/table_tools/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/tin/Makefile.in
-===================================================================
---- saga.orig/src/modules/tin/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/tin/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -336,7 +344,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libtable_tools.la: $(libtable_tools_la_OBJECTS) $(libtable_tools_la_DEPENDENCIES)
++libtable_tools.la: $(libtable_tools_la_OBJECTS) $(libtable_tools_la_DEPENDENCIES) $(EXTRA_libtable_tools_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libtable_tools_la_OBJECTS) $(libtable_tools_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -478,10 +486,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/tin/Makefile.in b/src/modules/tin/Makefile.in
+index 4f4e4c5..345462d 100644
+--- a/src/modules/tin/Makefile.in
++++ b/src/modules/tin/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20726,7 +22517,7 @@ Index: saga/src/modules/tin/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20734,7 +22525,7 @@ Index: saga/src/modules/tin/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20742,7 +22533,7 @@ Index: saga/src/modules/tin/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20750,11 +22541,57 @@ Index: saga/src/modules/tin/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/tin/tin_tools/Makefile.in
-===================================================================
---- saga.orig/src/modules/tin/tin_tools/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/tin/tin_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -481,10 +483,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/tin/tin_tools/Makefile.in b/src/modules/tin/tin_tools/Makefile.in
+index a0e403e..9c7de4c 100644
+--- a/src/modules/tin/tin_tools/Makefile.in
++++ b/src/modules/tin/tin_tools/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libtin_tools_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20762,7 +22599,7 @@ Index: saga/src/modules/tin/tin_tools/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20770,7 +22607,7 @@ Index: saga/src/modules/tin/tin_tools/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20778,7 +22615,7 @@ Index: saga/src/modules/tin/tin_tools/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20786,11 +22623,66 @@ Index: saga/src/modules/tin/tin_tools/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules/tin/tin_viewer/Makefile.in
-===================================================================
---- saga.orig/src/modules/tin/tin_viewer/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules/tin/tin_viewer/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -341,7 +349,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libtin_tools.la: $(libtin_tools_la_OBJECTS) $(libtin_tools_la_DEPENDENCIES)
++libtin_tools.la: $(libtin_tools_la_OBJECTS) $(libtin_tools_la_DEPENDENCIES) $(EXTRA_libtin_tools_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libtin_tools_la_OBJECTS) $(libtin_tools_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -485,10 +493,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules/tin/tin_viewer/Makefile.in b/src/modules/tin/tin_viewer/Makefile.in
+index d1f89c6..c382272 100644
+--- a/src/modules/tin/tin_viewer/Makefile.in
++++ b/src/modules/tin/tin_viewer/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libtin_viewer_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20798,7 +22690,7 @@ Index: saga/src/modules/tin/tin_viewer/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20806,7 +22698,7 @@ Index: saga/src/modules/tin/tin_viewer/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20814,7 +22706,7 @@ Index: saga/src/modules/tin/tin_viewer/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20822,11 +22714,53 @@ Index: saga/src/modules/tin/tin_viewer/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_contrib/Makefile.in
-===================================================================
---- saga.orig/src/modules_contrib/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_contrib/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -331,7 +339,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libtin_viewer.la: $(libtin_viewer_la_OBJECTS) $(libtin_viewer_la_DEPENDENCIES)
++libtin_viewer.la: $(libtin_viewer_la_OBJECTS) $(libtin_viewer_la_DEPENDENCIES) $(EXTRA_libtin_viewer_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libtin_viewer_la_OBJECTS) $(libtin_viewer_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -471,10 +479,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_contrib/Makefile.in b/src/modules_contrib/Makefile.in
+index 040184d..ff84b5e 100644
+--- a/src/modules_contrib/Makefile.in
++++ b/src/modules_contrib/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20834,7 +22768,7 @@ Index: saga/src/modules_contrib/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20842,7 +22776,7 @@ Index: saga/src/modules_contrib/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20850,7 +22784,7 @@ Index: saga/src/modules_contrib/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20858,11 +22792,44 @@ Index: saga/src/modules_contrib/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_contrib/contrib_a_perego/Makefile.in
-===================================================================
---- saga.orig/src/modules_contrib/contrib_a_perego/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_contrib/contrib_a_perego/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_contrib/contrib_a_perego/Makefile.in b/src/modules_contrib/contrib_a_perego/Makefile.in
+index 4ec3db3..815b6f8 100644
+--- a/src/modules_contrib/contrib_a_perego/Makefile.in
++++ b/src/modules_contrib/contrib_a_perego/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20870,7 +22837,7 @@ Index: saga/src/modules_contrib/contrib_a_perego/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20878,7 +22845,7 @@ Index: saga/src/modules_contrib/contrib_a_perego/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20886,7 +22853,7 @@ Index: saga/src/modules_contrib/contrib_a_perego/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20894,11 +22861,57 @@ Index: saga/src/modules_contrib/contrib_a_perego/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
-===================================================================
---- saga.orig/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in b/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
+index 8631ad2..d067ad8 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
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libcontrib_a_perego_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20906,7 +22919,7 @@ Index: saga/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20914,7 +22927,7 @@ Index: saga/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20922,7 +22935,7 @@ Index: saga/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20930,11 +22943,53 @@ Index: saga/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_contrib/contrib_s_liersch/Makefile.in
-===================================================================
---- saga.orig/src/modules_contrib/contrib_s_liersch/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_contrib/contrib_s_liersch/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -342,7 +350,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libcontrib_a_perego.la: $(libcontrib_a_perego_la_OBJECTS) $(libcontrib_a_perego_la_DEPENDENCIES)
++libcontrib_a_perego.la: $(libcontrib_a_perego_la_OBJECTS) $(libcontrib_a_perego_la_DEPENDENCIES) $(EXTRA_libcontrib_a_perego_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libcontrib_a_perego_la_OBJECTS) $(libcontrib_a_perego_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -487,10 +495,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_contrib/contrib_s_liersch/Makefile.in b/src/modules_contrib/contrib_s_liersch/Makefile.in
+index 17893b4..9883a93 100644
+--- a/src/modules_contrib/contrib_s_liersch/Makefile.in
++++ b/src/modules_contrib/contrib_s_liersch/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20942,7 +22997,7 @@ Index: saga/src/modules_contrib/contrib_s_liersch/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20950,7 +23005,7 @@ Index: saga/src/modules_contrib/contrib_s_liersch/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20958,7 +23013,7 @@ Index: saga/src/modules_contrib/contrib_s_liersch/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -20966,11 +23021,57 @@ Index: saga/src/modules_contrib/contrib_s_liersch/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
-===================================================================
---- saga.orig/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in b/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
+index 41fb921..f138a6a 100644
+--- a/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
++++ b/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libihacres_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -20978,7 +23079,7 @@ Index: saga/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -20986,7 +23087,7 @@ Index: saga/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -20994,7 +23095,7 @@ Index: saga/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21002,11 +23103,53 @@ Index: saga/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_contrib/garden/Makefile.in
-===================================================================
---- saga.orig/src/modules_contrib/garden/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_contrib/garden/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -347,7 +355,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libihacres.la: $(libihacres_la_OBJECTS) $(libihacres_la_DEPENDENCIES)
++libihacres.la: $(libihacres_la_OBJECTS) $(libihacres_la_DEPENDENCIES) $(EXTRA_libihacres_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libihacres_la_OBJECTS) $(libihacres_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -494,10 +502,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_contrib/garden/Makefile.in b/src/modules_contrib/garden/Makefile.in
+index 4e820cc..db4cb35 100644
+--- a/src/modules_contrib/garden/Makefile.in
++++ b/src/modules_contrib/garden/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21014,7 +23157,7 @@ Index: saga/src/modules_contrib/garden/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21022,7 +23165,7 @@ Index: saga/src/modules_contrib/garden/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21030,7 +23173,7 @@ Index: saga/src/modules_contrib/garden/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21038,11 +23181,57 @@ Index: saga/src/modules_contrib/garden/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
-===================================================================
---- saga.orig/src/modules_contrib/garden/garden_3d_viewer/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_contrib/garden/garden_3d_viewer/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -481,10 +483,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_contrib/garden/garden_3d_viewer/Makefile.in b/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
+index 977533d..a8f1562 100644
+--- a/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
++++ b/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgarden_3d_viewer_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21050,7 +23239,7 @@ Index: saga/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21058,7 +23247,7 @@ Index: saga/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21066,7 +23255,7 @@ Index: saga/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21074,11 +23263,66 @@ Index: saga/src/modules_contrib/garden/garden_3d_viewer/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_contrib/garden/garden_webservices/Makefile.in
-===================================================================
---- saga.orig/src/modules_contrib/garden/garden_webservices/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_contrib/garden/garden_webservices/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -332,7 +340,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgarden_3d_viewer.la: $(libgarden_3d_viewer_la_OBJECTS) $(libgarden_3d_viewer_la_DEPENDENCIES)
++libgarden_3d_viewer.la: $(libgarden_3d_viewer_la_OBJECTS) $(libgarden_3d_viewer_la_DEPENDENCIES) $(EXTRA_libgarden_3d_viewer_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgarden_3d_viewer_la_OBJECTS) $(libgarden_3d_viewer_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -472,10 +480,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_contrib/garden/garden_webservices/Makefile.in b/src/modules_contrib/garden/garden_webservices/Makefile.in
+index 608085b..cb22ac1 100644
+--- a/src/modules_contrib/garden/garden_webservices/Makefile.in
++++ b/src/modules_contrib/garden/garden_webservices/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgarden_webservices_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21086,7 +23330,7 @@ Index: saga/src/modules_contrib/garden/garden_webservices/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21094,7 +23338,7 @@ Index: saga/src/modules_contrib/garden/garden_webservices/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21102,7 +23346,7 @@ Index: saga/src/modules_contrib/garden/garden_webservices/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21110,11 +23354,53 @@ Index: saga/src/modules_contrib/garden/garden_webservices/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_geostatistics/Makefile.in
-===================================================================
---- saga.orig/src/modules_geostatistics/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_geostatistics/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -329,7 +337,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgarden_webservices.la: $(libgarden_webservices_la_OBJECTS) $(libgarden_webservices_la_DEPENDENCIES)
++libgarden_webservices.la: $(libgarden_webservices_la_OBJECTS) $(libgarden_webservices_la_DEPENDENCIES) $(EXTRA_libgarden_webservices_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgarden_webservices_la_OBJECTS) $(libgarden_webservices_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -468,10 +476,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_geostatistics/Makefile.in b/src/modules_geostatistics/Makefile.in
+index b8cb4ff..e91fb28 100644
+--- a/src/modules_geostatistics/Makefile.in
++++ b/src/modules_geostatistics/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21122,7 +23408,7 @@ Index: saga/src/modules_geostatistics/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21130,7 +23416,7 @@ Index: saga/src/modules_geostatistics/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21138,7 +23424,7 @@ Index: saga/src/modules_geostatistics/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21146,11 +23432,44 @@ Index: saga/src/modules_geostatistics/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_geostatistics/geostatistics/Makefile.in
-===================================================================
---- saga.orig/src/modules_geostatistics/geostatistics/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_geostatistics/geostatistics/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -115,6 +115,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_geostatistics/geostatistics/Makefile.in b/src/modules_geostatistics/geostatistics/Makefile.in
+index eeff88a..88d065d 100644
+--- a/src/modules_geostatistics/geostatistics/Makefile.in
++++ b/src/modules_geostatistics/geostatistics/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -115,6 +115,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21158,7 +23477,7 @@ Index: saga/src/modules_geostatistics/geostatistics/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -141,6 +142,7 @@
+@@ -141,6 +142,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21166,7 +23485,7 @@ Index: saga/src/modules_geostatistics/geostatistics/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -179,6 +181,7 @@
+@@ -179,6 +181,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21174,7 +23493,7 @@ Index: saga/src/modules_geostatistics/geostatistics/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -212,7 +215,6 @@
+@@ -212,7 +215,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21182,11 +23501,57 @@ Index: saga/src/modules_geostatistics/geostatistics/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
-===================================================================
---- saga.orig/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -132,6 +132,7 @@
+@@ -482,10 +484,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
+index a4c8283..31b982e 100644
+--- a/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
++++ b/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgeostatistics_grid_la_DEPENDENCIES = \
+@@ -132,6 +138,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21194,7 +23559,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@
+@@ -158,6 +165,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21202,7 +23567,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@
+@@ -196,6 +204,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21210,7 +23575,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@
+@@ -229,7 +238,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21218,11 +23583,66 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
-===================================================================
---- saga.orig/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -134,6 +134,7 @@
+@@ -350,7 +358,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgeostatistics_grid.la: $(libgeostatistics_grid_la_OBJECTS) $(libgeostatistics_grid_la_DEPENDENCIES)
++libgeostatistics_grid.la: $(libgeostatistics_grid_la_OBJECTS) $(libgeostatistics_grid_la_DEPENDENCIES) $(EXTRA_libgeostatistics_grid_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_grid_la_OBJECTS) $(libgeostatistics_grid_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -497,10 +505,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
+index 347e1f6..c4c0958 100644
+--- a/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
++++ b/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -72,6 +72,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgeostatistics_kriging_la_DEPENDENCIES = \
+@@ -134,6 +140,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21230,7 +23650,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefi
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -160,6 +161,7 @@
+@@ -160,6 +167,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21238,7 +23658,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefi
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -198,6 +200,7 @@
+@@ -198,6 +206,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21246,7 +23666,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefi
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -231,7 +234,6 @@
+@@ -231,7 +240,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21254,11 +23674,66 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefi
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
-===================================================================
---- saga.orig/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -130,6 +130,7 @@
+@@ -355,7 +363,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgeostatistics_kriging.la: $(libgeostatistics_kriging_la_OBJECTS) $(libgeostatistics_kriging_la_DEPENDENCIES)
++libgeostatistics_kriging.la: $(libgeostatistics_kriging_la_OBJECTS) $(libgeostatistics_kriging_la_DEPENDENCIES) $(EXTRA_libgeostatistics_kriging_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_kriging_la_OBJECTS) $(libgeostatistics_kriging_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -504,10 +512,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
+index 37b0bf4..4e73e9e 100644
+--- a/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
++++ b/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgeostatistics_points_la_DEPENDENCIES = \
+@@ -130,6 +136,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21266,7 +23741,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_points/Makefil
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@
+@@ -156,6 +163,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21274,7 +23749,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_points/Makefil
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@
+@@ -194,6 +202,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21282,7 +23757,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_points/Makefil
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@
+@@ -227,7 +236,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21290,11 +23765,66 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_points/Makefil
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
-===================================================================
---- saga.orig/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -132,6 +132,7 @@
+@@ -338,7 +346,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgeostatistics_points.la: $(libgeostatistics_points_la_OBJECTS) $(libgeostatistics_points_la_DEPENDENCIES)
++libgeostatistics_points.la: $(libgeostatistics_points_la_OBJECTS) $(libgeostatistics_points_la_DEPENDENCIES) $(EXTRA_libgeostatistics_points_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_points_la_OBJECTS) $(libgeostatistics_points_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -480,10 +488,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
+index 5b1aaaa..c788b67 100644
+--- a/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
++++ b/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgeostatistics_regression_la_DEPENDENCIES = \
+@@ -132,6 +138,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21302,7 +23832,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_regression/Mak
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@
+@@ -158,6 +165,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21310,7 +23840,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_regression/Mak
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@
+@@ -196,6 +204,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21318,7 +23848,7 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_regression/Mak
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@
+@@ -229,7 +238,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21326,11 +23856,53 @@ Index: saga/src/modules_geostatistics/geostatistics/geostatistics_regression/Mak
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_images/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -348,7 +356,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libgeostatistics_regression.la: $(libgeostatistics_regression_la_OBJECTS) $(libgeostatistics_regression_la_DEPENDENCIES)
++libgeostatistics_regression.la: $(libgeostatistics_regression_la_OBJECTS) $(libgeostatistics_regression_la_DEPENDENCIES) $(EXTRA_libgeostatistics_regression_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_regression_la_OBJECTS) $(libgeostatistics_regression_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -494,10 +502,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/Makefile.in b/src/modules_images/Makefile.in
+index cf72430..5b606dd 100644
+--- a/src/modules_images/Makefile.in
++++ b/src/modules_images/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21338,7 +23910,7 @@ Index: saga/src/modules_images/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21346,7 +23918,7 @@ Index: saga/src/modules_images/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21354,7 +23926,7 @@ Index: saga/src/modules_images/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21362,11 +23934,44 @@ Index: saga/src/modules_images/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/modules_imagery/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/modules_imagery/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_images/modules_imagery/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/modules_imagery/Makefile.in b/src/modules_images/modules_imagery/Makefile.in
+index a0afe21..82b7ff0 100644
+--- a/src/modules_images/modules_imagery/Makefile.in
++++ b/src/modules_images/modules_imagery/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21374,7 +23979,7 @@ Index: saga/src/modules_images/modules_imagery/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21382,7 +23987,7 @@ Index: saga/src/modules_images/modules_imagery/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21390,7 +23995,7 @@ Index: saga/src/modules_images/modules_imagery/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21398,11 +24003,57 @@ Index: saga/src/modules_images/modules_imagery/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/modules_imagery/imagery_classification/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/modules_imagery/imagery_classification/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_images/modules_imagery/imagery_classification/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/modules_imagery/imagery_classification/Makefile.in b/src/modules_images/modules_imagery/imagery_classification/Makefile.in
+index 359a850..0294d24 100644
+--- a/src/modules_images/modules_imagery/imagery_classification/Makefile.in
++++ b/src/modules_images/modules_imagery/imagery_classification/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libimagery_classification_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21410,7 +24061,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_classification/Makefile.i
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21418,7 +24069,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_classification/Makefile.i
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21426,7 +24077,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_classification/Makefile.i
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21434,11 +24085,66 @@ Index: saga/src/modules_images/modules_imagery/imagery_classification/Makefile.i
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/modules_imagery/imagery_rga/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/modules_imagery/imagery_rga/Makefile.in 2012-01-09 14:09:37.000000000 +0100
-+++ saga/src/modules_images/modules_imagery/imagery_rga/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -126,6 +126,7 @@
+@@ -331,7 +339,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libimagery_classification.la: $(libimagery_classification_la_OBJECTS) $(libimagery_classification_la_DEPENDENCIES)
++libimagery_classification.la: $(libimagery_classification_la_OBJECTS) $(libimagery_classification_la_DEPENDENCIES) $(EXTRA_libimagery_classification_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libimagery_classification_la_OBJECTS) $(libimagery_classification_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -472,10 +480,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/modules_imagery/imagery_rga/Makefile.in b/src/modules_images/modules_imagery/imagery_rga/Makefile.in
+index 98847fd..877f9a0 100644
+--- a/src/modules_images/modules_imagery/imagery_rga/Makefile.in
++++ b/src/modules_images/modules_imagery/imagery_rga/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libimagery_rga_la_DEPENDENCIES = \
+@@ -126,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21446,7 +24152,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_rga/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@
+@@ -152,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21454,7 +24160,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_rga/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@
+@@ -190,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21462,7 +24168,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_rga/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@
+@@ -223,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21470,11 +24176,66 @@ Index: saga/src/modules_images/modules_imagery/imagery_rga/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -326,7 +334,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libimagery_rga.la: $(libimagery_rga_la_OBJECTS) $(libimagery_rga_la_DEPENDENCIES)
++libimagery_rga.la: $(libimagery_rga_la_OBJECTS) $(libimagery_rga_la_DEPENDENCIES) $(EXTRA_libimagery_rga_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libimagery_rga_la_OBJECTS) $(libimagery_rga_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -464,10 +472,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in b/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
+index 6228f95..8e544ad 100644
+--- a/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
++++ b/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libimagery_segmentation_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21482,7 +24243,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21490,7 +24251,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21498,7 +24259,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21506,11 +24267,66 @@ Index: saga/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/modules_imagery/imagery_tools/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/modules_imagery/imagery_tools/Makefile.in 2012-01-09 14:09:37.000000000 +0100
-+++ saga/src/modules_images/modules_imagery/imagery_tools/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -127,6 +127,7 @@
+@@ -334,7 +342,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libimagery_segmentation.la: $(libimagery_segmentation_la_OBJECTS) $(libimagery_segmentation_la_DEPENDENCIES)
++libimagery_segmentation.la: $(libimagery_segmentation_la_OBJECTS) $(libimagery_segmentation_la_DEPENDENCIES) $(EXTRA_libimagery_segmentation_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libimagery_segmentation_la_OBJECTS) $(libimagery_segmentation_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -475,10 +483,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/modules_imagery/imagery_tools/Makefile.in b/src/modules_images/modules_imagery/imagery_tools/Makefile.in
+index 5af3e96..b6daad5 100644
+--- a/src/modules_images/modules_imagery/imagery_tools/Makefile.in
++++ b/src/modules_images/modules_imagery/imagery_tools/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libimagery_tools_la_DEPENDENCIES = \
+@@ -127,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21518,7 +24334,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_tools/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@
+@@ -153,6 +160,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21526,7 +24342,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_tools/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@
+@@ -191,6 +199,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21534,7 +24350,7 @@ Index: saga/src/modules_images/modules_imagery/imagery_tools/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +227,6 @@
+@@ -224,7 +233,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21542,11 +24358,53 @@ Index: saga/src/modules_images/modules_imagery/imagery_tools/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/modules_opencv/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/modules_opencv/Makefile.in 2012-01-09 14:09:37.000000000 +0100
-+++ saga/src/modules_images/modules_opencv/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -325,7 +333,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libimagery_tools.la: $(libimagery_tools_la_OBJECTS) $(libimagery_tools_la_DEPENDENCIES)
++libimagery_tools.la: $(libimagery_tools_la_OBJECTS) $(libimagery_tools_la_DEPENDENCIES) $(EXTRA_libimagery_tools_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libimagery_tools_la_OBJECTS) $(libimagery_tools_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -464,10 +472,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/modules_opencv/Makefile.in b/src/modules_images/modules_opencv/Makefile.in
+index 9f3e6b6..7aa9f82 100644
+--- a/src/modules_images/modules_opencv/Makefile.in
++++ b/src/modules_images/modules_opencv/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21554,7 +24412,7 @@ Index: saga/src/modules_images/modules_opencv/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21562,7 +24420,7 @@ Index: saga/src/modules_images/modules_opencv/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21570,7 +24428,7 @@ Index: saga/src/modules_images/modules_opencv/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21578,11 +24436,57 @@ Index: saga/src/modules_images/modules_opencv/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/modules_opencv/opencv/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/modules_opencv/opencv/Makefile.in 2012-01-09 14:09:37.000000000 +0100
-+++ saga/src/modules_images/modules_opencv/opencv/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -132,6 +132,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/modules_opencv/opencv/Makefile.in b/src/modules_images/modules_opencv/opencv/Makefile.in
+index 633786a..5d1348b 100644
+--- a/src/modules_images/modules_opencv/opencv/Makefile.in
++++ b/src/modules_images/modules_opencv/opencv/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ @HAVE_CV_TRUE at libopencv_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
+@@ -132,6 +138,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21590,7 +24494,7 @@ Index: saga/src/modules_images/modules_opencv/opencv/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@
+@@ -158,6 +165,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21598,7 +24502,7 @@ Index: saga/src/modules_images/modules_opencv/opencv/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@
+@@ -196,6 +204,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21606,7 +24510,7 @@ Index: saga/src/modules_images/modules_opencv/opencv/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@
+@@ -229,7 +238,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21614,11 +24518,53 @@ Index: saga/src/modules_images/modules_opencv/opencv/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/modules_vigra/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/modules_vigra/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_images/modules_vigra/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -338,7 +346,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libopencv.la: $(libopencv_la_OBJECTS) $(libopencv_la_DEPENDENCIES)
++libopencv.la: $(libopencv_la_OBJECTS) $(libopencv_la_DEPENDENCIES) $(EXTRA_libopencv_la_DEPENDENCIES)
+ $(CXXLINK) $(am_libopencv_la_rpath) $(libopencv_la_OBJECTS) $(libopencv_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -479,10 +487,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/modules_vigra/Makefile.in b/src/modules_images/modules_vigra/Makefile.in
+index df8a402..08cdb94 100644
+--- a/src/modules_images/modules_vigra/Makefile.in
++++ b/src/modules_images/modules_vigra/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21626,7 +24572,7 @@ Index: saga/src/modules_images/modules_vigra/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21634,7 +24580,7 @@ Index: saga/src/modules_images/modules_vigra/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21642,7 +24588,7 @@ Index: saga/src/modules_images/modules_vigra/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21650,11 +24596,57 @@ Index: saga/src/modules_images/modules_vigra/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_images/modules_vigra/vigra/Makefile.in
-===================================================================
---- saga.orig/src/modules_images/modules_vigra/vigra/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_images/modules_vigra/vigra/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -134,6 +134,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_images/modules_vigra/vigra/Makefile.in b/src/modules_images/modules_vigra/vigra/Makefile.in
+index 811d21b..359490f 100644
+--- a/src/modules_images/modules_vigra/vigra/Makefile.in
++++ b/src/modules_images/modules_vigra/vigra/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ @HAVE_VIGRA_TRUE at libvigra_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
+@@ -134,6 +140,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21662,7 +24654,7 @@ Index: saga/src/modules_images/modules_vigra/vigra/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -160,6 +161,7 @@
+@@ -160,6 +167,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21670,7 +24662,7 @@ Index: saga/src/modules_images/modules_vigra/vigra/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -198,6 +200,7 @@
+@@ -198,6 +206,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21678,7 +24670,7 @@ Index: saga/src/modules_images/modules_vigra/vigra/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -231,7 +234,6 @@
+@@ -231,7 +240,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21686,11 +24678,53 @@ Index: saga/src/modules_images/modules_vigra/vigra/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -346,7 +354,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libvigra.la: $(libvigra_la_OBJECTS) $(libvigra_la_DEPENDENCIES)
++libvigra.la: $(libvigra_la_OBJECTS) $(libvigra_la_DEPENDENCIES) $(EXTRA_libvigra_la_DEPENDENCIES)
+ $(CXXLINK) $(am_libvigra_la_rpath) $(libvigra_la_OBJECTS) $(libvigra_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -490,10 +498,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/Makefile.in b/src/modules_io/Makefile.in
+index 3ecaf52..6f6f28f 100644
+--- a/src/modules_io/Makefile.in
++++ b/src/modules_io/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21698,7 +24732,7 @@ Index: saga/src/modules_io/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21706,7 +24740,7 @@ Index: saga/src/modules_io/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21714,7 +24748,7 @@ Index: saga/src/modules_io/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21722,11 +24756,44 @@ Index: saga/src/modules_io/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/db/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/db/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/db/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/db/Makefile.in b/src/modules_io/db/Makefile.in
+index be2b6fb..bb93dfd 100644
+--- a/src/modules_io/db/Makefile.in
++++ b/src/modules_io/db/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21734,7 +24801,7 @@ Index: saga/src/modules_io/db/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21742,7 +24809,7 @@ Index: saga/src/modules_io/db/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21750,7 +24817,7 @@ Index: saga/src/modules_io/db/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21758,11 +24825,57 @@ Index: saga/src/modules_io/db/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/db/io_odbc/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/db/io_odbc/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/db/io_odbc/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -481,10 +483,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/db/io_odbc/Makefile.in b/src/modules_io/db/io_odbc/Makefile.in
+index 43f2033..d331224 100644
+--- a/src/modules_io/db/io_odbc/Makefile.in
++++ b/src/modules_io/db/io_odbc/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libio_odbc_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21770,7 +24883,7 @@ Index: saga/src/modules_io/db/io_odbc/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21778,7 +24891,7 @@ Index: saga/src/modules_io/db/io_odbc/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21786,7 +24899,7 @@ Index: saga/src/modules_io/db/io_odbc/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21794,11 +24907,53 @@ Index: saga/src/modules_io/db/io_odbc/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/docs/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/docs/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/docs/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -334,7 +342,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_odbc.la: $(libio_odbc_la_OBJECTS) $(libio_odbc_la_DEPENDENCIES)
++libio_odbc.la: $(libio_odbc_la_OBJECTS) $(libio_odbc_la_DEPENDENCIES) $(EXTRA_libio_odbc_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_odbc_la_OBJECTS) $(libio_odbc_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -475,10 +483,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/docs/Makefile.in b/src/modules_io/docs/Makefile.in
+index 4ec365f..6f80ac4 100644
+--- a/src/modules_io/docs/Makefile.in
++++ b/src/modules_io/docs/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21806,7 +24961,7 @@ Index: saga/src/modules_io/docs/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21814,7 +24969,7 @@ Index: saga/src/modules_io/docs/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21822,7 +24977,7 @@ Index: saga/src/modules_io/docs/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21830,11 +24985,57 @@ Index: saga/src/modules_io/docs/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/docs/docs_html/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/docs/docs_html/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/docs/docs_html/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -127,6 +127,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/docs/docs_html/Makefile.in b/src/modules_io/docs/docs_html/Makefile.in
+index 3119327..2639e94 100644
+--- a/src/modules_io/docs/docs_html/Makefile.in
++++ b/src/modules_io/docs/docs_html/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libdocs_html_la_DEPENDENCIES = \
+@@ -127,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21842,7 +25043,7 @@ Index: saga/src/modules_io/docs/docs_html/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@
+@@ -153,6 +160,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21850,7 +25051,7 @@ Index: saga/src/modules_io/docs/docs_html/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@
+@@ -191,6 +199,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21858,7 +25059,7 @@ Index: saga/src/modules_io/docs/docs_html/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +227,6 @@
+@@ -224,7 +233,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21866,11 +25067,66 @@ Index: saga/src/modules_io/docs/docs_html/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/docs/docs_pdf/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/docs/docs_pdf/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/docs/docs_pdf/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -132,6 +132,7 @@
+@@ -333,7 +341,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libdocs_html.la: $(libdocs_html_la_OBJECTS) $(libdocs_html_la_DEPENDENCIES)
++libdocs_html.la: $(libdocs_html_la_OBJECTS) $(libdocs_html_la_DEPENDENCIES) $(EXTRA_libdocs_html_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libdocs_html_la_OBJECTS) $(libdocs_html_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -474,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/docs/docs_pdf/Makefile.in b/src/modules_io/docs/docs_pdf/Makefile.in
+index 21e460f..e07ab93 100644
+--- a/src/modules_io/docs/docs_pdf/Makefile.in
++++ b/src/modules_io/docs/docs_pdf/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ @HAVE_HARU_TRUE at libdocs_pdf_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
+@@ -132,6 +138,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21878,7 +25134,7 @@ Index: saga/src/modules_io/docs/docs_pdf/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@
+@@ -158,6 +165,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21886,7 +25142,7 @@ Index: saga/src/modules_io/docs/docs_pdf/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@
+@@ -196,6 +204,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21894,7 +25150,7 @@ Index: saga/src/modules_io/docs/docs_pdf/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@
+@@ -229,7 +238,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21902,11 +25158,53 @@ Index: saga/src/modules_io/docs/docs_pdf/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/esri_e00/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/esri_e00/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/esri_e00/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -338,7 +346,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libdocs_pdf.la: $(libdocs_pdf_la_OBJECTS) $(libdocs_pdf_la_DEPENDENCIES)
++libdocs_pdf.la: $(libdocs_pdf_la_OBJECTS) $(libdocs_pdf_la_DEPENDENCIES) $(EXTRA_libdocs_pdf_la_DEPENDENCIES)
+ $(CXXLINK) $(am_libdocs_pdf_la_rpath) $(libdocs_pdf_la_OBJECTS) $(libdocs_pdf_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -479,10 +487,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/esri_e00/Makefile.in b/src/modules_io/esri_e00/Makefile.in
+index 4427de6..c4839d3 100644
+--- a/src/modules_io/esri_e00/Makefile.in
++++ b/src/modules_io/esri_e00/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21914,7 +25212,7 @@ Index: saga/src/modules_io/esri_e00/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21922,7 +25220,7 @@ Index: saga/src/modules_io/esri_e00/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21930,7 +25228,7 @@ Index: saga/src/modules_io/esri_e00/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21938,11 +25236,57 @@ Index: saga/src/modules_io/esri_e00/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/esri_e00/io_esri_e00/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/esri_e00/io_esri_e00/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/esri_e00/io_esri_e00/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/esri_e00/io_esri_e00/Makefile.in b/src/modules_io/esri_e00/io_esri_e00/Makefile.in
+index f765811..1378609 100644
+--- a/src/modules_io/esri_e00/io_esri_e00/Makefile.in
++++ b/src/modules_io/esri_e00/io_esri_e00/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libio_esri_e00_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21950,7 +25294,7 @@ Index: saga/src/modules_io/esri_e00/io_esri_e00/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21958,7 +25302,7 @@ Index: saga/src/modules_io/esri_e00/io_esri_e00/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -21966,7 +25310,7 @@ Index: saga/src/modules_io/esri_e00/io_esri_e00/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -21974,11 +25318,53 @@ Index: saga/src/modules_io/esri_e00/io_esri_e00/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/gdal/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/gdal/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/gdal/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -338,7 +346,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_esri_e00.la: $(libio_esri_e00_la_OBJECTS) $(libio_esri_e00_la_DEPENDENCIES)
++libio_esri_e00.la: $(libio_esri_e00_la_OBJECTS) $(libio_esri_e00_la_DEPENDENCIES) $(EXTRA_libio_esri_e00_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_esri_e00_la_OBJECTS) $(libio_esri_e00_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -537,10 +545,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/gdal/Makefile.in b/src/modules_io/gdal/Makefile.in
+index f0b2207..ea8e3dd 100644
+--- a/src/modules_io/gdal/Makefile.in
++++ b/src/modules_io/gdal/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -21986,7 +25372,7 @@ Index: saga/src/modules_io/gdal/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -21994,7 +25380,7 @@ Index: saga/src/modules_io/gdal/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22002,7 +25388,7 @@ Index: saga/src/modules_io/gdal/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22010,11 +25396,57 @@ Index: saga/src/modules_io/gdal/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/gdal/io_gdal/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/gdal/io_gdal/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/gdal/io_gdal/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/gdal/io_gdal/Makefile.in b/src/modules_io/gdal/io_gdal/Makefile.in
+index 8208f1f..38a9e8b 100644
+--- a/src/modules_io/gdal/io_gdal/Makefile.in
++++ b/src/modules_io/gdal/io_gdal/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libio_gdal_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22022,7 +25454,7 @@ Index: saga/src/modules_io/gdal/io_gdal/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22030,7 +25462,7 @@ Index: saga/src/modules_io/gdal/io_gdal/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22038,7 +25470,7 @@ Index: saga/src/modules_io/gdal/io_gdal/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22046,11 +25478,53 @@ Index: saga/src/modules_io/gdal/io_gdal/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/gps/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/gps/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/gps/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -341,7 +349,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_gdal.la: $(libio_gdal_la_OBJECTS) $(libio_gdal_la_DEPENDENCIES)
++libio_gdal.la: $(libio_gdal_la_OBJECTS) $(libio_gdal_la_DEPENDENCIES) $(EXTRA_libio_gdal_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_gdal_la_OBJECTS) $(libio_gdal_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -485,10 +493,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/gps/Makefile.in b/src/modules_io/gps/Makefile.in
+index a47d4c6..f47d80c 100644
+--- a/src/modules_io/gps/Makefile.in
++++ b/src/modules_io/gps/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22058,7 +25532,7 @@ Index: saga/src/modules_io/gps/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22066,7 +25540,7 @@ Index: saga/src/modules_io/gps/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22074,7 +25548,7 @@ Index: saga/src/modules_io/gps/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22082,11 +25556,57 @@ Index: saga/src/modules_io/gps/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/gps/io_gps/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/gps/io_gps/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/gps/io_gps/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -126,6 +126,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/gps/io_gps/Makefile.in b/src/modules_io/gps/io_gps/Makefile.in
+index 08067ac..107509d 100644
+--- a/src/modules_io/gps/io_gps/Makefile.in
++++ b/src/modules_io/gps/io_gps/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libio_gps_la_DEPENDENCIES = \
+@@ -126,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22094,7 +25614,7 @@ Index: saga/src/modules_io/gps/io_gps/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@
+@@ -152,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22102,7 +25622,7 @@ Index: saga/src/modules_io/gps/io_gps/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@
+@@ -190,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22110,7 +25630,7 @@ Index: saga/src/modules_io/gps/io_gps/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@
+@@ -223,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22118,11 +25638,53 @@ Index: saga/src/modules_io/gps/io_gps/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/grid/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -328,7 +336,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_gps.la: $(libio_gps_la_OBJECTS) $(libio_gps_la_DEPENDENCIES)
++libio_gps.la: $(libio_gps_la_OBJECTS) $(libio_gps_la_DEPENDENCIES) $(EXTRA_libio_gps_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_gps_la_OBJECTS) $(libio_gps_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -467,10 +475,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/grid/Makefile.in b/src/modules_io/grid/Makefile.in
+index 83a11d7..041fa12 100644
+--- a/src/modules_io/grid/Makefile.in
++++ b/src/modules_io/grid/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22130,7 +25692,7 @@ Index: saga/src/modules_io/grid/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22138,7 +25700,7 @@ Index: saga/src/modules_io/grid/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22146,7 +25708,7 @@ Index: saga/src/modules_io/grid/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22154,11 +25716,57 @@ Index: saga/src/modules_io/grid/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/grid/io_grid/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/grid/io_grid/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/grid/io_grid/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/grid/io_grid/Makefile.in b/src/modules_io/grid/io_grid/Makefile.in
+index ba4d0db..d4d8156 100644
+--- a/src/modules_io/grid/io_grid/Makefile.in
++++ b/src/modules_io/grid/io_grid/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libio_grid_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22166,7 +25774,7 @@ Index: saga/src/modules_io/grid/io_grid/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22174,7 +25782,7 @@ Index: saga/src/modules_io/grid/io_grid/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22182,7 +25790,7 @@ Index: saga/src/modules_io/grid/io_grid/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22190,11 +25798,63 @@ Index: saga/src/modules_io/grid/io_grid/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/grid/io_grid_grib2/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/grid/io_grid_grib2/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -75,31 +75,12 @@
+@@ -348,7 +356,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_grid.la: $(libio_grid_la_OBJECTS) $(libio_grid_la_DEPENDENCIES)
++libio_grid.la: $(libio_grid_la_OBJECTS) $(libio_grid_la_DEPENDENCIES) $(EXTRA_libio_grid_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_grid_la_OBJECTS) $(libio_grid_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -496,10 +504,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.in b/src/modules_io/grid/io_grid_grib2/Makefile.in
+index b661d76..e917ee1 100644
+--- a/src/modules_io/grid/io_grid_grib2/Makefile.in
++++ b/src/modules_io/grid/io_grid_grib2/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,35 +71,22 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
libio_grid_grib2_la_DEPENDENCIES = \
$(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
@@ -22227,7 +25887,7 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -109,6 +90,15 @@
+@@ -109,6 +96,15 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -22243,7 +25903,7 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
SOURCES = $(libio_grid_grib2_la_SOURCES)
DIST_SOURCES = $(libio_grid_grib2_la_SOURCES)
ETAGS = etags
-@@ -136,6 +126,7 @@
+@@ -136,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22251,7 +25911,7 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -162,6 +153,7 @@
+@@ -162,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22259,7 +25919,7 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -200,6 +192,7 @@
+@@ -200,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22267,7 +25927,7 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -233,7 +226,6 @@
+@@ -233,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22275,8 +25935,12 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -266,54 +258,6 @@
- AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
+@@ -263,57 +261,9 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PN
+ CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS)
+ AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
+ #AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper
+-AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
++AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper -lgrib2c
pkglib_LTLIBRARIES = libio_grid_grib2.la
libio_grid_grib2_la_SOURCES = \
-./g2clib-1.0.4/cmplxpack.c\
@@ -22330,7 +25994,7 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
grib2_import.cpp\
MLB_Interface.cpp\
grib2_import.h\
-@@ -323,7 +267,7 @@
+@@ -323,7 +273,7 @@ libio_grid_grib2_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
all: all-am
.SUFFIXES:
@@ -22339,7 +26003,16 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -395,380 +339,7 @@
+@@ -385,7 +335,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_grid_grib2.la: $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_DEPENDENCIES)
++libio_grid_grib2.la: $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_DEPENDENCIES) $(EXTRA_libio_grid_grib2_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -395,380 +345,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MLB_Interface.Plo at am__quote@
@@ -22720,11 +26393,57 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.in
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-Index: saga/src/modules_io/grid/io_grid_image/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/grid/io_grid_image/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/grid/io_grid_image/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -127,6 +127,7 @@
+@@ -896,10 +473,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/grid/io_grid_image/Makefile.in b/src/modules_io/grid/io_grid_image/Makefile.in
+index ccf4c5c..497f6cf 100644
+--- a/src/modules_io/grid/io_grid_image/Makefile.in
++++ b/src/modules_io/grid/io_grid_image/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libio_grid_image_la_DEPENDENCIES = \
+@@ -127,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22732,7 +26451,7 @@ Index: saga/src/modules_io/grid/io_grid_image/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@
+@@ -153,6 +160,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22740,7 +26459,7 @@ Index: saga/src/modules_io/grid/io_grid_image/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@
+@@ -191,6 +199,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22748,7 +26467,7 @@ Index: saga/src/modules_io/grid/io_grid_image/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +227,6 @@
+@@ -224,7 +233,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22756,11 +26475,53 @@ Index: saga/src/modules_io/grid/io_grid_image/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/shapes/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/shapes/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/shapes/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -328,7 +336,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_grid_image.la: $(libio_grid_image_la_OBJECTS) $(libio_grid_image_la_DEPENDENCIES)
++libio_grid_image.la: $(libio_grid_image_la_OBJECTS) $(libio_grid_image_la_DEPENDENCIES) $(EXTRA_libio_grid_image_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_grid_image_la_OBJECTS) $(libio_grid_image_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -467,10 +475,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/shapes/Makefile.in b/src/modules_io/shapes/Makefile.in
+index f59764f..0a1052f 100644
+--- a/src/modules_io/shapes/Makefile.in
++++ b/src/modules_io/shapes/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22768,7 +26529,7 @@ Index: saga/src/modules_io/shapes/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22776,7 +26537,7 @@ Index: saga/src/modules_io/shapes/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22784,7 +26545,7 @@ Index: saga/src/modules_io/shapes/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22792,11 +26553,57 @@ Index: saga/src/modules_io/shapes/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/shapes/io_shapes/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/shapes/io_shapes/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/shapes/io_shapes/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/shapes/io_shapes/Makefile.in b/src/modules_io/shapes/io_shapes/Makefile.in
+index 34f368e..7fc3c88 100644
+--- a/src/modules_io/shapes/io_shapes/Makefile.in
++++ b/src/modules_io/shapes/io_shapes/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libio_shapes_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22804,7 +26611,7 @@ Index: saga/src/modules_io/shapes/io_shapes/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22812,7 +26619,7 @@ Index: saga/src/modules_io/shapes/io_shapes/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22820,7 +26627,7 @@ Index: saga/src/modules_io/shapes/io_shapes/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22828,11 +26635,66 @@ Index: saga/src/modules_io/shapes/io_shapes/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/shapes/io_shapes_dxf/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/shapes/io_shapes_dxf/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/shapes/io_shapes_dxf/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -127,6 +127,7 @@
+@@ -355,7 +363,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_shapes.la: $(libio_shapes_la_OBJECTS) $(libio_shapes_la_DEPENDENCIES)
++libio_shapes.la: $(libio_shapes_la_OBJECTS) $(libio_shapes_la_DEPENDENCIES) $(EXTRA_libio_shapes_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_shapes_la_OBJECTS) $(libio_shapes_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -504,10 +512,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/shapes/io_shapes_dxf/Makefile.in b/src/modules_io/shapes/io_shapes_dxf/Makefile.in
+index d117efd..1f1abe8 100644
+--- a/src/modules_io/shapes/io_shapes_dxf/Makefile.in
++++ b/src/modules_io/shapes/io_shapes_dxf/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libio_shapes_dxf_la_DEPENDENCIES = \
+@@ -127,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22840,7 +26702,7 @@ Index: saga/src/modules_io/shapes/io_shapes_dxf/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -153,6 +154,7 @@
+@@ -153,6 +160,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22848,7 +26710,7 @@ Index: saga/src/modules_io/shapes/io_shapes_dxf/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -191,6 +193,7 @@
+@@ -191,6 +199,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22856,7 +26718,7 @@ Index: saga/src/modules_io/shapes/io_shapes_dxf/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +227,6 @@
+@@ -224,7 +233,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22864,11 +26726,66 @@ Index: saga/src/modules_io/shapes/io_shapes_dxf/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/shapes/io_shapes_las/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/shapes/io_shapes_las/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/shapes/io_shapes_las/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -130,6 +130,7 @@
+@@ -339,7 +347,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_shapes_dxf.la: $(libio_shapes_dxf_la_OBJECTS) $(libio_shapes_dxf_la_DEPENDENCIES)
++libio_shapes_dxf.la: $(libio_shapes_dxf_la_OBJECTS) $(libio_shapes_dxf_la_DEPENDENCIES) $(EXTRA_libio_shapes_dxf_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_shapes_dxf_la_OBJECTS) $(libio_shapes_dxf_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -493,10 +501,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/shapes/io_shapes_las/Makefile.in b/src/modules_io/shapes/io_shapes_las/Makefile.in
+index 07a4001..ef9779c 100644
+--- a/src/modules_io/shapes/io_shapes_las/Makefile.in
++++ b/src/modules_io/shapes/io_shapes_las/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ @HAVE_LLAS_TRUE at libio_shapes_las_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
+@@ -130,6 +136,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22876,7 +26793,7 @@ Index: saga/src/modules_io/shapes/io_shapes_las/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@
+@@ -156,6 +163,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22884,7 +26801,7 @@ Index: saga/src/modules_io/shapes/io_shapes_las/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@
+@@ -194,6 +202,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22892,7 +26809,7 @@ Index: saga/src/modules_io/shapes/io_shapes_las/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@
+@@ -227,7 +236,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22900,11 +26817,53 @@ Index: saga/src/modules_io/shapes/io_shapes_las/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/table/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/table/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/table/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -335,7 +343,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_shapes_las.la: $(libio_shapes_las_la_OBJECTS) $(libio_shapes_las_la_DEPENDENCIES)
++libio_shapes_las.la: $(libio_shapes_las_la_OBJECTS) $(libio_shapes_las_la_DEPENDENCIES) $(EXTRA_libio_shapes_las_la_DEPENDENCIES)
+ $(CXXLINK) $(am_libio_shapes_las_la_rpath) $(libio_shapes_las_la_OBJECTS) $(libio_shapes_las_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -475,10 +483,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/table/Makefile.in b/src/modules_io/table/Makefile.in
+index 28899dd..eddba38 100644
+--- a/src/modules_io/table/Makefile.in
++++ b/src/modules_io/table/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22912,7 +26871,7 @@ Index: saga/src/modules_io/table/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22920,7 +26879,7 @@ Index: saga/src/modules_io/table/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22928,7 +26887,7 @@ Index: saga/src/modules_io/table/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22936,11 +26895,57 @@ Index: saga/src/modules_io/table/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_io/table/io_table/Makefile.in
-===================================================================
---- saga.orig/src/modules_io/table/io_table/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_io/table/io_table/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -126,6 +126,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_io/table/io_table/Makefile.in b/src/modules_io/table/io_table/Makefile.in
+index 82a7764..e29eb79 100644
+--- a/src/modules_io/table/io_table/Makefile.in
++++ b/src/modules_io/table/io_table/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libio_table_la_DEPENDENCIES = \
+@@ -126,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22948,7 +26953,7 @@ Index: saga/src/modules_io/table/io_table/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@
+@@ -152,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22956,7 +26961,7 @@ Index: saga/src/modules_io/table/io_table/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@
+@@ -190,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -22964,7 +26969,7 @@ Index: saga/src/modules_io/table/io_table/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@
+@@ -223,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -22972,11 +26977,53 @@ Index: saga/src/modules_io/table/io_table/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_lectures/Makefile.in
-===================================================================
---- saga.orig/src/modules_lectures/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_lectures/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -326,7 +334,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libio_table.la: $(libio_table_la_OBJECTS) $(libio_table_la_DEPENDENCIES)
++libio_table.la: $(libio_table_la_OBJECTS) $(libio_table_la_DEPENDENCIES) $(EXTRA_libio_table_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libio_table_la_OBJECTS) $(libio_table_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -464,10 +472,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_lectures/Makefile.in b/src/modules_lectures/Makefile.in
+index 1290679..dfecfed 100644
+--- a/src/modules_lectures/Makefile.in
++++ b/src/modules_lectures/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -22984,7 +27031,7 @@ Index: saga/src/modules_lectures/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -22992,7 +27039,7 @@ Index: saga/src/modules_lectures/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23000,7 +27047,7 @@ Index: saga/src/modules_lectures/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23008,11 +27055,44 @@ Index: saga/src/modules_lectures/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_lectures/lectures/Makefile.in
-===================================================================
---- saga.orig/src/modules_lectures/lectures/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_lectures/lectures/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_lectures/lectures/Makefile.in b/src/modules_lectures/lectures/Makefile.in
+index 54cbd37..2bcfe81 100644
+--- a/src/modules_lectures/lectures/Makefile.in
++++ b/src/modules_lectures/lectures/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23020,7 +27100,7 @@ Index: saga/src/modules_lectures/lectures/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23028,7 +27108,7 @@ Index: saga/src/modules_lectures/lectures/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23036,7 +27116,7 @@ Index: saga/src/modules_lectures/lectures/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23044,11 +27124,57 @@ Index: saga/src/modules_lectures/lectures/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_lectures/lectures/lectures_introduction/Makefile.in
-===================================================================
---- saga.orig/src/modules_lectures/lectures/lectures_introduction/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_lectures/lectures/lectures_introduction/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -131,6 +131,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_lectures/lectures/lectures_introduction/Makefile.in b/src/modules_lectures/lectures/lectures_introduction/Makefile.in
+index 97ce82e..9e06ded 100644
+--- a/src/modules_lectures/lectures/lectures_introduction/Makefile.in
++++ b/src/modules_lectures/lectures/lectures_introduction/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ liblectures_introduction_la_DEPENDENCIES = \
+@@ -131,6 +137,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23056,7 +27182,7 @@ Index: saga/src/modules_lectures/lectures/lectures_introduction/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@
+@@ -157,6 +164,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23064,7 +27190,7 @@ Index: saga/src/modules_lectures/lectures/lectures_introduction/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -195,6 +197,7 @@
+@@ -195,6 +203,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23072,7 +27198,7 @@ Index: saga/src/modules_lectures/lectures/lectures_introduction/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -228,7 +231,6 @@
+@@ -228,7 +237,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23080,11 +27206,53 @@ Index: saga/src/modules_lectures/lectures/lectures_introduction/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_projection/Makefile.in
-===================================================================
---- saga.orig/src/modules_projection/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_projection/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -357,7 +365,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-liblectures_introduction.la: $(liblectures_introduction_la_OBJECTS) $(liblectures_introduction_la_DEPENDENCIES)
++liblectures_introduction.la: $(liblectures_introduction_la_OBJECTS) $(liblectures_introduction_la_DEPENDENCIES) $(EXTRA_liblectures_introduction_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(liblectures_introduction_la_OBJECTS) $(liblectures_introduction_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -508,10 +516,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_projection/Makefile.in b/src/modules_projection/Makefile.in
+index ed2ec63..0655e6c 100644
+--- a/src/modules_projection/Makefile.in
++++ b/src/modules_projection/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23092,7 +27260,7 @@ Index: saga/src/modules_projection/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23100,7 +27268,7 @@ Index: saga/src/modules_projection/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23108,7 +27276,7 @@ Index: saga/src/modules_projection/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23116,11 +27284,44 @@ Index: saga/src/modules_projection/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_projection/pj_georeference/Makefile.in
-===================================================================
---- saga.orig/src/modules_projection/pj_georeference/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_projection/pj_georeference/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_projection/pj_georeference/Makefile.in b/src/modules_projection/pj_georeference/Makefile.in
+index 1419917..11939fe 100644
+--- a/src/modules_projection/pj_georeference/Makefile.in
++++ b/src/modules_projection/pj_georeference/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23128,7 +27329,7 @@ Index: saga/src/modules_projection/pj_georeference/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23136,7 +27337,7 @@ Index: saga/src/modules_projection/pj_georeference/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23144,7 +27345,7 @@ Index: saga/src/modules_projection/pj_georeference/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23152,11 +27353,57 @@ Index: saga/src/modules_projection/pj_georeference/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
-===================================================================
---- saga.orig/src/modules_projection/pj_georeference/pj_georeference/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_projection/pj_georeference/pj_georeference/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_projection/pj_georeference/pj_georeference/Makefile.in b/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
+index 521a7e3..a12e6b0 100644
+--- a/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
++++ b/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libpj_georeference_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23164,7 +27411,7 @@ Index: saga/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23172,7 +27419,7 @@ Index: saga/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23180,7 +27427,7 @@ Index: saga/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23188,11 +27435,53 @@ Index: saga/src/modules_projection/pj_georeference/pj_georeference/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_projection/pj_proj4/Makefile.in
-===================================================================
---- saga.orig/src/modules_projection/pj_proj4/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_projection/pj_proj4/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -346,7 +354,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libpj_georeference.la: $(libpj_georeference_la_OBJECTS) $(libpj_georeference_la_DEPENDENCIES)
++libpj_georeference.la: $(libpj_georeference_la_OBJECTS) $(libpj_georeference_la_DEPENDENCIES) $(EXTRA_libpj_georeference_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libpj_georeference_la_OBJECTS) $(libpj_georeference_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -516,10 +524,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_projection/pj_proj4/Makefile.in b/src/modules_projection/pj_proj4/Makefile.in
+index 388a221..a815a07 100644
+--- a/src/modules_projection/pj_proj4/Makefile.in
++++ b/src/modules_projection/pj_proj4/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23200,7 +27489,7 @@ Index: saga/src/modules_projection/pj_proj4/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23208,7 +27497,7 @@ Index: saga/src/modules_projection/pj_proj4/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23216,7 +27505,7 @@ Index: saga/src/modules_projection/pj_proj4/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23224,11 +27513,57 @@ Index: saga/src/modules_projection/pj_proj4/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
-===================================================================
---- saga.orig/src/modules_projection/pj_proj4/pj_proj4/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_projection/pj_proj4/pj_proj4/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_projection/pj_proj4/pj_proj4/Makefile.in b/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
+index 31d447c..ace9fca 100644
+--- a/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
++++ b/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libpj_proj4_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23236,7 +27571,7 @@ Index: saga/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23244,7 +27579,7 @@ Index: saga/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23252,7 +27587,7 @@ Index: saga/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23260,11 +27595,53 @@ Index: saga/src/modules_projection/pj_proj4/pj_proj4/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_recreations/Makefile.in
-===================================================================
---- saga.orig/src/modules_recreations/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_recreations/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -343,7 +351,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libpj_proj4.la: $(libpj_proj4_la_OBJECTS) $(libpj_proj4_la_DEPENDENCIES)
++libpj_proj4.la: $(libpj_proj4_la_OBJECTS) $(libpj_proj4_la_DEPENDENCIES) $(EXTRA_libpj_proj4_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libpj_proj4_la_OBJECTS) $(libpj_proj4_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -488,10 +496,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_recreations/Makefile.in b/src/modules_recreations/Makefile.in
+index 25cb450..a068192 100644
+--- a/src/modules_recreations/Makefile.in
++++ b/src/modules_recreations/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23272,7 +27649,7 @@ Index: saga/src/modules_recreations/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23280,7 +27657,7 @@ Index: saga/src/modules_recreations/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23288,7 +27665,7 @@ Index: saga/src/modules_recreations/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23296,11 +27673,44 @@ Index: saga/src/modules_recreations/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_recreations/recreations/Makefile.in
-===================================================================
---- saga.orig/src/modules_recreations/recreations/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_recreations/recreations/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_recreations/recreations/Makefile.in b/src/modules_recreations/recreations/Makefile.in
+index 176aa98..d9e31a5 100644
+--- a/src/modules_recreations/recreations/Makefile.in
++++ b/src/modules_recreations/recreations/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23308,7 +27718,7 @@ Index: saga/src/modules_recreations/recreations/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23316,7 +27726,7 @@ Index: saga/src/modules_recreations/recreations/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23324,7 +27734,7 @@ Index: saga/src/modules_recreations/recreations/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23332,11 +27742,57 @@ Index: saga/src/modules_recreations/recreations/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_recreations/recreations/recreations_fractals/Makefile.in
-===================================================================
---- saga.orig/src/modules_recreations/recreations/recreations_fractals/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_recreations/recreations/recreations_fractals/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_recreations/recreations/recreations_fractals/Makefile.in b/src/modules_recreations/recreations/recreations_fractals/Makefile.in
+index cfd6d6e..d5adcdc 100644
+--- a/src/modules_recreations/recreations/recreations_fractals/Makefile.in
++++ b/src/modules_recreations/recreations/recreations_fractals/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ librecreations_fractals_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23344,7 +27800,7 @@ Index: saga/src/modules_recreations/recreations/recreations_fractals/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23352,7 +27808,7 @@ Index: saga/src/modules_recreations/recreations/recreations_fractals/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23360,7 +27816,7 @@ Index: saga/src/modules_recreations/recreations/recreations_fractals/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23368,11 +27824,66 @@ Index: saga/src/modules_recreations/recreations/recreations_fractals/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_recreations/recreations/recreations_games/Makefile.in
-===================================================================
---- saga.orig/src/modules_recreations/recreations/recreations_games/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_recreations/recreations/recreations_games/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -339,7 +347,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-librecreations_fractals.la: $(librecreations_fractals_la_OBJECTS) $(librecreations_fractals_la_DEPENDENCIES)
++librecreations_fractals.la: $(librecreations_fractals_la_OBJECTS) $(librecreations_fractals_la_DEPENDENCIES) $(EXTRA_librecreations_fractals_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(librecreations_fractals_la_OBJECTS) $(librecreations_fractals_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -482,10 +490,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_recreations/recreations/recreations_games/Makefile.in b/src/modules_recreations/recreations/recreations_games/Makefile.in
+index 4f5c84c..42ab7e4 100644
+--- a/src/modules_recreations/recreations/recreations_games/Makefile.in
++++ b/src/modules_recreations/recreations/recreations_games/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ librecreations_games_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23380,7 +27891,7 @@ Index: saga/src/modules_recreations/recreations/recreations_games/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23388,7 +27899,7 @@ Index: saga/src/modules_recreations/recreations/recreations_games/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23396,7 +27907,7 @@ Index: saga/src/modules_recreations/recreations/recreations_games/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23404,11 +27915,53 @@ Index: saga/src/modules_recreations/recreations/recreations_games/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_simulation/Makefile.in
-===================================================================
---- saga.orig/src/modules_simulation/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_simulation/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -331,7 +339,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-librecreations_games.la: $(librecreations_games_la_OBJECTS) $(librecreations_games_la_DEPENDENCIES)
++librecreations_games.la: $(librecreations_games_la_OBJECTS) $(librecreations_games_la_DEPENDENCIES) $(EXTRA_librecreations_games_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(librecreations_games_la_OBJECTS) $(librecreations_games_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -471,10 +479,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_simulation/Makefile.in b/src/modules_simulation/Makefile.in
+index 7f211a9..5885fdb 100644
+--- a/src/modules_simulation/Makefile.in
++++ b/src/modules_simulation/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23416,7 +27969,7 @@ Index: saga/src/modules_simulation/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23424,7 +27977,7 @@ Index: saga/src/modules_simulation/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23432,7 +27985,7 @@ Index: saga/src/modules_simulation/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23440,7 +27993,7 @@ Index: saga/src/modules_simulation/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -231,7 +233,7 @@
+@@ -231,7 +233,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -23449,11 +28002,44 @@ Index: saga/src/modules_simulation/Makefile.in
all: all-recursive
.SUFFIXES:
-Index: saga/src/modules_simulation/cellular_automata/Makefile.in
-===================================================================
---- saga.orig/src/modules_simulation/cellular_automata/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_simulation/cellular_automata/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_simulation/cellular_automata/Makefile.in b/src/modules_simulation/cellular_automata/Makefile.in
+index fa3cce8..d7f9db9 100644
+--- a/src/modules_simulation/cellular_automata/Makefile.in
++++ b/src/modules_simulation/cellular_automata/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23461,7 +28047,7 @@ Index: saga/src/modules_simulation/cellular_automata/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23469,7 +28055,7 @@ Index: saga/src/modules_simulation/cellular_automata/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23477,7 +28063,7 @@ Index: saga/src/modules_simulation/cellular_automata/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23485,11 +28071,57 @@ Index: saga/src/modules_simulation/cellular_automata/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in
-===================================================================
---- saga.orig/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in b/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in
+index e10538c..9c27c48 100644
+--- a/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in
++++ b/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libsim_cellular_automata_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23497,7 +28129,7 @@ Index: saga/src/modules_simulation/cellular_automata/sim_cellular_automata/Makef
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23505,7 +28137,7 @@ Index: saga/src/modules_simulation/cellular_automata/sim_cellular_automata/Makef
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23513,7 +28145,7 @@ Index: saga/src/modules_simulation/cellular_automata/sim_cellular_automata/Makef
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23521,11 +28153,53 @@ Index: saga/src/modules_simulation/cellular_automata/sim_cellular_automata/Makef
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_simulation/ecosystems/Makefile.in
-===================================================================
---- saga.orig/src/modules_simulation/ecosystems/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_simulation/ecosystems/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -330,7 +338,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libsim_cellular_automata.la: $(libsim_cellular_automata_la_OBJECTS) $(libsim_cellular_automata_la_DEPENDENCIES)
++libsim_cellular_automata.la: $(libsim_cellular_automata_la_OBJECTS) $(libsim_cellular_automata_la_DEPENDENCIES) $(EXTRA_libsim_cellular_automata_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libsim_cellular_automata_la_OBJECTS) $(libsim_cellular_automata_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -469,10 +477,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_simulation/ecosystems/Makefile.in b/src/modules_simulation/ecosystems/Makefile.in
+index fed2a81..85c44ed 100644
+--- a/src/modules_simulation/ecosystems/Makefile.in
++++ b/src/modules_simulation/ecosystems/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23533,7 +28207,7 @@ Index: saga/src/modules_simulation/ecosystems/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23541,7 +28215,7 @@ Index: saga/src/modules_simulation/ecosystems/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23549,7 +28223,7 @@ Index: saga/src/modules_simulation/ecosystems/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23557,11 +28231,57 @@ Index: saga/src/modules_simulation/ecosystems/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
-===================================================================
---- saga.orig/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in b/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
+index 1f8c1f1..fc34a0c 100644
+--- a/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
++++ b/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libsim_ecosystems_hugget_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23569,7 +28289,7 @@ Index: saga/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23577,7 +28297,7 @@ Index: saga/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23585,7 +28305,7 @@ Index: saga/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23593,11 +28313,53 @@ Index: saga/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_simulation/hydrology/Makefile.in
-===================================================================
---- saga.orig/src/modules_simulation/hydrology/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_simulation/hydrology/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -332,7 +340,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libsim_ecosystems_hugget.la: $(libsim_ecosystems_hugget_la_OBJECTS) $(libsim_ecosystems_hugget_la_DEPENDENCIES)
++libsim_ecosystems_hugget.la: $(libsim_ecosystems_hugget_la_OBJECTS) $(libsim_ecosystems_hugget_la_DEPENDENCIES) $(EXTRA_libsim_ecosystems_hugget_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libsim_ecosystems_hugget_la_OBJECTS) $(libsim_ecosystems_hugget_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -472,10 +480,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_simulation/hydrology/Makefile.in b/src/modules_simulation/hydrology/Makefile.in
+index 5899588..3901913 100644
+--- a/src/modules_simulation/hydrology/Makefile.in
++++ b/src/modules_simulation/hydrology/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23605,7 +28367,7 @@ Index: saga/src/modules_simulation/hydrology/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23613,7 +28375,7 @@ Index: saga/src/modules_simulation/hydrology/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23621,7 +28383,7 @@ Index: saga/src/modules_simulation/hydrology/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23629,11 +28391,57 @@ Index: saga/src/modules_simulation/hydrology/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
-===================================================================
---- saga.orig/src/modules_simulation/hydrology/sim_hydrology/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_simulation/hydrology/sim_hydrology/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_simulation/hydrology/sim_hydrology/Makefile.in b/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
+index f83a80e..43f5b62 100644
+--- a/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
++++ b/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libsim_hydrology_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23641,7 +28449,7 @@ Index: saga/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23649,7 +28457,7 @@ Index: saga/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23657,7 +28465,7 @@ Index: saga/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23665,11 +28473,53 @@ Index: saga/src/modules_simulation/hydrology/sim_hydrology/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_terrain_analysis/Makefile.in
-===================================================================
---- saga.orig/src/modules_terrain_analysis/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_terrain_analysis/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -338,7 +346,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libsim_hydrology.la: $(libsim_hydrology_la_OBJECTS) $(libsim_hydrology_la_DEPENDENCIES)
++libsim_hydrology.la: $(libsim_hydrology_la_OBJECTS) $(libsim_hydrology_la_DEPENDENCIES) $(EXTRA_libsim_hydrology_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libsim_hydrology_la_OBJECTS) $(libsim_hydrology_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -481,10 +489,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_terrain_analysis/Makefile.in b/src/modules_terrain_analysis/Makefile.in
+index 7bdd704..4570277 100644
+--- a/src/modules_terrain_analysis/Makefile.in
++++ b/src/modules_terrain_analysis/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23677,7 +28527,7 @@ Index: saga/src/modules_terrain_analysis/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23685,7 +28535,7 @@ Index: saga/src/modules_terrain_analysis/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23693,7 +28543,7 @@ Index: saga/src/modules_terrain_analysis/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23701,11 +28551,44 @@ Index: saga/src/modules_terrain_analysis/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_terrain_analysis/terrain_analysis/Makefile.in
-===================================================================
---- saga.orig/src/modules_terrain_analysis/terrain_analysis/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_terrain_analysis/terrain_analysis/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -114,6 +114,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_terrain_analysis/terrain_analysis/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/Makefile.in
+index 47c2824..ef64b82 100644
+--- a/src/modules_terrain_analysis/terrain_analysis/Makefile.in
++++ b/src/modules_terrain_analysis/terrain_analysis/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -114,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23713,7 +28596,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23721,7 +28604,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23729,7 +28612,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -211,7 +214,6 @@
+@@ -211,7 +214,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23737,11 +28620,57 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in
-===================================================================
---- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -480,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in
+index 31ab482..c5d7a49 100644
+--- a/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in
++++ b/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libta_channels_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23749,7 +28678,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.i
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23757,7 +28686,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.i
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23765,7 +28694,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.i
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23773,11 +28702,66 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.i
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in
-===================================================================
---- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -126,6 +126,7 @@
+@@ -341,7 +349,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libta_channels.la: $(libta_channels_la_OBJECTS) $(libta_channels_la_DEPENDENCIES)
++libta_channels.la: $(libta_channels_la_OBJECTS) $(libta_channels_la_DEPENDENCIES) $(EXTRA_libta_channels_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libta_channels_la_OBJECTS) $(libta_channels_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -485,10 +493,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+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..61dc501 100644
+--- a/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in
++++ b/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libta_compound_la_DEPENDENCIES = \
+@@ -126,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23785,7 +28769,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.i
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -152,6 +153,7 @@
+@@ -152,6 +159,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23793,7 +28777,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.i
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -190,6 +192,7 @@
+@@ -190,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23801,7 +28785,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.i
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +226,6 @@
+@@ -223,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23809,11 +28793,66 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.i
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in
-===================================================================
---- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -133,6 +133,7 @@
+@@ -326,7 +334,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libta_compound.la: $(libta_compound_la_OBJECTS) $(libta_compound_la_DEPENDENCIES)
++libta_compound.la: $(libta_compound_la_OBJECTS) $(libta_compound_la_DEPENDENCIES) $(EXTRA_libta_compound_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libta_compound_la_OBJECTS) $(libta_compound_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -464,10 +472,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in
+index 19b3053..e344fde 100644
+--- a/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in
++++ b/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libta_hydrology_la_DEPENDENCIES = \
+@@ -133,6 +139,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23821,7 +28860,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -159,6 +160,7 @@
+@@ -159,6 +166,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23829,7 +28868,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -197,6 +199,7 @@
+@@ -197,6 +205,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23837,7 +28876,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -230,7 +233,6 @@
+@@ -230,7 +239,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23845,11 +28884,66 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in
-===================================================================
---- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -128,6 +128,7 @@
+@@ -373,7 +381,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libta_hydrology.la: $(libta_hydrology_la_OBJECTS) $(libta_hydrology_la_DEPENDENCIES)
++libta_hydrology.la: $(libta_hydrology_la_OBJECTS) $(libta_hydrology_la_DEPENDENCIES) $(EXTRA_libta_hydrology_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libta_hydrology_la_OBJECTS) $(libta_hydrology_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -531,10 +539,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in
+index f992c7c..7d9d9eb 100644
+--- a/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in
++++ b/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libta_lighting_la_DEPENDENCIES = \
+@@ -128,6 +134,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23857,7 +28951,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.i
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
+@@ -154,6 +161,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23865,7 +28959,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.i
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -192,6 +194,7 @@
+@@ -192,6 +200,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23873,7 +28967,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.i
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -225,7 +228,6 @@
+@@ -225,7 +234,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23881,11 +28975,66 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.i
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in
-===================================================================
---- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -132,6 +132,7 @@
+@@ -336,7 +344,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libta_lighting.la: $(libta_lighting_la_OBJECTS) $(libta_lighting_la_DEPENDENCIES)
++libta_lighting.la: $(libta_lighting_la_OBJECTS) $(libta_lighting_la_DEPENDENCIES) $(EXTRA_libta_lighting_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libta_lighting_la_OBJECTS) $(libta_lighting_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -478,10 +486,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in
+index ede76f8..34abeac 100644
+--- a/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in
++++ b/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libta_morphometry_la_DEPENDENCIES = \
+@@ -132,6 +138,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23893,7 +29042,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefil
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@
+@@ -158,6 +165,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23901,7 +29050,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefil
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -196,6 +198,7 @@
+@@ -196,6 +204,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23909,7 +29058,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefil
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +232,6 @@
+@@ -229,7 +238,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23917,11 +29066,66 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefil
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in
-===================================================================
---- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -366,7 +374,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libta_morphometry.la: $(libta_morphometry_la_OBJECTS) $(libta_morphometry_la_DEPENDENCIES)
++libta_morphometry.la: $(libta_morphometry_la_OBJECTS) $(libta_morphometry_la_DEPENDENCIES) $(EXTRA_libta_morphometry_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libta_morphometry_la_OBJECTS) $(libta_morphometry_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -521,10 +529,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in
+index a047620..7950984 100644
+--- a/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in
++++ b/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -72,6 +72,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libta_preprocessor_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23929,7 +29133,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefi
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23937,7 +29141,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefi
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23945,7 +29149,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefi
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23953,11 +29157,66 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefi
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in
-===================================================================
---- saga.orig/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -340,7 +348,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libta_preprocessor.la: $(libta_preprocessor_la_OBJECTS) $(libta_preprocessor_la_DEPENDENCIES)
++libta_preprocessor.la: $(libta_preprocessor_la_OBJECTS) $(libta_preprocessor_la_DEPENDENCIES) $(EXTRA_libta_preprocessor_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libta_preprocessor_la_OBJECTS) $(libta_preprocessor_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -484,10 +492,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in
+index b973291..1b886bb 100644
+--- a/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in
++++ b/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libta_profiles_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -23965,7 +29224,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.i
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -23973,7 +29232,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.i
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -23981,7 +29240,7 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.i
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -23989,11 +29248,53 @@ Index: saga/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.i
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/saga_core/Makefile.in
-===================================================================
---- saga.orig/src/saga_core/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/saga_core/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -113,6 +113,7 @@
+@@ -339,7 +347,7 @@ clean-pkglibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libta_profiles.la: $(libta_profiles_la_OBJECTS) $(libta_profiles_la_DEPENDENCIES)
++libta_profiles.la: $(libta_profiles_la_OBJECTS) $(libta_profiles_la_DEPENDENCIES) $(EXTRA_libta_profiles_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(pkglibdir) $(libta_profiles_la_OBJECTS) $(libta_profiles_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -482,10 +490,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/saga_core/Makefile.in b/src/saga_core/Makefile.in
+index 092bbe1..bcbf80e 100644
+--- a/src/saga_core/Makefile.in
++++ b/src/saga_core/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24001,7 +29302,7 @@ Index: saga/src/saga_core/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -139,6 +140,7 @@
+@@ -139,6 +140,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24009,7 +29310,7 @@ Index: saga/src/saga_core/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -177,6 +179,7 @@
+@@ -177,6 +179,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24017,7 +29318,7 @@ Index: saga/src/saga_core/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -210,7 +213,6 @@
+@@ -210,7 +213,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24025,11 +29326,65 @@ Index: saga/src/saga_core/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/saga_core/saga_api/Makefile.in
-===================================================================
---- saga.orig/src/saga_core/saga_api/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/saga_core/saga_api/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -155,6 +155,7 @@
+@@ -486,10 +488,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/saga_core/saga_api/Makefile.in b/src/saga_core/saga_api/Makefile.in
+index 4088b2c..22742e4 100644
+--- a/src/saga_core/saga_api/Makefile.in
++++ b/src/saga_core/saga_api/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pyexecdir)" \
+ "$(DESTDIR)$(pyexecdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(pyexec_LTLIBRARIES)
+@@ -129,6 +135,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ $(LDFLAGS) -o $@
+ SOURCES = $(nodist__saga_api_la_SOURCES) $(libsaga_api_la_SOURCES)
+ DIST_SOURCES = $(libsaga_api_la_SOURCES)
++am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
+ py_compile = $(top_srcdir)/py-compile
+ ETAGS = etags
+ CTAGS = ctags
+@@ -155,6 +162,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24037,7 +29392,7 @@ Index: saga/src/saga_core/saga_api/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -181,6 +182,7 @@
+@@ -181,6 +189,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24045,7 +29400,7 @@ Index: saga/src/saga_core/saga_api/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -219,6 +221,7 @@
+@@ -219,6 +228,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24053,7 +29408,7 @@ Index: saga/src/saga_core/saga_api/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -252,7 +255,6 @@
+@@ -252,7 +262,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24061,11 +29416,91 @@ Index: saga/src/saga_core/saga_api/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/saga_core/saga_cmd/Makefile.in
-===================================================================
---- saga.orig/src/saga_core/saga_cmd/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/saga_core/saga_cmd/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -144,6 +144,7 @@
+@@ -469,9 +478,9 @@ clean-pyexecLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-_saga_api.la: $(_saga_api_la_OBJECTS) $(_saga_api_la_DEPENDENCIES)
++_saga_api.la: $(_saga_api_la_OBJECTS) $(_saga_api_la_DEPENDENCIES) $(EXTRA__saga_api_la_DEPENDENCIES)
+ $(_saga_api_la_LINK) $(am__saga_api_la_rpath) $(_saga_api_la_OBJECTS) $(_saga_api_la_LIBADD) $(LIBS)
+-libsaga_api.la: $(libsaga_api_la_OBJECTS) $(libsaga_api_la_DEPENDENCIES)
++libsaga_api.la: $(libsaga_api_la_OBJECTS) $(libsaga_api_la_DEPENDENCIES) $(EXTRA_libsaga_api_la_DEPENDENCIES)
+ $(libsaga_api_la_LINK) -rpath $(libdir) $(libsaga_api_la_OBJECTS) $(libsaga_api_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -615,11 +624,8 @@ install-nodist_pyexecPYTHON: $(nodist_pyexec_PYTHON)
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pyexecdir)" || exit $$?; \
+ done || exit $$?; \
+ if test -n "$$dlist"; then \
+- if test -z "$(DESTDIR)"; then \
+- PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \
+- else \
+- PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pyexecdir)" $$dlist; \
+- fi; \
++ $(am__py_compile) --destdir "$(DESTDIR)" \
++ --basedir "$(pyexecdir)" $$dlist; \
+ else :; fi
+
+ uninstall-nodist_pyexecPYTHON:
+@@ -627,14 +633,14 @@ uninstall-nodist_pyexecPYTHON:
+ @list='$(nodist_pyexec_PYTHON)'; test -n "$(pyexecdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
++ dir='$(DESTDIR)$(pyexecdir)'; \
+ filesc=`echo "$$files" | sed 's|$$|c|'`; \
+ fileso=`echo "$$files" | sed 's|$$|o|'`; \
+- echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(pyexecdir)" && rm -f $$files || exit $$?; \
+- echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$filesc ")"; \
+- cd "$(DESTDIR)$(pyexecdir)" && rm -f $$filesc || exit $$?; \
+- echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$fileso ")"; \
+- cd "$(DESTDIR)$(pyexecdir)" && rm -f $$fileso
++ st=0; \
++ for files in "$$files" "$$filesc" "$$fileso"; do \
++ $(am__uninstall_files_from_dir) || st=$$?; \
++ done; \
++ exit $$st
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -735,10 +741,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/saga_core/saga_cmd/Makefile.in b/src/saga_core/saga_cmd/Makefile.in
+index 7e8b37d..44b74db 100644
+--- a/src/saga_core/saga_cmd/Makefile.in
++++ b/src/saga_core/saga_cmd/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -144,6 +144,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24073,7 +29508,7 @@ Index: saga/src/saga_core/saga_cmd/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -170,6 +171,7 @@
+@@ -170,6 +171,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24081,7 +29516,7 @@ Index: saga/src/saga_core/saga_cmd/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -208,6 +210,7 @@
+@@ -208,6 +210,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24089,7 +29524,7 @@ Index: saga/src/saga_core/saga_cmd/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -241,7 +244,6 @@
+@@ -241,7 +244,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24097,11 +29532,66 @@ Index: saga/src/saga_core/saga_cmd/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/saga_core/saga_cmd/man/Makefile.in
-===================================================================
---- saga.orig/src/saga_core/saga_cmd/man/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/saga_core/saga_cmd/man/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -100,6 +100,7 @@
+@@ -358,7 +360,7 @@ clean-binPROGRAMS:
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+-saga_cmd$(EXEEXT): $(saga_cmd_OBJECTS) $(saga_cmd_DEPENDENCIES)
++saga_cmd$(EXEEXT): $(saga_cmd_OBJECTS) $(saga_cmd_DEPENDENCIES) $(EXTRA_saga_cmd_DEPENDENCIES)
+ @rm -f saga_cmd$(EXEEXT)
+ $(CXXLINK) $(saga_cmd_OBJECTS) $(saga_cmd_LDADD) $(LIBS)
+
+@@ -610,10 +612,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/saga_core/saga_cmd/man/Makefile.in b/src/saga_core/saga_cmd/man/Makefile.in
+index fc3415f..9b4f187 100644
+--- a/src/saga_core/saga_cmd/man/Makefile.in
++++ b/src/saga_core/saga_cmd/man/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -73,6 +73,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ am__installdirs = "$(DESTDIR)$(man1dir)"
+ NROFF = nroff
+@@ -100,6 +106,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24109,7 +29599,7 @@ Index: saga/src/saga_core/saga_cmd/man/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -126,6 +127,7 @@
+@@ -126,6 +133,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24117,7 +29607,7 @@ Index: saga/src/saga_core/saga_cmd/man/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -164,6 +166,7 @@
+@@ -164,6 +172,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24125,7 +29615,7 @@ Index: saga/src/saga_core/saga_cmd/man/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -197,7 +200,6 @@
+@@ -197,7 +206,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24133,11 +29623,68 @@ Index: saga/src/saga_core/saga_cmd/man/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/saga_core/saga_gdi/Makefile.in
-===================================================================
---- saga.orig/src/saga_core/saga_gdi/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/saga_core/saga_gdi/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -130,6 +130,7 @@
+@@ -292,9 +300,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -362,10 +368,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/saga_core/saga_gdi/Makefile.in b/src/saga_core/saga_gdi/Makefile.in
+index 8686452..aba5b67 100644
+--- a/src/saga_core/saga_gdi/Makefile.in
++++ b/src/saga_core/saga_gdi/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libsaga_gdi_la_DEPENDENCIES = \
+@@ -130,6 +136,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24145,7 +29692,7 @@ Index: saga/src/saga_core/saga_gdi/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -156,6 +157,7 @@
+@@ -156,6 +163,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24153,7 +29700,7 @@ Index: saga/src/saga_core/saga_gdi/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -194,6 +196,7 @@
+@@ -194,6 +202,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24161,7 +29708,7 @@ Index: saga/src/saga_core/saga_gdi/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -227,7 +230,6 @@
+@@ -227,7 +236,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24169,11 +29716,53 @@ Index: saga/src/saga_core/saga_gdi/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/saga_core/saga_gui/Makefile.in
-===================================================================
---- saga.orig/src/saga_core/saga_gui/Makefile.in 2012-01-09 14:09:39.000000000 +0100
-+++ saga/src/saga_core/saga_gui/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -191,6 +191,7 @@
+@@ -334,7 +342,7 @@ clean-libLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libsaga_gdi.la: $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_DEPENDENCIES)
++libsaga_gdi.la: $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_DEPENDENCIES) $(EXTRA_libsaga_gdi_la_DEPENDENCIES)
+ $(libsaga_gdi_la_LINK) -rpath $(libdir) $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -474,10 +482,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/saga_core/saga_gui/Makefile.in b/src/saga_core/saga_gui/Makefile.in
+index d97e798..895ec69 100644
+--- a/src/saga_core/saga_gui/Makefile.in
++++ b/src/saga_core/saga_gui/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -191,6 +191,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24181,7 +29770,7 @@ Index: saga/src/saga_core/saga_gui/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -217,6 +218,7 @@
+@@ -217,6 +218,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24189,7 +29778,7 @@ Index: saga/src/saga_core/saga_gui/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -255,6 +257,7 @@
+@@ -255,6 +257,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24197,7 +29786,7 @@ Index: saga/src/saga_core/saga_gui/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -288,7 +291,6 @@
+@@ -288,7 +291,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24205,11 +29794,66 @@ Index: saga/src/saga_core/saga_gui/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/saga_core/saga_gui/man/Makefile.in
-===================================================================
---- saga.orig/src/saga_core/saga_gui/man/Makefile.in 2012-01-09 14:09:39.000000000 +0100
-+++ saga/src/saga_core/saga_gui/man/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -100,6 +100,7 @@
+@@ -602,7 +604,7 @@ clean-binPROGRAMS:
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+-saga_gui$(EXEEXT): $(saga_gui_OBJECTS) $(saga_gui_DEPENDENCIES)
++saga_gui$(EXEEXT): $(saga_gui_OBJECTS) $(saga_gui_DEPENDENCIES) $(EXTRA_saga_gui_DEPENDENCIES)
+ @rm -f saga_gui$(EXEEXT)
+ $(CXXLINK) $(saga_gui_OBJECTS) $(saga_gui_LDADD) $(LIBS)
+
+@@ -1052,10 +1054,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/saga_core/saga_gui/man/Makefile.in b/src/saga_core/saga_gui/man/Makefile.in
+index d879530..3802cfd 100644
+--- a/src/saga_core/saga_gui/man/Makefile.in
++++ b/src/saga_core/saga_gui/man/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -73,6 +73,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ am__installdirs = "$(DESTDIR)$(man1dir)"
+ NROFF = nroff
+@@ -100,6 +106,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24217,7 +29861,7 @@ Index: saga/src/saga_core/saga_gui/man/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -126,6 +127,7 @@
+@@ -126,6 +133,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24225,7 +29869,7 @@ Index: saga/src/saga_core/saga_gui/man/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -164,6 +166,7 @@
+@@ -164,6 +172,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24233,7 +29877,7 @@ Index: saga/src/saga_core/saga_gui/man/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -197,7 +200,6 @@
+@@ -197,7 +206,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24241,11 +29885,68 @@ Index: saga/src/saga_core/saga_gui/man/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-Index: saga/src/saga_core/saga_odbc/Makefile.in
-===================================================================
---- saga.orig/src/saga_core/saga_odbc/Makefile.in 2012-01-09 14:09:38.000000000 +0100
-+++ saga/src/saga_core/saga_odbc/Makefile.in 2012-01-09 14:10:07.000000000 +0100
-@@ -129,6 +129,7 @@
+@@ -292,9 +300,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -362,10 +368,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+diff --git a/src/saga_core/saga_odbc/Makefile.in b/src/saga_core/saga_odbc/Makefile.in
+index a2f0fe1..d586769 100644
+--- a/src/saga_core/saga_odbc/Makefile.in
++++ b/src/saga_core/saga_odbc/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libsaga_odbc_la_DEPENDENCIES = \
+@@ -129,6 +135,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLELIBHARU = @DISABLELIBHARU@
@@ -24253,7 +29954,7 @@ Index: saga/src/saga_core/saga_odbc/Makefile.in
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
+@@ -155,6 +162,7 @@ LOCAL_INCS = @LOCAL_INCS@
LOCAL_LIBS = @LOCAL_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -24261,7 +29962,7 @@ Index: saga/src/saga_core/saga_odbc/Makefile.in
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -193,6 +195,7 @@
+@@ -193,6 +201,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -24269,7 +29970,7 @@ Index: saga/src/saga_core/saga_odbc/Makefile.in
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +229,6 @@
+@@ -226,7 +235,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -24277,3 +29978,32 @@ Index: saga/src/saga_core/saga_odbc/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+@@ -325,7 +333,7 @@ clean-libLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libsaga_odbc.la: $(libsaga_odbc_la_OBJECTS) $(libsaga_odbc_la_DEPENDENCIES)
++libsaga_odbc.la: $(libsaga_odbc_la_OBJECTS) $(libsaga_odbc_la_DEPENDENCIES) $(EXTRA_libsaga_odbc_la_DEPENDENCIES)
+ $(libsaga_odbc_la_LINK) -rpath $(libdir) $(libsaga_odbc_la_OBJECTS) $(libsaga_odbc_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -462,10 +470,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/debian/patches/series b/debian/patches/series
index 251bdb4..e398b34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
0001-Adjust-grid_gridding-to-use-qhull.patch
0002-Remove-references-to-libfire.patch
0003-Use-debian-version-of-grib2.patch
-0005-autoreconf-fi.patch
+0004-autoreconf-fi.patch
--
Saga GIS
More information about the Pkg-grass-devel
mailing list