Mercurial > pytave
changeset 186:277b1e172123
build: Add --with-octave option to select Octave prefix (fixes issue #1)
* m4/ax_octave.m4 (AX_OCTAVE): Add --with-octave option to select directory
where a particular Octave is installed. Document MKOCTFILE and OCTAVE_CONFIG
as input environment variables and allow them to override --with-octave.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Wed, 08 Jun 2016 16:58:39 -0700 |
| parents | cede17a86ccf |
| children | 30a305837ae6 |
| files | m4/ax_octave.m4 |
| diffstat | 1 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ax_octave.m4 Wed Jun 08 15:56:25 2016 -0700 +++ b/m4/ax_octave.m4 Wed Jun 08 16:58:39 2016 -0700 @@ -77,11 +77,23 @@ OCTAVE_CPPFLAGS= OCTAVE_INCLUDEDIR= OCTAVE_LIBRARYDIR= + + AC_ARG_VAR([MKOCTFILE], [mkoctfile command]) + AC_ARG_VAR([OCTAVE_CONFIG], [octave-config command]) + + AC_ARG_WITH([octave], + AS_HELP_STRING([--with-octave], + [specify root directory of Octave installation])) + AS_IF([test -z "$MKOCTFILE" && test -f "$with_octave/bin/mkoctfile"], + [MKOCTFILE="$with_octave/bin/mkoctfile"]) + AS_IF([test -z "$OCTAVE_CONFIG" && test -f "$with_octave/bin/octave-config"], + [OCTAVE_CONFIG="$with_octave/bin/octave-config"]) + + AC_CHECK_TOOLS([MKOCTFILE], [mkoctfile]) + ax_octave_config="[$]$1" ax_octave_ok= - AC_CHECK_TOOLS([MKOCTFILE], [mkoctfile]) - AC_MSG_CHECKING([for octave-config filename]) AS_IF([test -z "$ax_octave_config"], [ AC_MSG_RESULT([determined from path])