Johan Van de Wauw · Johan Van de Wauw · Johan Van de Wauw · Johan Van de Wauw · Johan Van de Wauw · Johan Van de Wauw
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,8 @@ ACLOCAL_AMFLAGS = -I m4


 # additional directories to package
-EXTRA_DIST = ./src/scripting
+EXTRA_DIST = ./src/accessories

 toolchainsdir = $(pkgdatadir)/toolchains

-dist_toolchains_DATA = src/scripting/toolchains/*.xml
+dist_toolchains_DATA = src/accessories/toolchains/*.xml
--- a/Makefile.in
+++ b/Makefile.in
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -90,14 +90,18 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_gdal.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_lib_gdal.m4 \
 	$(top_srcdir)/m4/ax_lib_postgresql.m4 \
 	$(top_srcdir)/m4/ax_pkg_swig.m4 \
 	$(top_srcdir)/m4/ax_python_devel.m4 \
 	$(top_srcdir)/m4/ax_swig_enable_cxx.m4 \
-	$(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libcurl.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/m4_ax_check_define.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -198,7 +202,7 @@ CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
 	COPYING ChangeLog NEWS README compile config.guess config.sub \
-	install-sh ltmain.sh missing
+	depcomp install-sh ltmain.sh missing py-compile
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -267,6 +271,8 @@ DISABLELIBHARU = @DISABLELIBHARU@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
+DXFLIB_CFLAGS = @DXFLIB_CFLAGS@
+DXFLIB_LIBS = @DXFLIB_LIBS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -283,6 +289,9 @@ GDAL_VERSION = @GDAL_VERSION@
 GOMPFLAGS = @GOMPFLAGS@
 GREP = @GREP@
 HARU_LIB = @HARU_LIB@
+HAVE_CXX11 = @HAVE_CXX11@
+HDF5_CFLAGS = @HDF5_CFLAGS@
+HDF5_LIBS = @HDF5_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -290,6 +299,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBCURL = @LIBCURL@
+LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -317,10 +328,16 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PG_CONFIG = @PG_CONFIG@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@
 POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
 POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
 POW_LIB = @POW_LIB@
+PROJ6FLAGS = @PROJ6FLAGS@
+PROJ_INC_DIR = @PROJ_INC_DIR@
+PROJ_LIB_DIR = @PROJ_LIB_DIR@
 PYTHON = @PYTHON@
 PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
@@ -339,6 +356,7 @@ STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_LIB = @SWIG_LIB@
 VERSION = @VERSION@
+_libcurl_config = @_libcurl_config@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -403,9 +421,9 @@ SUBDIRS = . src
 ACLOCAL_AMFLAGS = -I m4

 # additional directories to package
-EXTRA_DIST = ./src/scripting
+EXTRA_DIST = ./src/accessories
 toolchainsdir = $(pkgdatadir)/toolchains
-dist_toolchains_DATA = src/scripting/toolchains/*.xml
+dist_toolchains_DATA = src/accessories/toolchains/*.xml
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -660,7 +678,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)

 dist-bzip2: distdir
@@ -686,7 +704,7 @@ dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)

 dist-zip: distdir
@@ -704,7 +722,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -714,7 +732,7 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac

--- a/README
+++ b/README
 _______________________________________________________________________________

-         SAGA 2.3.1 - System for Automated Geoscientific Analyses
+         SAGA 7.3.0 - System for Automated Geoscientific Analyses
 _______________________________________________________________________________

 * Introduction
@@ -10,27 +10,24 @@ SAGA - System for Automated Geoscientific Analyses - is a Free Open Source Softw

 * Internet

- www.saga-gis.org
- sourceforge.net/projects/saga-gis
+- Official SAGA Homepage: www.saga-gis.org
+- SAGA Project Page: https://sourceforge.net/projects/saga-gis
+- Wiki: https://sourceforge.net/p/saga-gis/wiki/Home/


 * Supported Platforms

- Windows (Microsoft Visual C++ 10.0)
+- Windows (Microsoft Visual C++ 14.0)
 - Linux (gcc)
 - FreeBSD


-* Required Libraries
+* Installation Notes:
+
+- https://sourceforge.net/p/saga-gis/wiki/SAGA%20Installation/
+

- wxWidgets 3.0.0
- GDAL 1.8.0
- Proj4
- Haru Free PDF Library (optional)
- libLAS 1.2 (optional)
- opencv (optional)
- vigra (optional)

 _______________________________________________________________________________
-Date: November, 3th 2013
+Date: November, 13th 2018

--- a/aclocal.m4
+++ b/aclocal.m4
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-

-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,283 @@ 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'.])])

-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
+
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +311,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.15'
 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.15], [],
+m4_if([$1], [1.15.1], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])

@@ -51,14 +327,14 @@ 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.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])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-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,7 +386,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`

 # AM_CONDITIONAL                                            -*- Autoconf -*-

-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -141,7 +417,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])

-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -332,7 +608,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl

 # Generate code to set up dependency tracking.              -*- Autoconf -*-

-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -408,7 +684,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],

 # Do all the work for Automake.                             -*- Autoconf -*-

-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -605,7 +881,7 @@ 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-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -626,7 +902,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])

-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -647,7 +923,7 @@ AC_SUBST([am__leading_dot])])

 # Check to see how 'make' treats includes.	            -*- Autoconf -*-

-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -697,7 +973,7 @@ rm -f confinc confmf

 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-

-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -736,7 +1012,7 @@ fi

 # Helper functions for option handling.                     -*- Autoconf -*-

-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -765,7 +1041,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -812,7 +1088,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])

-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -845,8 +1121,9 @@ 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).
+  dnl FIXME: Remove the need to hard-code Python versions here.
  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
+[python python2 python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 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])
@@ -1047,7 +1324,7 @@ 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-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1066,7 +1343,7 @@ AC_DEFUN([AM_RUN_LOG],

 # Check to make sure that the build environment is sane.    -*- Autoconf -*-

-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1147,7 +1424,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])

-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1207,7 +1484,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])

-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1235,7 +1512,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])

-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1254,7 +1531,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

 # Check how to create a tarball.                            -*- Autoconf -*-

-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1385,14 +1662,18 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR

+m4_include([m4/ax_cxx_compile_stdcxx.m4])
+m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
 m4_include([m4/ax_lib_gdal.m4])
 m4_include([m4/ax_lib_postgresql.m4])
 m4_include([m4/ax_pkg_swig.m4])
 m4_include([m4/ax_python_devel.m4])
 m4_include([m4/ax_swig_enable_cxx.m4])
 m4_include([m4/ax_swig_python.m4])
+m4_include([m4/libcurl.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
+m4_include([m4/m4_ax_check_define.m4])
--- a/config.guess
+++ b/config.guess
--- a/config.h.in
+++ b/config.h.in
@@ -3,6 +3,9 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD

+/* define if the compiler supports basic C++11 syntax */
+#undef HAVE_CXX11
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H

@@ -24,6 +27,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H

+/* Define to 1 if you have a functional curl library. */
+#undef HAVE_LIBCURL
+
 /* Define to 1 if you have the `geotrans' library (-lgeotrans). */
 #undef HAVE_LIBGEOTRANS

@@ -120,6 +126,69 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL

+/* Defined if libcurl supports AsynchDNS */
+#undef LIBCURL_FEATURE_ASYNCHDNS
+
+/* Defined if libcurl supports IDN */
+#undef LIBCURL_FEATURE_IDN
+
+/* Defined if libcurl supports IPv6 */
+#undef LIBCURL_FEATURE_IPV6
+
+/* Defined if libcurl supports KRB4 */
+#undef LIBCURL_FEATURE_KRB4
+
+/* Defined if libcurl supports libz */
+#undef LIBCURL_FEATURE_LIBZ
+
+/* Defined if libcurl supports NTLM */
+#undef LIBCURL_FEATURE_NTLM
+
+/* Defined if libcurl supports SSL */
+#undef LIBCURL_FEATURE_SSL
+
+/* Defined if libcurl supports SSPI */
+#undef LIBCURL_FEATURE_SSPI
+
+/* Defined if libcurl supports DICT */
+#undef LIBCURL_PROTOCOL_DICT
+
+/* Defined if libcurl supports FILE */
+#undef LIBCURL_PROTOCOL_FILE
+
+/* Defined if libcurl supports FTP */
+#undef LIBCURL_PROTOCOL_FTP
+
+/* Defined if libcurl supports FTPS */
+#undef LIBCURL_PROTOCOL_FTPS
+
+/* Defined if libcurl supports HTTP */
+#undef LIBCURL_PROTOCOL_HTTP
+
+/* Defined if libcurl supports HTTPS */
+#undef LIBCURL_PROTOCOL_HTTPS
+
+/* Defined if libcurl supports IMAP */
+#undef LIBCURL_PROTOCOL_IMAP
+
+/* Defined if libcurl supports LDAP */
+#undef LIBCURL_PROTOCOL_LDAP
+
+/* Defined if libcurl supports POP3 */
+#undef LIBCURL_PROTOCOL_POP3
+
+/* Defined if libcurl supports RTSP */
+#undef LIBCURL_PROTOCOL_RTSP
+
+/* Defined if libcurl supports SMTP */
+#undef LIBCURL_PROTOCOL_SMTP
+
+/* Defined if libcurl supports TELNET */
+#undef LIBCURL_PROTOCOL_TELNET
+
+/* Defined if libcurl supports TFTP */
+#undef LIBCURL_PROTOCOL_TFTP
+
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
   slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
@@ -157,7 +226,7 @@
 /* Version number of package */
 #undef VERSION

-/* "built with GUI and interactive modules" */
+/* "built with GUI and interactive tools" */
 #undef WITH_GUI

 /* "built with ODBC support" */
@@ -178,6 +247,9 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

+/* Define curl_free() as free() if our version of curl lacks curl_free. */
+#undef curl_free
+
 /* Define to `__inline__' or `__inline' if that's what the C compiler
   calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus

--- a/config.sub
+++ b/config.sub
--- a/configure
+++ b/configure
--- a/configure.ac
+++ b/configure.ac
-# $Id$
+
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.59)
-AC_INIT(saga, 2.3.1, BUG-REPORT-ADDRESS)
+AC_INIT(saga, 7.3.0, BUG-REPORT-ADDRESS)
 AC_CONFIG_SRCDIR([src/saga_core/saga_gui/wksp_data_menu_files.cpp])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -23,10 +23,18 @@ AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
 AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,)
 AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,)
 AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found])
-AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)
+# PROJ4 has projects.h and old API function:
+AC_CHECK_HEADER([projects.h],[AC_CHECK_LIB([proj], [pj_get_release], PROJ4FOUND=1,,)])
+# PROJ5 still has projects.h but also new proj.h and new API function:
+AC_CHECK_HEADER([projects.h],[AC_CHECK_HEADER([proj.h],[AC_CHECK_LIB([proj], [proj_info], PROJ5FOUND=1,,)])])
+# PROJ6 has dropped projects.h in favour of proj.h and has new API function:
+AC_CHECK_HEADER([proj.h],[AC_CHECK_LIB([proj], [proj_info], PROJ6FOUND=1,,)])
 AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)
 AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
-AC_CHECK_HEADER([dxflib/dl_dxf.h],[AC_CHECK_LIB(libdxf,DL_ArcData,LIBDXFFOUND=1)])
+AC_CHECK_HEADER([libsvm/svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)])
+PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])
+PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)
+LIBCURL_CHECK_CONFIG([yes], [7.7.2],,)

 # Checks for header files.
 AC_HEADER_STDC
@@ -53,6 +61,9 @@ AC_FUNC_STRTOD
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([floor memmove memset modf pow sqrt strchr strdup strerror strrchr strstr strtol])

+# make sure C++ 2011 extensions are enabled
+AX_CXX_COMPILE_STDCXX_11()
+
 # add a local directory as base for libs and include files
 AC_MSG_CHECKING([for local include/lib path])

@@ -107,7 +118,7 @@ AC_ARG_ENABLE(debug,
 
 # gui
 AC_ARG_ENABLE(gui,
-     [  --disable-gui		  Do not build GUI and interactive modules],
+     [  --disable-gui		  Do not build GUI and interactive tools],
     [case "${enableval}" in
     	yes) gui=true ;;
 	no) gui=false ;;
@@ -116,10 +127,10 @@ AC_ARG_ENABLE(gui,
      AM_CONDITIONAL(WITH_GUI, test x$gui = xtrue)

  if test $gui = "false" ; then
-    AC_MSG_RESULT([        GUI and interactive modules will NOT be built])
+    AC_MSG_RESULT([        GUI and interactive tools will NOT be built])
  else
-    AC_DEFINE([WITH_GUI], [1], ["built with GUI and interactive modules"])
-    AC_MSG_RESULT([        GUI and interactive modules will be built])    
+    AC_DEFINE([WITH_GUI], [1], ["built with GUI and interactive tools"])
+    AC_MSG_RESULT([        GUI and interactive tools will be built])    
  fi

 # odbc
@@ -166,6 +177,52 @@ AC_ARG_ENABLE(openmp,
 AC_SUBST(GOMPFLAGS)


+# proj.4
+PROJ_INC_DIR=
+PROJ_LIB_DIR=
+
+AC_ARG_WITH(
+  [proj-includes],
+  [AS_HELP_STRING([--with-proj-includes=DIR],[set custom path to PROJ includes)])],
+  AC_CHECK_FILE([${withval}/proj_api.h], [PROJ_INC_DIR="$withval"], AC_MSG_ERROR([Custom PROJ include path not found]))
+)
+
+AC_ARG_WITH(
+  [proj-libraries],
+  [AS_HELP_STRING([--with-proj-libraries=DIR],[set custom path to PROJ libraries)])],
+  AC_CHECK_FILE([${withval}/libproj.so], [PROJ_LIB_DIR="-L$withval"], AC_MSG_ERROR([Custom PROJ library path not found]))
+)
+
+if test -n "$PROJ_INC_DIR"; then
+  AC_CHECK_FILE([${PROJ_INC_DIR}/projects.h], [PROJ4FOUND=1], [PROJ4FOUND=])
+  AC_CHECK_FILE([${PROJ_INC_DIR}/projects.h], AC_CHECK_FILE([${PROJ_INC_DIR}/proj.h], [PROJ5FOUND=1], [PROJ5FOUND=]), [PROJ5FOUND=])
+  AC_CHECK_FILE([${PROJ_INC_DIR}/proj.h], AC_CHECK_FILE([${PROJ_INC_DIR}/projects.h], [PROJ6FOUND=], [PROJ6FOUND=1]))
+  PROJ_INC_DIR="-I$PROJ_INC_DIR"
+fi
+
+if test -n "$PROJ5FOUND" ; then 
+  AC_MSG_RESULT([        using PROJ version 5])
+  PROJ6FLAGS=""
+else
+  if test -n "$PROJ6FOUND" ; then 
+    AC_MSG_RESULT([        using PROJ version 6]) 
+    PROJ6FLAGS="-DPROJ6 -std=c++0x"
+  else
+    if test -n "$PROJ4FOUND" ; then 
+      AC_MSG_RESULT([        using PROJ version 4]) 
+      PROJ6FLAGS=""
+    else
+      AC_MSG_ERROR(SAGA requires the PROJ library)
+      exit
+    fi
+  fi
+fi
+
+AC_SUBST(PROJ_INC_DIR)
+AC_SUBST(PROJ_LIB_DIR)
+AC_SUBST(PROJ6FLAGS)
+
+
 # gdal
 AX_LIB_GDAL([1.7])
 if test `echo $GDAL_VERSION|cut -d. -f1` -ge 2; then
@@ -203,15 +260,38 @@ fi
 AC_ARG_WITH(system_dxflib,
    AS_HELP_STRING([--with-system-dxflib],[Use system version of dxflib instead of embedded copy, requires this library (and the header files)]),
    AC_MSG_RESULT([        using system libdxf]),
-    system_libdxf=true,
+    system_libdxf=true,system_libdxf=false
+    )
+AM_CONDITIONAL(SYSTEM_DXFLIB, [test "$LIBDXFFOUND" -eq 1 -a x$system_libdxf = xtrue])
+
+# check for --with-system-svm
+AC_ARG_WITH([system_svm],
+    AS_HELP_STRING([--with-system-svm],[Use system version of svm instead of embedded copy, requires this library (and the header files)]),
+    system_svm=true,
    )
-AM_CONDITIONAL(SYSTEM_DXFLIB, test -n "$LIBDXFFOUND" -a x$system_libdxf=xtrue)
+
+AC_MSG_CHECKING([usage of system libsvm])
+
+if test "$with_system_svm" = yes ; then
+    if test "$SVMFOUND" = 1 ; then
+        AC_MSG_RESULT([yes])
+        SYSTEM_SVM=yes
+    else
+        AC_MSG_FAILURE([--with-system-svm was given but test for libsvm failed])
+    fi
+else
+    SYSTEM_SVM=no
+    AC_MSG_RESULT([no])
+fi
+
+AM_CONDITIONAL([SYSTEM_SVM], [test x$SYSTEM_SVM = xyes])

 #AM_CONDITIONAL(X86_64, test "`uname -m`" = "x86_64")
 AM_CONDITIONAL(HAVE_CV, test -n "$CVFOUND")
 AM_CONDITIONAL(HAVE_LLAS, test -n "$LASFOUND")
 AM_CONDITIONAL(HAVE_VIGRA, test -n "$VIGRAFOUND" -a -n "$FFTWFOUND")
 AM_CONDITIONAL(HAVE_HARU, test -n "$HARUFOUND")
+AM_CONDITIONAL(HAVE_HDF5, test -n "$LIBHDF5FOUND")


 if test -n "$CVFOUND" ; then 
@@ -227,7 +307,7 @@ AM_CONDITIONAL(SYSTEM_DXFLIB, test -n "$LIBDXFFOUND" -a x$system_libdxf=xtrue)
 fi

 if test -n "$HARUFOUND" ; then 
-    AC_MSG_RESULT([        using lhpdf (libharu) from system libs.])
+  AC_MSG_RESULT([        using lhpdf (libharu) from system libs])
  DISABLELIBHARU=""
  HARU_LIB="-lhpdf"
 else 
@@ -236,10 +316,12 @@ AM_CONDITIONAL(SYSTEM_DXFLIB, test -n "$LIBDXFFOUND" -a x$system_libdxf=xtrue)
  HARU_LIB=""
 fi

-
 AC_SUBST(HARU_LIB)
 AC_SUBST(DISABLELIBHARU)

+AC_CHECK_DEFINE(HAVE_LIBCURL, AC_MSG_RESULT([        Building with libcurl]), AC_MSG_RESULT([        libcurl was not found: garden webservices will be build without https support]))
+
+
 AC_ARG_ENABLE(python,
    [  --enable-python    Build python bindings for the saga api],
     [case "${enableval}" in
@@ -266,93 +348,95 @@ AC_OUTPUT(Makefile \
 	src/saga_core/saga_gui/man/Makefile \
 	src/saga_core/saga_cmd/Makefile \
 	src/saga_core/saga_cmd/man/Makefile \
-	src/modules/Makefile \
-	src/modules/climate/Makefile \
-	src/modules/climate/climate_tools/Makefile \
-	src/modules/contrib/Makefile \
-	src/modules/contrib/contrib_peregro/Makefile \
-	src/modules/db/Makefile \
-	src/modules/db/db_odbc/Makefile \
-	src/modules/db/db_pgsql/Makefile \
-	src/modules/docs/Makefile \
-	src/modules/docs/docs_html/Makefile \
-	src/modules/docs/docs_pdf/Makefile \
-	src/modules/garden/Makefile \
-	src/modules/garden/garden_3d_viewer/Makefile \
-	src/modules/garden/garden_fractals/Makefile \
-	src/modules/garden/garden_games/Makefile \
-	src/modules/garden/garden_learn_to_program/Makefile \
-	src/modules/garden/garden_webservices/Makefile \
-	src/modules/grid/Makefile \
-	src/modules/grid/grid_analysis/Makefile \
-	src/modules/grid/grid_calculus/Makefile \
-	src/modules/grid/grid_calculus_bsl/Makefile \
-	src/modules/grid/grid_filter/Makefile \
-	src/modules/grid/grid_gridding/Makefile \
-	src/modules/grid/grid_spline/Makefile \
-	src/modules/grid/grid_tools/Makefile \
-	src/modules/grid/grid_visualisation/Makefile \
-	src/modules/imagery/Makefile \
-	src/modules/imagery/imagery_classification/Makefile \
-	src/modules/imagery/imagery_isocluster/Makefile \
-	src/modules/imagery/imagery_opencv/Makefile \
-	src/modules/imagery/imagery_maxent/Makefile \
-	src/modules/imagery/imagery_photogrammetry/Makefile \
-	src/modules/imagery/imagery_segmentation/Makefile \
-	src/modules/imagery/imagery_svm/Makefile \
-	src/modules/imagery/imagery_tools/Makefile \
-	src/modules/imagery/imagery_vigra/Makefile \
-	src/modules/io/Makefile \
-	src/modules/io/io_esri_e00/Makefile \
-	src/modules/io/io_gdal/Makefile \
-	src/modules/io/io_gps/Makefile \
-	src/modules/io/io_grid/Makefile \
-	src/modules/io/io_grid_image/Makefile \
-	src/modules/io/io_shapes/Makefile \
-	src/modules/io/io_shapes_dxf/Makefile \
-	src/modules/io/io_shapes_las/Makefile \
-	src/modules/io/io_table/Makefile \
-	src/modules/io/io_virtual/Makefile \
-	src/modules/pointcloud/Makefile \
-	src/modules/pointcloud/pointcloud_tools/Makefile \
-	src/modules/pointcloud/pointcloud_viewer/Makefile \
-	src/modules/projection/Makefile \
-	src/modules/projection/pj_georeference/Makefile \
-	src/modules/projection/pj_proj4/Makefile \
-	src/modules/shapes/Makefile \
-	src/modules/shapes/shapes_grid/Makefile \
-	src/modules/shapes/shapes_lines/Makefile \
-	src/modules/shapes/shapes_points/Makefile \
-	src/modules/shapes/shapes_polygons/Makefile \
-	src/modules/shapes/shapes_tools/Makefile \
-	src/modules/shapes/shapes_transect/Makefile \
-	src/modules/simulation/Makefile \
-	src/modules/simulation/sim_cellular_automata/Makefile \
-	src/modules/simulation/sim_ecosystems_hugget/Makefile \
-	src/modules/simulation/sim_erosion/Makefile \
-	src/modules/simulation/sim_fire_spreading/Makefile \
-	src/modules/simulation/sim_hydrology/Makefile \
-	src/modules/simulation/sim_ihacres/Makefile \
-	src/modules/simulation/sim_qm_of_esp/Makefile \
-	src/modules/simulation/sim_rivflow/Makefile \
-	src/modules/statistics/Makefile \
-	src/modules/statistics/statistics_grid/Makefile \
-	src/modules/statistics/statistics_kriging/Makefile \
-	src/modules/statistics/statistics_points/Makefile \
-	src/modules/statistics/statistics_regression/Makefile \
-	src/modules/table/Makefile \
-	src/modules/table/table_calculus/Makefile \
-	src/modules/table/table_tools/Makefile \
-	src/modules/terrain_analysis/Makefile \
-	src/modules/terrain_analysis/ta_channels/Makefile \
-	src/modules/terrain_analysis/ta_compound/Makefile \
-	src/modules/terrain_analysis/ta_hydrology/Makefile \
-	src/modules/terrain_analysis/ta_lighting/Makefile \
-	src/modules/terrain_analysis/ta_morphometry/Makefile \
-	src/modules/terrain_analysis/ta_preprocessor/Makefile \
-	src/modules/terrain_analysis/ta_profiles/Makefile \
-	src/modules/terrain_analysis/ta_slope_stability/Makefile \
-	src/modules/tin/Makefile \
-	src/modules/tin/tin_tools/Makefile \
-	src/modules/tin/tin_viewer/Makefile \
+	src/tools/Makefile \
+	src/tools/climate/Makefile \
+	src/tools/climate/climate_tools/Makefile \
+	src/tools/contrib/Makefile \
+	src/tools/contrib/contrib_perego/Makefile \
+	src/tools/db/Makefile \
+	src/tools/db/db_odbc/Makefile \
+	src/tools/db/db_pgsql/Makefile \
+	src/tools/docs/Makefile \
+	src/tools/docs/docs_html/Makefile \
+	src/tools/docs/docs_pdf/Makefile \
+	src/tools/garden/Makefile \
+	src/tools/garden/garden_3d_viewer/Makefile \
+	src/tools/garden/garden_fractals/Makefile \
+	src/tools/garden/garden_games/Makefile \
+	src/tools/garden/garden_learn_to_program/Makefile \
+	src/tools/garden/garden_webservices/Makefile \
+	src/tools/grid/Makefile \
+	src/tools/grid/grid_analysis/Makefile \
+	src/tools/grid/grid_calculus/Makefile \
+	src/tools/grid/grid_calculus_bsl/Makefile \
+	src/tools/grid/grid_filter/Makefile \
+	src/tools/grid/grid_gridding/Makefile \
+	src/tools/grid/grid_spline/Makefile \
+	src/tools/grid/grid_tools/Makefile \
+	src/tools/grid/grid_visualisation/Makefile \
+	src/tools/grid/grids_tools/Makefile \
+	src/tools/imagery/Makefile \
+	src/tools/imagery/imagery_classification/Makefile \
+	src/tools/imagery/imagery_opencv/Makefile \
+	src/tools/imagery/imagery_maxent/Makefile \
+	src/tools/imagery/imagery_photogrammetry/Makefile \
+	src/tools/imagery/imagery_segmentation/Makefile \
+	src/tools/imagery/imagery_svm/Makefile \
+	src/tools/imagery/imagery_tools/Makefile \
+	src/tools/imagery/imagery_vigra/Makefile \
+	src/tools/io/Makefile \
+	src/tools/io/io_esri_e00/Makefile \
+	src/tools/io/io_gdal/Makefile \
+	src/tools/io/io_gps/Makefile \
+	src/tools/io/io_grid/Makefile \
+	src/tools/io/io_grid_image/Makefile \
+	src/tools/io/io_shapes/Makefile \
+	src/tools/io/io_shapes_dxf/Makefile \
+	src/tools/io/io_shapes_las/Makefile \
+	src/tools/io/io_table/Makefile \
+	src/tools/io/io_virtual/Makefile \
+	src/tools/pointcloud/Makefile \
+	src/tools/pointcloud/pointcloud_tools/Makefile \
+	src/tools/pointcloud/pointcloud_viewer/Makefile \
+	src/tools/projection/Makefile \
+	src/tools/projection/pj_georeference/Makefile \
+	src/tools/projection/pj_proj4/Makefile \
+	src/tools/shapes/Makefile \
+	src/tools/shapes/shapes_grid/Makefile \
+	src/tools/shapes/shapes_lines/Makefile \
+	src/tools/shapes/shapes_points/Makefile \
+	src/tools/shapes/shapes_polygons/Makefile \
+	src/tools/shapes/shapes_tools/Makefile \
+	src/tools/shapes/shapes_transect/Makefile \
+	src/tools/simulation/Makefile \
+	src/tools/simulation/sim_cellular_automata/Makefile \
+	src/tools/simulation/sim_ecosystems_hugget/Makefile \
+	src/tools/simulation/sim_erosion/Makefile \
+	src/tools/simulation/sim_fire_spreading/Makefile \
+	src/tools/simulation/sim_geomorphology/Makefile \
+	src/tools/simulation/sim_hydrology/Makefile \
+	src/tools/simulation/sim_ihacres/Makefile \
+	src/tools/simulation/sim_landscape_evolution/Makefile \
+	src/tools/simulation/sim_qm_of_esp/Makefile \
+	src/tools/simulation/sim_rivflow/Makefile \
+	src/tools/statistics/Makefile \
+	src/tools/statistics/statistics_grid/Makefile \
+	src/tools/statistics/statistics_kriging/Makefile \
+	src/tools/statistics/statistics_points/Makefile \
+	src/tools/statistics/statistics_regression/Makefile \
+	src/tools/table/Makefile \
+	src/tools/table/table_calculus/Makefile \
+	src/tools/table/table_tools/Makefile \
+	src/tools/terrain_analysis/Makefile \
+	src/tools/terrain_analysis/ta_channels/Makefile \
+	src/tools/terrain_analysis/ta_compound/Makefile \
+	src/tools/terrain_analysis/ta_hydrology/Makefile \
+	src/tools/terrain_analysis/ta_lighting/Makefile \
+	src/tools/terrain_analysis/ta_morphometry/Makefile \
+	src/tools/terrain_analysis/ta_preprocessor/Makefile \
+	src/tools/terrain_analysis/ta_profiles/Makefile \
+	src/tools/terrain_analysis/ta_slope_stability/Makefile \
+	src/tools/tin/Makefile \
+	src/tools/tin/tin_tools/Makefile \
+	src/tools/tin/tin_viewer/Makefile \
 )
--- a/debian/changelog
+++ b/debian/changelog
-saga (2.3.1+dfsg-6) UNRELEASED; urgency=medium
+saga (7.3.0+dfsg-1~exp1) UNRELEASED; urgency=medium

+  [ Bas Couwenberg ]
  * Bump Standards-Version to 4.4.0, no changes.

- -- Bas Couwenberg <sebastic@debian.org>  Wed, 10 Jul 2019 19:18:16 +0200
+  [ Johan Van de Wauw ]
+  * Also watch for new LTR release
+  * Adjust files-excluded paths
+  * New upstream version 7.3.0+dfsg
+  * Use system version of svm
+  * Bump saga api packages to new version
+  * Add libdxf patch
+
+ -- Johan Van de Wauw <johan@gisky.be>  Fri, 12 Jul 2019 21:30:33 +0200

 saga (2.3.1+dfsg-5) unstable; urgency=medium


--- a/debian/copyright
+++ b/debian/copyright
@@ -8,13 +8,12 @@ Comment: Saga is generally licensed using two licenses:
 in debian (svm and dxflib). GPL-3+ licensed files like cluster_isodata.cpp
 are also excluded because the license is incompatible with GPL-2 (v2 only)
 used for most of SAGA.
-Files-Excluded: src/modules/grid/grid_gridding/nn/triangle.c
- src/modules/grid/grid_gridding/nn/triangle.h
- src/modules/simulation/sim_fire_spreading/fireLib.*
- src/modules/imagery/imagery_isocluster/*
- src/modules/imagery/imagery_svm/svm.cpp
- src/modules/imagery/imagery_svm/svm.h
- src/modules/io/io_shapes_dxf/dxflib/*
+Files-Excluded: src/tools/grid/grid_gridding/nn/triangle.c
+ src/tools/grid/grid_gridding/nn/triangle.h
+ src/tools/simulation/sim_fire_spreading/fireLib.*
+ src/tools/imagery/imagery_svm/svm/svm.cpp
+ src/tools/imagery/imagery_svm/svm/svm.h
+ src/tools/io/io_shapes_dxf/dxflib/*

 Files: *
 Copyright: 2001-2016, Olaf Conrad

--- a/debian/libsaga-api-2.3.1.install
+++ b/debian/libsaga-api-2.3.1.install
--- a/debian/libsaga-gdi-2.3.1.install
+++ b/debian/libsaga-gdi-2.3.1.install
--- a/debian/patches/Use-debian-version-of-libsvm.patch
+++ b/debian/patches/Use-debian-version-of-libsvm.patch
-Description: Use debian version of libsvm
-Author: Johan Van de Wauw <johan.vandewauw@gmail.com>
-Forwarded: not-needed
-
--- a/src/modules/imagery/imagery_svm/Makefile.am
-+++ b/src/modules/imagery/imagery_svm/Makefile.am
-@@ -3,16 +3,14 @@ DBGFLAGS = -g -DDEBUG
- endif
- 
- DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
-CXX_INCS           = -I$(top_srcdir)/src/saga_core
-+CXX_INCS           = -I$(top_srcdir)/src/saga_core -I/usr/include/libsvm
- AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
-AM_LDFLAGS         = -fPIC -shared -avoid-version
-+AM_LDFLAGS         = -fPIC -shared -avoid-version -lsvm
- pkglib_LTLIBRARIES = libimagery_svm.la
- libimagery_svm_la_SOURCES =\
- MLB_Interface.cpp\
-svm.cpp\
- svm_grids.cpp\
- MLB_Interface.h\
-svm.h\
- svm_grids.h
- 
- libimagery_svm_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
--- a/debian/patches/dxflib_configure.patch
+++ b/debian/patches/dxflib_configure.patch
+Description: Fix libdxf handling
+Author: Johan Van de Wauw <johan@gisky.be>
+Forwarded: https://sourceforge.net/p/saga-gis/code/merge-requests/12/
+Last-Update: 2019-07-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.ac
+++ b/configure.ac
+@@ -256,13 +256,27 @@ if test "x$use_libfire" != xyes; then
+     AC_MSG_RESULT([        Libfire disabled])
+ fi
+ 
+-
+-AC_ARG_WITH(system_dxflib,
+# check for --with-system_dxflib
+AC_ARG_WITH([system_dxflib],
+     AS_HELP_STRING([--with-system-dxflib],[Use system version of dxflib instead of embedded copy, requires this library (and the header files)]),
+-    AC_MSG_RESULT([        using system libdxf]),
+-    system_libdxf=true,system_libdxf=false
+    system_dxflib=true,
+     )
+-AM_CONDITIONAL(SYSTEM_DXFLIB, [test "$LIBDXFFOUND" -eq 1 -a x$system_libdxf = xtrue])
+
+AC_MSG_CHECKING([usage of system libdxflib])
+
+if test "$with_system_dxflib" = yes ; then
+    if test "$LIBDXFFOUND" = 1 ; then
+        AC_MSG_RESULT([yes])
+        SYSTEM_DXFLIB=yes
+    else
+        AC_MSG_FAILURE([--with-system-svm was given but test for libsvm failed])
+    fi
+else
+    SYSTEM_DXFLIB=no
+    AC_MSG_RESULT([no])
+fi
+
+AM_CONDITIONAL([SYSTEM_DXFLIB], [test x$SYSTEM_DXFLIB = xyes])
+ 
+ # check for --with-system-svm
+ AC_ARG_WITH([system_svm],
--- a/debian/patches/series
+++ b/debian/patches/series
-Use-debian-version-of-libsvm.patch
-0001-vigra-hdf5-include.patch
-Use-pkg-config-for-Debian-version-of-dxflib.patch
-disable-imagery_isocluster.patch
-Fix_projections_gcc6.patch
-spelling-errors.patch
-spelling-errors2.patch
-0001-update-AppStream-metadata-to-conform-with-specificat.patch
-0001-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
-0002-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
-fixwikilink.patch
+dxflib_configure.patch
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ override_dh_auto_configure: templates
 		--enable-openmp \
 		--enable-python \
 		--with-system-dxflib \
+		--with-system-svm \
 		$(shell dpkg-buildflags --export=configure)

 override_dh_auto_build:

--- a/debian/watch
+++ b/debian/watch
@@ -4,4 +4,4 @@ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
 repacksuffix=+dfsg \
 http://sf.net/saga-gis/ \
-saga[_-]?(2\.3\.\d+(?:[_\.\-\+]?(?:(?:RC|rc|pre|dev|beta|alpha)\d*)?)?)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+saga[_-]?(7\.3\.\d+(?:[_\.\-\+]?(?:(?:RC|rc|pre|dev|beta|alpha)\d*)?)?)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--- a/depcomp
+++ b/depcomp
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects

-scriptversion=2013-05-30.07; # UTC
+scriptversion=2016-01-11.22; # UTC

-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -786,6 +786,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -31,7 +31,7 @@

 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-0.1"
+VERSION="2.4.6 Debian-2.4.6-2"
 package_revision=2.4.6


@@ -2068,7 +2068,7 @@ include the following information:
       compiler:       $LTCC
       compiler flags: $LTCFLAGS
       linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname (GNU libtool) 2.4.6
+       version:        $progname $scriptversion Debian-2.4.6-2
       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`