[saga-gis-developer] [trunk] Problems with Peregro contrib

[Rainer H. <rh...@gw...>]

Hi Volker, hi other devs,

Thanks for the newest release 4.2.0 and further commits.

I just tried to build trunk r8b5440 from yesterday on FreeBSD 
12.0-CURRENT amd64 and it fails in the configuration phase:


===>  Configuring for saga-devel
/usr/local/share/aclocal/autotrace.m4:7: warning: underquoted definition 
of AM_PATH_AUTOTRACE
/usr/local/share/aclocal/autotrace.m4:7:   run info Automake 'Extending 
aclocal'
/usr/local/share/aclocal/autotrace.m4:7:   or see 
http://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
/usr/local/share/aclocal/autotrace.m4:7: warning: underquoted definition 
of AM_PATH_AUTOTRACE
/usr/local/share/aclocal/autotrace.m4:7:   run info Automake 'Extending 
aclocal'
/usr/local/share/aclocal/autotrace.m4:7:   or see 
http://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal
configure.ac:15: installing './compile'
configure.ac:17: installing './config.guess'
configure.ac:17: installing './config.sub'
configure.ac:10: installing './install-sh'
configure.ac:10: installing './missing'
configure.ac:285: error: required file 
'src/tools/contrib/contrib_peregro/Makefile.in' not found
src/dev_tools/Makefile.am: installing './depcomp'
src/saga_core/saga_api/Makefile.am:143: installing './py-compile'
autoreconf-2.69: automake failed with exit status: 1
*** Error code 1
Stop.
make[1]: stopped in /usr/ports/math/saga-devel
*** Error code 1


Obviously, there is still (after rd44c5e and reb1355) something odd with 
the naming of peregro/perego. As far as I know, Perego (w/o the second 
'r') is correct.

When I search for 'peregro' with in trunk code, it gives me a hit for 
configure.ac in line 298:

src/tools/contrib/contrib_peregro/Makefile


In addition, two analogues hits show a wrong spelling of the name of 
Alessandro Perego:

src/tools/contrib/contrib_perego/destriping1.cpp
50:		"- Peregro, A. (2009): SRTM DEM destriping with SAGA GIS: 
consequences on drainage network extraction. "

src/tools/contrib/contrib_perego/destriping2.cpp
52:		"- Peregro, A. (2009): SRTM DEM destriping with SAGA GIS: 
consequences on drainage network extraction. "


These patches should correct the last cases of the spelling problem:

diff -urN configure.ac.orig configure.ac
--- configure.ac.orig	2017-05-11 06:58:17.728967000 +0200
+++ configure.ac	2017-05-11 07:21:26.194185000 +0200
@@ -295,7 +295,7 @@
  	src/tools/climate/Makefile \
  	src/tools/climate/climate_tools/Makefile \
  	src/tools/contrib/Makefile \
-	src/tools/contrib/contrib_peregro/Makefile \
+	src/tools/contrib/contrib_perego/Makefile \
  	src/tools/db/Makefile \
  	src/tools/db/db_odbc/Makefile \
  	src/tools/db/db_pgsql/Makefile \


diff -urN src/tools/contrib/contrib_perego/destriping1.cpp.orig 
src/tools/contrib/contrib_perego/destriping1.cpp
--- src/tools/contrib/contrib_perego/destriping1.cpp.orig	2017-05-11 
06:58:17.500228000 +0200
+++ src/tools/contrib/contrib_perego/destriping1.cpp	2017-05-11 
07:33:32.962853000 +0200
@@ -47,7 +47,7 @@
  		"Proceedings of the Fourteenth International Conference on Applied 
Geologic Remote Sensing, "
  		"6-8 November, Las Vegas, NV.\n"
  		"\n"
-		"- Peregro, A. (2009): SRTM DEM destriping with SAGA GIS: 
consequences on drainage network extraction. "
+		"- Perego, A. (2009): SRTM DEM destriping with SAGA GIS: consequences 
on drainage network extraction. "
  		"<a target=\"_blank\" 
href=\"http://www.webalice.it/alper78/saga_mod/destriping/destriping.html\">online</a>.\n"
  	));


diff -urN src/tools/contrib/contrib_perego/destriping2.cpp.orig 
src/tools/contrib/contrib_perego/destriping2.cpp
--- src/tools/contrib/contrib_perego/destriping2.cpp.orig	2017-05-11 
06:58:17.500317000 +0200
+++ src/tools/contrib/contrib_perego/destriping2.cpp	2017-05-11 
07:33:42.819326000 +0200
@@ -49,7 +49,7 @@
  		"Proceedings of the Fourteenth International Conference on Applied 
Geologic Remote Sensing, "
  		"6-8 November, Las Vegas, NV.\n"
  		"\n"
-		"- Peregro, A. (2009): SRTM DEM destriping with SAGA GIS: 
consequences on drainage network extraction. "
+		"- Perego, A. (2009): SRTM DEM destriping with SAGA GIS: consequences 
on drainage network extraction. "
  		"<a target=\"_blank\" 
href=\"http://www.webalice.it/alper78/saga_mod/destriping/destriping.html\">online</a>.\n"
  	));


HTH and best wishes from Göttingen,
Rainer Hurling