Mercurial > pytave
changeset 104:6450086b1934
build: Fix values used for OCTAVE_CPPFLAGS and OCTAVE_LIBS
* Makefile.am: Use OCTAVE_LIBS autoconf variable instead of hardcoding.
* m4/ax_octave.m4: Update OCTAVE_CPPFLAGS and OCTAVE_LIBS to be correct
for recent versions of Octave (>= 3.8.0).
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Tue, 14 Apr 2015 07:24:50 -0400 |
| parents | d99739894a0b |
| children | 81432840e1c0 |
| files | Makefile.am m4/ax_octave.m4 |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Tue Apr 14 07:21:31 2015 -0400 +++ b/Makefile.am Tue Apr 14 07:24:50 2015 -0400 @@ -8,8 +8,8 @@ # Having -module in LDFLAGS lets us use a non-standard library name # (e.g. _pytave instead of libpytave) -_pytave_la_LDFLAGS = -module -L@OCTAVE_LIBRARYDIR@ -loctinterp -loctave \ --lcruft -l@BOOST_PYTHON_LIB@ -R @PYTAVE_OCTAVE_RPATH@ +_pytave_la_LDFLAGS = -module -L@OCTAVE_LIBRARYDIR@ @OCTAVE_LIBS@ \ +-l@BOOST_PYTHON_LIB@ -R @PYTAVE_OCTAVE_RPATH@ _pytave_la_SOURCES = octave_to_python.cc pytave.cc python_to_octave.cc \ arrayobjectdefs.h octave_to_python.h pytavedefs.h exceptions.h \
--- a/m4/ax_octave.m4 Tue Apr 14 07:21:31 2015 -0400 +++ b/m4/ax_octave.m4 Tue Apr 14 07:24:50 2015 -0400 @@ -144,8 +144,8 @@ fi OCTAVE_LDFLAGS="-L$OCTAVE_LIBRARYDIR" - OCTAVE_LIBS="-loctave -lcruft -loctinterp" - OCTAVE_CPPFLAGS="-I$OCTAVE_INCLUDEDIR" + OCTAVE_LIBS="-loctinterp -loctave" + OCTAVE_CPPFLAGS="-I$OCTAVE_INCLUDEDIR -I$OCTAVE_INCLUDEDIR/octave" AC_CACHE_CHECK([whether linking to Octave works], [ax_octave_cv_lib_octave], [