Mercurial > pytave

comparison m4/ax_octave.m4 @ 385:132fec49e438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: support user selection of Octave version or prefix or both * m4/ax_octave.m4: Add OCTAVE and OCTAVE_VERSION input variables. Test for Octave programs with optional suffix derived from OCTAVE_VERSION. * Makefile.am (check-local): Use configured $(OCTAVE) interpreter. Add options to avoid unnecessary initialization.
author Mike Miller <mtmiller@octave.org>
date Sun, 02 Apr 2017 16:24:02 -0700
parents 30a305837ae6
children
comparison
equal deleted inserted replaced
384:c6e93e7dcfba 385:132fec49e438
77 OCTAVE_CPPFLAGS= 77 OCTAVE_CPPFLAGS=
78 OCTAVE_INCLUDEDIR= 78 OCTAVE_INCLUDEDIR=
79 OCTAVE_LIBRARYDIR= 79 OCTAVE_LIBRARYDIR=
80 80
81 AC_ARG_VAR([MKOCTFILE], [mkoctfile command]) 81 AC_ARG_VAR([MKOCTFILE], [mkoctfile command])
82 AC_ARG_VAR([OCTAVE], [octave command])
82 AC_ARG_VAR([OCTAVE_CONFIG], [octave-config command]) 83 AC_ARG_VAR([OCTAVE_CONFIG], [octave-config command])
84 AC_ARG_VAR([OCTAVE_VERSION], [the full version of Octave to use])
85
86 AS_IF([test -n "$OCTAVE_VERSION"],
87 [ax_octave_suffix="-$OCTAVE_VERSION"],
88 [ax_octave_suffix=""])
83 89
84 AC_ARG_WITH([octave], 90 AC_ARG_WITH([octave],
85 AS_HELP_STRING([--with-octave], 91 AS_HELP_STRING([--with-octave],
86 [specify root directory of Octave installation])) 92 [specify root directory of Octave installation]))
87 AS_IF([test -z "$MKOCTFILE" && test -f "$with_octave/bin/mkoctfile"], 93 AS_IF([test -n "$with_octave"],
88 [MKOCTFILE="$with_octave/bin/mkoctfile"]) 94 [AS_IF([test -z "$MKOCTFILE" && test -f "$with_octave/bin/mkoctfile$ax_octave_suffix"],
89 AS_IF([test -z "$OCTAVE_CONFIG" && test -f "$with_octave/bin/octave-config"], 95 [MKOCTFILE="$with_octave/bin/mkoctfile$ax_octave_suffix"])
90 [OCTAVE_CONFIG="$with_octave/bin/octave-config"]) 96 AS_IF([test -z "$OCTAVE" && test -f "$with_octave/bin/octave$ax_octave_suffix"],
91 97 [OCTAVE="$with_octave/bin/octave$ax_octave_suffix"])
92 AC_CHECK_TOOLS([MKOCTFILE], [mkoctfile]) 98 AS_IF([test -z "$OCTAVE_CONFIG" && test -f "$with_octave/bin/octave-config$ax_octave_suffix"],
99 [OCTAVE_CONFIG="$with_octave/bin/octave-config$ax_octave_suffix"])],
100 [AC_CHECK_TOOLS([MKOCTFILE], [mkoctfile$ax_octave_suffix])
101 AC_CHECK_TOOLS([OCTAVE], [octave$ax_octave_suffix])
102 AC_CHECK_TOOLS([OCTAVE_CONFIG], [octave-config$ax_octave_suffix])])
93 103
94 ax_octave_config="[$]$1" 104 ax_octave_config="[$]$1"
95 ax_octave_ok= 105 ax_octave_ok=
96 106
97 AC_MSG_CHECKING([for octave-config filename]) 107 AC_MSG_CHECKING([for octave-config filename])