Mercurial > octave-nkf
diff Makeconf.in @ 9519:ee99f9f37505
improve configure checks for qhull and curl libs
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 13 Aug 2009 00:41:07 -0400 |
| parents | eee9b3150446 |
| children | 0ce82753dd72 |
line wrap: on
line diff
--- a/Makeconf.in Wed Aug 12 15:26:07 2009 +0200 +++ b/Makeconf.in Thu Aug 13 00:41:07 2009 -0400 @@ -231,12 +231,20 @@ HDF5_LIBS = @HDF5_LIBS@ ZLIB_LIBS = @ZLIB_LIBS@ GRAPHICS_LIBS = @GRAPHICS_LIBS@ + +QHULL_CPPFLAGS = @QHULL_CPPFLAGS@ +QHULL_LDFLAGS = @QHULL_LDFLAGS@ QHULL_LIBS = @QHULL_LIBS@ + REGEX_LIBS = @REGEX_LIBS@ BLAS_LIBS = @BLAS_LIBS@ FFTW_LIBS = @FFTW_LIBS@ GLPK_LIBS = @GLPK_LIBS@ + +CURL_CPPFLAGS = @CURL_CPPFLAGS@ +CURL_LDFLAGS = @CURL_LDFLAGS@ CURL_LIBS = @CURL_LIBS@ + AMD_LIBS = @AMD_LIBS@ CAMD_LIBS = @CAMD_LIBS@ UMFPACK_LIBS = @UMFPACK_LIBS@ @@ -495,6 +503,8 @@ -e "s|%OCTAVE_CONF_COLAMD_LIBS%|\"${COLAMD_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CPICFLAG%|\"${CPICFLAG}\"|" \ -e "s|%OCTAVE_CONF_CPPFLAGS%|\"${CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_CURL_CPPFLAGS%|\"${CURL_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_CURL_LDFLAGS%|\"${CURL_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_CURL_LIBS%|\"${CURL_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CXSPARSE_LIBS%|\"${CXSPARSE_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CXX%|\"${CXX}\"|" \ @@ -547,6 +557,8 @@ -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \ -e "s|%OCTAVE_CONF_PTHREAD_CFLAGS%|\"${PTHREAD_CFLAGS}\"|" \ -e "s|%OCTAVE_CONF_PTHREAD_LIBS%|\"${PTHREAD_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_QHULL_CPPFLAGS%|\"${QHULL_CPPFLAGSS}\"|" \ + -e "s|%OCTAVE_CONF_QHULL_LDFLAGS%|\"${QHULL_LDFLAGSS}\"|" \ -e "s|%OCTAVE_CONF_QHULL_LIBS%|\"${QHULL_LIBS}\"|" \ -e "s|%OCTAVE_CONF_QRUPDATE_LIBS%|\"${QRUPDATE_LIBS}\"|" \ -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \