Mercurial > hg > octave-thorsten
changeset 14315:99428221b4e1 stable
build: Add new location for Qhull2012 include files to build system.
configure.ac: Add location libqhull/libqhull.h to list of possibilities.
acinclude.m4: Change conftests to possibly use new header files.
oct-qhull.h: Add possible new location of headder files.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Thu, 02 Feb 2012 09:37:33 -0800 |
| parents | 1734c3a48f31 |
| children | 0216b5d6c80c 82a3127af11c |
| files | configure.ac m4/acinclude.m4 src/DLD-FUNCTIONS/oct-qhull.h |
| diffstat | 3 files changed, 22 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -649,7 +649,7 @@ OCTAVE_CHECK_LIBRARY(qhull, QHull, [Qhull library not found -- this will result in loss of functionality of some geometry functions.], - [qhull/libqhull.h libqhull.h qhull/qhull.h qhull.h], [qh_qhull], [], [], + [libqhull/libqhull.h qhull/libqhull.h libqhull.h qhull/qhull.h qhull.h], [qh_qhull], [], [], [warn_qhull= OCTAVE_CHECK_QHULL_VERSION OCTAVE_CHECK_QHULL_OK([TEXINFO_QHULL="@set HAVE_QHULL"
--- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -937,7 +937,13 @@ octave_cv_lib_qhull_version, [ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> -#if defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H) +#if defined (HAVE_LIBQHULL_LIBQHULL_H) +# include <libqhull/libqhull.h> +# include <libqhull/qset.h> +# include <libqhull/geom.h> +# include <libqhull/poly.h> +# include <libqhull/io.h> +#elif defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H) # if defined (HAVE_QHULL_LIBQHULL_H) # include <qhull/libqhull.h> # else @@ -974,7 +980,13 @@ octave_cv_lib_qhull_ok, [ AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> -#if defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H) +#if defined (HAVE_LIBQHULL_LIBQHULL_H) +# include <libqhull/libqhull.h> +# include <libqhull/qset.h> +# include <libqhull/geom.h> +# include <libqhull/poly.h> +# include <libqhull/io.h> +#elif defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H) # if defined (HAVE_QHULL_LIBQHULL_H) # include <qhull/libqhull.h> # else
--- a/src/DLD-FUNCTIONS/oct-qhull.h +++ b/src/DLD-FUNCTIONS/oct-qhull.h @@ -27,7 +27,13 @@ extern "C" { -#if defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H) +#if defined (HAVE_LIBQHULL_LIBQHULL_H) +# include <libqhull/libqhull.h> +# include <libqhull/qset.h> +# include <libqhull/geom.h> +# include <libqhull/poly.h> +# include <libqhull/io.h> +#elif defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H) # if defined (HAVE_QHULL_LIBQHULL_H) # include <qhull/libqhull.h> # else