[saga] 05/06: Use qhull instead of triangle

[Johan Van de Wauw]

This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch patch-queue/master
in repository saga.

commit c7736a9568b52b692de1320390403a2ffab2b33b
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Tue Jul 15 04:30:10 2014 -0400

    Use qhull instead of triangle
---
 src/modules/grid/grid_gridding/Makefile.am   | 3 +--
 src/modules/grid/grid_gridding/nn/delaunay.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am
index 75c79c9..bc55004 100644
--- a/src/modules/grid/grid_gridding/Makefile.am
+++ b/src/modules/grid/grid_gridding/Makefile.am
@@ -13,7 +13,7 @@ endif
 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) $(GOMPFLAGS)
-AM_LDFLAGS         = -fPIC -shared -avoid-version
+AM_LDFLAGS         = -fPIC -shared -avoid-version -lqhull
 pkglib_LTLIBRARIES = libgrid_gridding.la
 libgrid_gridding_la_SOURCES =\
 Interpolation.cpp\
@@ -34,7 +34,6 @@ Shepard.cpp\
 ./nn/nnai.c\
 ./nn/nncommon.c\
 ./nn/nnpi.c\
-./nn/triangle.c\
 Interpolation.h\
 Interpolation_AngularDistance.h\
 Interpolation_InverseDistance.h\
diff --git a/src/modules/grid/grid_gridding/nn/delaunay.c b/src/modules/grid/grid_gridding/nn/delaunay.c
index dc98875..e2952fa 100644
--- a/src/modules/grid/grid_gridding/nn/delaunay.c
+++ b/src/modules/grid/grid_gridding/nn/delaunay.c
@@ -24,7 +24,7 @@
  *
  *****************************************************************************/
 
-//#define USE_QHULL
+#define USE_QHULL
 
 #include <stdlib.h>
 #include <stdio.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git