Mercurial > mxe-octave
comparison configure.ac @ 3721:933b99febcf1
Expand options to support 3 possible sources of octave
* configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default)
* Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure.
* index.html: added master-octave information.
* src/default-octave.mk: new file.
* src/default-octave-1-docinstall.patch
* dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk
* binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 19 Oct 2014 22:58:20 -0400 |
parents | 023f392ce053 |
children | 5e79ab51035f |
comparison
equal
deleted
inserted
replaced
3720:5d0ed3ca5910 | 3721:933b99febcf1 |
---|---|
148 [AS_HELP_STRING([--disable-openblas], | 148 [AS_HELP_STRING([--disable-openblas], |
149 [Disable use of openblas in Octave])], | 149 [Disable use of openblas in Octave])], |
150 [if test "$enableval" = no; then ENABLE_OPENBLAS=no; fi], []) | 150 [if test "$enableval" = no; then ENABLE_OPENBLAS=no; fi], []) |
151 AC_SUBST(ENABLE_OPENBLAS) | 151 AC_SUBST(ENABLE_OPENBLAS) |
152 | 152 |
153 ENABLE_STABLE=yes | 153 ENABLE_OCTAVE=stable |
154 AC_ARG_ENABLE([stable], | 154 AC_ARG_ENABLE([octave], |
155 [AS_HELP_STRING([--disable-stable], | 155 [AS_HELP_STRING([--enable-octave=stable], |
156 [Disable stable build of octave and use devel octave instead])], | 156 [Enable a specific build of octave (stable, alpha, default)])], |
157 [if test "$enableval" = no; then ENABLE_STABLE=no; fi], []) | 157 [], []) |
158 AC_SUBST(ENABLE_STABLE) | 158 |
159 case $enableval in | |
160 stable) | |
161 ENABLE_OCTAVE="stable-" | |
162 ;; | |
163 alpha) | |
164 ENABLE_OCTAVE="" | |
165 ;; | |
166 default) | |
167 ENABLE_OCTAVE="default-" | |
168 ;; | |
169 *) | |
170 ENABLE_OCTAVE="stable-" | |
171 AC_MSG_WARN([Unknown octave type $enableval - using enable-octave=stable]) | |
172 ;; | |
173 esac | |
174 | |
175 AC_SUBST(ENABLE_OCTAVE) | |
159 | 176 |
160 ### Default is to cross compile for mingw. | 177 ### Default is to cross compile for mingw. |
161 | 178 |
162 echo $host_alias | 179 echo $host_alias |
163 if test -n "$host_alias"; then | 180 if test -n "$host_alias"; then |