Mercurial > hg > mxe-octave-anirudha
changeset 3208:f8a423fb7cc1
src/octave.mk: Add path of various libraries and MacPorts gfortran to F77 variable during configure
| author | Anirudha Bose <ani07nov@gmail.com> |
|---|---|
| date | Thu, 19 Sep 2013 02:11:14 +0530 |
| parents | 63e8822bbc2f |
| children | 7ef17f0b3ff8 |
| files | src/octave.mk |
| diffstat | 1 files changed, 18 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/octave.mk +++ b/src/octave.mk @@ -59,7 +59,7 @@ endif ifeq ($(MXE_SYSTEM), darwin) - $(PKG)_SPARSE_MATRIX_CONFIG_OPTIONS := \ + $(PKG)_DARWIN_EXTRA_CONFIG_OPTIONS := \ --with-umfpack-includedir='$(HOST_INCDIR)' \ --with-umfpack-libdir='$(HOST_LIBDIR)' \ --with-arpack-includedir='$(HOST_INCDIR)' \ @@ -75,7 +75,22 @@ --with-ccolamd-includedir='$(HOST_INCDIR)' \ --with-ccolamd-libdir='$(HOST_LIBDIR)' \ --with-cxsparse-includedir='$(HOST_INCDIR)' \ - --with-cxsparse-libdir='$(HOST_LIBDIR)' + --with-cxsparse-libdir='$(HOST_LIBDIR)' \ + --with-qhull-includedir='$(HOST_INCDIR)' \ + --with-qhull-libdir='$(HOST_LIBDIR)' \ + --with-hdf5-includedir='$(HOST_INCDIR)' \ + --with-hdf5-libdir='$(HOST_LIBDIR)' \ + --with-glpk-includedir='$(HOST_INCDIR)' \ + --with-glpk-libdir='$(HOST_LIBDIR)' \ + --with-fftw3-includedir='$(HOST_INCDIR)' \ + --with-fftw3-libdir='$(HOST_LIBDIR)' \ + --with-fftw3f-includedir='$(HOST_INCDIR)' \ + --with-fftw3f-libdir='$(HOST_LIBDIR)' \ + --with-qrupdate-includedir='$(HOST_INCDIR)' \ + --with-qrupdate-libdir='$(HOST_LIBDIR)' \ + --with-arpack-includedir='$(HOST_INCDIR)' \ + --with-arpack-libdir='$(HOST_LIBDIR)' \ + F77=$(MXE_F77) \ endif @@ -98,7 +113,7 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$($(PKG)_PREFIX)' \ $(MINGW_JAVA_CONFIG_OPTIONS) \ - $($(PKG)_SPARSE_MATRIX_CONFIG_OPTIONS) \ + $($(PKG)_DARWIN_EXTRA_CONFIG_OPTIONS) \ --enable-docs \ $($(PKG)_BLAS_OPTION) \ $($(PKG)_CROSS_CONFIG_OPTIONS) \