Mercurial > octave
diff src/DLD-FUNCTIONS/convhulln.cc @ 14043:f913363318e0 stable
handle new names and locations of qhull include files (bug #33712)
* src/DLD-FUNCTIONS/oct-qhull.h: New file. Handle details of which
Qhull header files to include here.
* src/DLD-FUNCTIONS/config-module.awk: Include oct-qhull.h in list of
EXTRA_DIST files.
* configure.ac: Check for qhull/libqhull.h, libqhull.h, qhull/qhull.h,
and qhull.h instead of qhull/libqhull_a.h.
* __delaunayn__.cc, __voronoi__.cc, convhulln.cc: Include oct-qhull.h
instead of qhull/qhull_a.h.
* acinclude.m4 (OCTAVE_CHECK_QHULL_VERSION, OCTAVE_CHECK_QHULL_OK):
Look for various qhull header files.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 13 Dec 2011 16:53:22 -0500 |
| parents | 440d7914cf01 |
| children | 72c96de7a403 |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/convhulln.cc Tue Dec 13 12:16:50 2011 -0500 +++ b/src/DLD-FUNCTIONS/convhulln.cc Tue Dec 13 16:53:22 2011 -0500 @@ -41,15 +41,12 @@ #include "oct-obj.h" #include "parse.h" -#ifdef HAVE_QHULL -extern "C" { -#include <qhull/qhull_a.h> -} - -# ifdef NEED_QHULL_VERSION +#if defined (HAVE_QHULL) +# include "oct-qhull.h" +# if defined (NEED_QHULL_VERSION) char qh_version[] = "convhulln.oct 2007-07-24"; # endif -#endif /* HAVE_QHULL */ +#endif DEFUN_DLD (convhulln, args, nargout, "-*- texinfo -*-\n\ @@ -85,7 +82,7 @@ { octave_value_list retval; -#ifdef HAVE_QHULL +#if defined (HAVE_QHULL) int nargin = args.length (); if (nargin < 1 || nargin > 2)