Mercurial > octave
changeset 29638:75556567592e
build: restore original QHULL make variables (bug #60016)
* configure.ac: Define QHULL_CPPFLAGS, QHULL_LDFLAGS, and QHULL_LIBS.
* libinterp/dldfcn/module-files: Use original QHULL_* flags.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Sat, 08 May 2021 09:39:19 -0700 |
| parents | f4a57a41f1e7 |
| children | 4c613e473f9f |
| files | configure.ac libinterp/dldfcn/module-files |
| diffstat | 2 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sat May 08 17:45:19 2021 +0200 +++ b/configure.ac Sat May 08 09:39:19 2021 -0700 @@ -1344,6 +1344,9 @@ ### Check for the Qhull library. +QHULL_CPPFLAGS= +QHULL_LDFLAGS= +QHULL_LIBS= OCTAVE_CHECK_LIB(qhull_r, QHull, [Qhull library not found. This will result in loss of functionality for some geometry functions.], [libqhull_r/libqhull_r.h libqhull_r.h], @@ -1351,8 +1354,14 @@ [warn_qhull_r= OCTAVE_CHECK_QHULL_VERSION OCTAVE_CHECK_LIB_QHULL_OK( - [AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], + [AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.]) + QHULL_CPPFLAGS="$QHULL_R_CPPFLAGS" + QHULL_LDFLAGS="$QHULL_R_LDFLAGS" + QHULL_LIBS="$QHULL_R_LIBS"], [warn_qhull_r="Qhull library found, but does not seem to work properly. This will result in loss of functionality for some geometry functions. Please try recompiling the library with -fno-strict-aliasing."])]) +AC_SUBST(QHULL_CPPFLAGS) +AC_SUBST(QHULL_LDFLAGS) +AC_SUBST(QHULL_LIBS) ### Check for PCRE regex library. @@ -3198,9 +3207,9 @@ PortAudio libraries: $PORTAUDIO_LIBS PTHREAD flags: $PTHREAD_CFLAGS PTHREAD libraries: $PTHREAD_LIBS - QHULL CPPFLAGS: $QHULL_R_CPPFLAGS - QHULL LDFLAGS: $QHULL_R_LDFLAGS - QHULL libraries: $QHULL_R_LIBS + QHULL CPPFLAGS: $QHULL_CPPFLAGS + QHULL LDFLAGS: $QHULL_LDFLAGS + QHULL libraries: $QHULL_LIBS QRUPDATE CPPFLAGS: $QRUPDATE_CPPFLAGS QRUPDATE LDFLAGS: $QRUPDATE_LDFLAGS QRUPDATE libraries: $QRUPDATE_LIBS
--- a/libinterp/dldfcn/module-files Sat May 08 17:45:19 2021 +0200 +++ b/libinterp/dldfcn/module-files Sat May 08 09:39:19 2021 -0700 @@ -1,13 +1,13 @@ # FILE|CPPFLAGS|LDFLAGS|LIBRARIES -__delaunayn__.cc|$(QHULL_R_CPPFLAGS)|$(QHULL_R_LDFLAGS)|$(QHULL_R_LIBS) +__delaunayn__.cc|$(QHULL_CPPFLAGS)|$(QHULL_LDFLAGS)|$(QHULL_LIBS) __fltk_uigetfile__.cc|$(FLTK_CPPFLAGS) $(FT2_CPPFLAGS)|$(FLTK_LDFLAGS) $(FT2_LDFLAGS)|$(FLTK_LIBS) $(FT2_LIBS) __glpk__.cc|$(GLPK_CPPFLAGS)|$(GLPK_LDFLAGS)|$(GLPK_LIBS) __init_fltk__.cc|$(FLTK_CPPFLAGS) $(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS)|$(FLTK_LDFLAGS) $(FT2_LDFLAGS)|$(FLTK_LIBS) $(FT2_LIBS) $(OPENGL_LIBS) __init_gnuplot__.cc|$(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS)|| __ode15__.cc|$(SUNDIALS_XCPPFLAGS)|$(SUNDIALS_XLDFLAGS)|$(SUNDIALS_XLIBS) -__voronoi__.cc|$(QHULL_R_CPPFLAGS)|$(QHULL_R_LDFLAGS)|$(QHULL_R_LIBS) +__voronoi__.cc|$(QHULL_CPPFLAGS)|$(QHULL_LDFLAGS)|$(QHULL_LIBS) audiodevinfo.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS) audioread.cc|$(SNDFILE_CPPFLAGS)|$(SNDFILE_LDFLAGS)|$(SNDFILE_LIBS) -convhulln.cc|$(QHULL_R_CPPFLAGS)|$(QHULL_R_LDFLAGS)|$(QHULL_R_LIBS) +convhulln.cc|$(QHULL_CPPFLAGS)|$(QHULL_LDFLAGS)|$(QHULL_LIBS) fftw.cc|$(FFTW_XCPPFLAGS)|$(FFTW_XLDFLAGS)|$(FFTW_XLIBS) gzip.cc|$(Z_CPPFLAGS) $(BZ2_CPPFLAGS)|$(Z_LDFLAGS) $(BZ2_LDFLAGS)|$(Z_LIBS) $(BZ2_LIBS)